+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
+"Using the context menu extension:\n"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-msgstr ""
-"Using the context menu extension:\n"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
+"Kontekstivalikkolaajennuksen käyttö:\n"
+"Verrataksesi yksinkertaisesti kahta valittua tiedostoa valitse ”Vertaa”.\n"
+"Jos toinen tiedosto on muualla, ”Tallenna” ensimmäinen tiedosto tuonnemmaksi, jolloin se näkyy ”Vertaa tiedostoon…”-alivalikossa. Valitse sitten toiselle tiedostolle ”Vertaa tiedostoon”.\n"
+"Kolmivaiheisessa yhdistämisessä ”Tallenna” ensin pohjatiedosto ja yhdistettävä haara. Sitten valitse ”Kolmivaiheinen yhdistäminen pohjaan” kohteena käytettävässä toisessa haarassa.\n"
+"Sama pätee myös kansioiden vertailuun ja yhdistämiseen."
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-msgstr ""
-"Kontekstivalikkolaajennuksen käyttö:\n"
-"Verrataksesi yksinkertaisesti kahta valittua tiedostoa valitse ”Vertaa”.\n"
-"Jos toinen tiedosto on muualla, ”Tallenna” ensimmäinen tiedosto tuonnemmaksi, jolloin se näkyy ”Vertaa tiedostoon…”-alivalikossa. Valitse sitten toiselle tiedostolle ”Vertaa tiedostoon”.\n"
-"Kolmivaiheisessa yhdistämisessä ”Tallenna” ensin pohjatiedosto ja yhdistettävä haara. Sitten valitse ”Kolmivaiheinen yhdistäminen pohjaan” kohteena käytettävässä toisessa haarassa.\n"
-"Sama pätee myös kansioiden vertailuun ja yhdistämiseen."
+msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
+msgstr "Beaucoup d'outils graphiques pour diff existent. Pourquoi choisir KDiff3 Laissez moi vous expliquer pourquoi je l'ai écrit."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:103
+#, fuzzy, 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 a été créé car j'ai eu a faire une fusion difficile. Fusionner est nécessaire quand beaucoup de gens travaillent sur les mêmes fichiers dans un projet. Une fusion peut parfois être automatisée, quand l'outil de fusion n'a pas seulement les fichiers modifiés (appelés \"branches\"), mais aussi le fichier original (appelé \"base\"). L'outil de fusion choisira automatiquement la modification faite uniquement dans une seule branche. Quand beaucoup de contributeurs auront changé les mêmes lignes, alors l'outil de fusion détectera un conflit et vous devrez le résoudre manuellement."
+
+#. Tag: para
+#. +> trunk
+#: 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 "La fusion fut donc difficile car un contributeur a changé beaucoup de choses. Un autre a aussi changé beaucoup de texte dans le même fichier, ce qui résulte en beaucoup de conflits lors de la fusion."
+
+#. Tag: para
+#. +> trunk
+#: 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 "L'outil que j'ai utilisé ne m'a donc montré que les lignes modifiées mais pas ce qui avait changé dans ces lignes. La fusion fut un vrai cauchemar."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Voila donc le début. La première version a montré les différences dans une ligne et les différences d'espaces. Plus tard beaucoup d'autres options furent ajoutées pour augmenter l'utilité."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Par exemple si vous voulez comparer du texte rapidement, alors vous pouvez le copier dans le presse-papiers et le coller dans une autre fenêtre diff."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Une option qui me demanda beaucoup d'efforts fut la comparaison de dossiers et la facilitation de la fusion, qui a transformé le navigateur en navigateur complet."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:127
+#, fuzzy, no-c-format
+msgid "I hope &kdiff3; works for you too. Have fun!"
+msgstr "J'espère que KDiff3 marche chez vous aussi. Amusez vous !"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:129
+#, no-c-format
+msgid "Joachim Eibl (2003)"
+msgstr "Joachim Eibl (2003)"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:134
+#, no-c-format
+msgid "Screenshots and Features"
+msgstr "Captures d'écrans et caractéristiques"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:135
+#, no-c-format
+msgid "This screenshot shows the difference between two text files"
+msgstr "Cette capture d'écran montre la différence entre deux fichiers texte."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:136
+#, fuzzy, no-c-format
+msgid "(Using an early version of &kdiff3;):"
+msgstr "(Utilisant une ancienne version de KDiff3) :"
+
+#. Tag: para
+#. +> trunk
+#: 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 ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:154
+#, fuzzy, no-c-format
+msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
+msgstr "KDiff3 vous aide aussi à comparer et fusionner des dossiers complets. Cette capture d'écran montre KDiff3 pendant une fusion de dossiers :"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:163
+#, no-c-format
+msgid "More Features"
+msgstr "Plus d'options"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:164
+#, no-c-format
+msgid "Line-By-Line And Char-By-Char Diff-Viewer"
+msgstr "Visionneuse de différences ligne par ligne et caractère par caractère"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:165
+#, fuzzy, no-c-format
+msgid "By using the possibilities 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 "En utilisant les possibilités d'affichages colorés d'une interface graphique, KDiff3 montre exactement quelle est la différence. Quand vous aurez a traiter beaucoup de texte, cela vous aidera beaucoup."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:173
+#, no-c-format
+msgid "See White-Space Differences At One Glance"
+msgstr "Voir les différences d'espaces en un coup d'oeil."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Les espaces et alinéas apparaissent visiblement. Quand des lignes diffèrent seulement d'un espace, cela peut être vu en un coup d'oeil dans la colonne sur le côté gauche. Plus de problèmes quand les gens changent les espaces."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:183
+#, no-c-format
+msgid "Triple-Diff"
+msgstr "Triple comparaison"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:184
+#, no-c-format
+msgid "Analyze three files and see where they differ."
+msgstr "Analyser trois fichiers et voir en quoi ils diffèrent."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Les fenêtres de gauche/millieu/droite sont appelées A/B/C et on respectivement les couleurs bleu/vert/mauve."
+
+#. Tag: para
+#. +> trunk
+#: 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 "Si un des fichiers et le même et un des fichiers est différent sur une ligne alors la couleur montre quel fichier est différent. La couleur rouge montre que les deux sont différents."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:198
+#, no-c-format
+msgid "Comfortable Merge Of Two Or Three Input Files"
+msgstr "Fusion confortable de deux ou trois fichiers."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:199
+#, fuzzy, 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 peut être utilisé pour fusionner deux ou trois fichiers et faire autant de fusions automatiques que possible. Le résultat est représenté dans une fenêtre modifiable ou la plupart des conflits peuvent être résolus avec un simple clic de souris. Sélectionnez les boutons A/B/C depuis la barre des boutons pour sélectionner la source qui doit être utilisée. Vous pouvez aussi utiliser plus d'une source. Cette fenêtre est aussi un éditeur pour les conflits nécessitant des corrections plus poussées pouvant être corrigées sans autre outil."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:209
+#, no-c-format
+msgid "And ..."
+msgstr "Et ..."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:211
+#, no-c-format
+msgid "Fast navigation via buttons."
+msgstr "Une navigation rapide via les bouttons."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:212
+#, no-c-format
+msgid "A mouse-click into a summary column sync's all windows to show the same position."
+msgstr "Un clic de souris dans la colonne du sommaire synchronise toutes les fenêtres pour indiquer la même position."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:213
+#, no-c-format
+msgid "Select and copy from any window and paste into the merge result window."
+msgstr "Sélectionnez et copiez depuis n'importe qu'elle fenêtre et collez dans la fenêtre de résultat de la fusion."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:214
+#, no-c-format
+msgid "Overview column that shows where the changes and conflicts are."
+msgstr "La colonne d'aperçu qui montre où les changements et conflits sont situés."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:215
+#, no-c-format
+msgid "The colors are adjustable to your specific preferences."
+msgstr "Les couleurs sont ajustables a vos préférences."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:216
+#, no-c-format
+msgid "Adjustable Tab size."
+msgstr "Taille des alinéas ajustable."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:217
+#, no-c-format
+msgid "Option to insert spaces instead of tabs."
+msgstr "Option pour insérer des espaces à la place des alinéas."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:218
+#, no-c-format
+msgid "Open files comfortably via dialog or specify files on the command line."
+msgstr "Ouvrir les fichiers confortablement via une boîte de dialogue ou spécifier les fichiers via la ligne de commande."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:219
+#, fuzzy, no-c-format
+msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
+msgstr "Chercher une partie d'un texte dans toutes les fenêtres. Trouver (Ctrl+F) et trouver le suivant (F3)."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:220
+#, no-c-format
+msgid "Show the line numbers for each line."
+msgstr "Indiquer le numéro de ligne pour chaque ligne."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:221
+#, no-c-format
+msgid "Paste clipboard or drag text into a diff input window."
+msgstr "Coller le presse-papiers ou tirer un texte dans une fenêtre diff."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:222
+#, no-c-format
+msgid "Networktransparency via KIO."
+msgstr "Transparence réseau via KIO."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:223
+#, no-c-format
+msgid "Can be used as diff-viewer in KDevelop 3."
+msgstr "Peut être utilisé pour voir les diff dans KDevelop 3."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:224
+#, no-c-format
+msgid "Word-wrap for long lines."
+msgstr "Coupage des mots dans les lignes longues."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:225
+#, no-c-format
+msgid "Support for Unicode, UTF-8 and other codecs."
+msgstr "Support d'Unicode, UTF-8 et autres."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:226
+#, no-c-format
+msgid "Support for right to left languages."
+msgstr "Support des langues écrivant de droite à gauche."
+msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
+msgstr "Notez que <replaceable>fichier1</replaceable> sera traité comme étant la base de <replaceable>fichier2</replaceable> et <replaceable>fichier3</replaceable>."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:258
+#, no-c-format
+msgid "Special case: Files with the same name"
+msgstr "Cas spécial : fichiers du même nom"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:259
+#, fuzzy, 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 "Si tous les fichiers ont le même nom mais sont situés dans des dossiers différents, vous pouvez réduire la saisie en ne spécifiant que le nom d'un fichier, pour le premier fichier. Ex :"
+" --out file Fichier de résultat, encore. (Par compatibilité avec certains outils).\n"
+" --auto Pas d'interface graphique si tous les conflits se résolvent tout seuls. (Nécessite -o fichier)\n"
+" --qall Ne pas résoudre les conflits automatiquement. (Par compatibilité)...\n"
+" --L1 alias1 Alias pour le fichier 1 (base).\n"
+" --L2 alias2 Alias pour le fichier 2.\n"
+" --L3 alias3 Alias pour le fichier 3.\n"
+" -L, --fname alias Alias alternatif. Mettez cela une fois pour chaque entrée.\n"
+" -u N'a pas d'effet. Pour la compatibilité avec certains outils."
+
+#. Tag: para
+#. +> trunk
+#: 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 ""
+
+#. Tag: para
+#. +> trunk
+#: 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 ""
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:283
+#, fuzzy, no-c-format
+msgid "Ignorable command line options"
+msgstr "Options en ligne de commande"
+
+#. Tag: para
+#. +> trunk
+#: 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:"
+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 ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:300
+#, no-c-format
+msgid "Open-Dialog"
+msgstr "Fenêtre d'ouverture"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:301
+#, no-c-format
+msgid "Since many input files must be selectable, the program has a special open dialog:"
+msgstr "Étant donné que plusieurs fichiers doivent être sélectionnes en entrée, le programme a une fenêtre d'ouverture spéciale :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:307
+#, fuzzy, 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 "La fenêtre d'ouverture vous permet d'éditer les noms des fichier à la main, en sélectionnant un fichier via le navigateur (\"Fichier...\") ou vous permet de choisir des fichiers récemment utilisés via la liste défilante. Si vous rouvrez la fenêtre, alors les noms actuels seront toujours ici. Le troisième fichier d'entrée n'est pas nécessaire. SI l'entrée pour \"C\" reste vide, alors une analyse diff de deux fichiers seulement sera effectuée."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:314
+#, fuzzy, 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 "Vous pouvez aussi sélectionner un dossier via \"Dossier...\". Si pour A un dossier est spécifié alors une comparaison/fusion de dossiers débutera."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:319
+#, fuzzy, 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 "Si \"Fusionner\" est sélectionné, alors la ligne \"Sortie\" devient éditable. Mais il n'est pas nécessaire de spécifier le fichier du résultat de la fusion immédiatement. Vous pouvez aussi le faire au moment de l'enregistrement."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:323
+#, fuzzy, no-c-format
+msgid "The \"Configure...\"-button opens the options-dialog, so that you can set the options before running the analysis."
+msgstr "Le bouton \"Configurer...\" ouvre la fenêtre des options pour que vous puissiez mettre en place les options avant de débuter l'analyse."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:329
+#, no-c-format
+msgid "Paste and Drop Input"
+msgstr "La saisie en Coller et Lâcher"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:330
+#, fuzzy, 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 "Parfois vous voulez comparer les parties d'un texte qui n'est pas un fichier. KDiff3 vous permet aussi de coller le texte du presse-papiers dans une fenêtre de diff sélectionnée. L'analyse diff est alors immédiate. Dans la fenêtre ouverte vous n'aurez pas besoin de spécifier des fichiers, mais simplement de la fermer via \"Annuler\"."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Vous pouvez aussi utiliser la méthode du tirer/lâcher : Tirez un fichier depuis le navigateur ou sélectionnez du texte depuis un éditeur et lâchez le dans la fenêtre de diff."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Quelle est l'idée ? Parfois un fichier contient deux fonctions similaires, mais vérifier à quel niveau elles sont similaires est compliqué si vous devez d'abord créer deux fichiers puis les charger. Maintenant vous pouvez simplement copier, coller et comparer les sections en question."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:342
+#, fuzzy, no-c-format
+msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
+msgstr "Note : Actuellement vous ne pouvez rien tirer depuis KDiff3. Seulement le lâchage dans l'entrée de diff est géré."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:345
+#, fuzzy, 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 "Attention : Certains éditeurs interprètent toujours la méthode du tirer/lâcher vers un autre programme comme un couper (à la place de copier) et coller. Vos données originales pourraient alors être perdues."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:351
+#, fuzzy, no-c-format
+msgid "Comparing Files And Interpreting The Information In The Input Windows"
+msgstr "Interpréter l'information dans les fenêtres de saisie"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:355
+#, no-c-format
+msgid "Info Line"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:355
+#, fuzzy, 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 "En haut de chaque fenêtre il y a sa \"ligne d'informations\". Les lignes d'informations des fenêtres de saisie contiennent une lettre \"A\", \"B\" ou \"C\", le nom de fichier et le numéro de ligne de la première ligne visible dans la fenêtre. (Notez que la fenêtre \"C\" est optionnelle). Chaque ligne d'information apparaît dans une couleur différente. (Si les chemins sont trop longs, alors vous pouvez déplacer la souris sur la ligne d'information et une bulle apparaîtra, vous montrant le nom complet)."
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:364
+#, fuzzy, no-c-format
+msgid "Coloring"
+msgstr "Couleurs"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:364
+#, fuzzy, 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 "Les trois fenêtres de saisies sont assignées aux lettres \"A\", \"B\" et \"C\". \"A\" a la couleur bleue, \"B\" le vert et \"C\" le mauve. (Ce sont les options par défaut, mais elles peuvent être changées via le Menu Options)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:368
+#, fuzzy, 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 "Quand une différence est détectée les couleurs montrent quel fichier diffère. Quand les deux fichiers en entrée diffèrent, alors la couleur utilisée est le rouge par défaut (\"Couleur de conflit\" dans les Options). Ce schéma de couleur est particulièrement utile si vous avez trois fichiers en entrée, ce qui sera vu dans la prochaine section (<link linkend=\"merging\">Fusion</link>)."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:374
+#, no-c-format
+msgid "Summary Column"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:374
+#, fuzzy, 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 "A la gauche de chaque texte se trouve la \"colonne de résumé\". Si des différences sont trouvées sur une ligne alors la colonne de résumé affiché la couleur respective. Pour une différence d'espace seulement la colonne est changée. Pour les langages de programmation où les espaces ne sont pas si importants, il est pratique de voir d'un coup d'oeil si quelque chose d'important a été modifié. (En C/C++ les espaces ne sont intéressants que dans les chaînes, commentaires, pour le préprocesseur et dans quelques situations très ésotériques)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "La ligne verticale séparant la colonne de résumé et le texte est interrompue si le fichier en entrée n'a pas de lignes. Quand la coupe des mots est activée, alors cette ligne verticale apparaît en pointillé."
+
+# Tag: emphasis
+#. Tag: title
+#. +> trunk
+#: index.docbook:385
+#, fuzzy, no-c-format
+msgid "Overview Column"
+msgstr "Options de l'aperçu :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:385
+#, fuzzy, 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 "Sur le côté droit une colonne d'\"aperçu\" est visible à gauche de la barre de défilement verticale. Cela montre la colonne de résumé compressée de l'entrée \"A\". Toutes les différences et conflits sont visibles d'un coup d'oeil. Quand seulement deux fenêtre de saisie sont utilisées, alors toutes les différences apparaîtront en rouge ici car chaque différence est aussi un conflit. Un rectangle noir encadre les parties visibles des entrées. Pour les fichiers très longs, quand le nombre de lignes est plus grand que la hauteur de la colonne d'aperçu en pixels, alors plusieurs lignes partagent la seule ligne d'aperçu. Un conflit a alors la priorité maximale sur les autres simples différences, qui ont la priorité sur les lignes ou rien ne change, pour qu'aucune différence ou conflit ne soit perdu ici. En cliquant sur cette colonne d'aperçu le texte correspondant sera affiché."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:397
+#, no-c-format
+msgid "Manually Aligning Lines"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:408
+#, no-c-format
+msgid "Currently merging doesn't support the use of manual diff help."
+msgstr ""
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:410
+#, no-c-format
+msgid "Manually Joining and Splitting Diff Sections"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:425
+#, no-c-format
+msgid "Merging And The Merge Output Editor Window"
+msgstr "Fusionner et la Fenêtre d'édition du Résultat de la Fusion"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:429
+#, fuzzy, 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 "La fenêtre d'édition du résultat de la fusion (située sous la fenêtre de saisie de diff) a aussi une ligne d'information en haut affichant \"Résultat :\", le nom du fichier et \"[Modifié]\" si vous avez édité quelque chose. Habituellement elle contiendra du texte à travers les facilités de fusion automatique, mais conserve souvent quelques conflits."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:434
+#, fuzzy, 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 "!!! L'enregistrement est désactivé avant que tous les conflits ne soient résolus !!! (Utilisez les boutons \"Aller au conflit suivant/précédent\" pour trouver les conflits restants)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:437
+#, no-c-format
+msgid "With only two input files every difference is also a conflict that must be solved manually."
+msgstr "Avec seulement deux fichiers en entrée, chaque différence est aussi un conflit devant être résolu manuellement."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Avec trois fichiers en entrée, le premier fichier est traité comme la base, alors que les second et troisième fichiers en entrée contiennent des modifications. Quand dans une ligne seulement soit B ou C a changé mais pas les deux, la source changée sera sélectionnée. Seulement si B et C ont changé sur les mêmes lignes, alors l'outil détectera un conflit devant être résolu manuellement. Quand B et C sont les mêmes, mais différents de A, alors C est sélectionné."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:447
+#, fuzzy, no-c-format
+msgid "The Summary Column"
+msgstr "La colonne d'état"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:447
+#, fuzzy, 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 \"<Merge Conflict>\", 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 "La fenêtre d'édition du résultat de la fusion a aussi une colonne de résumé sur la gauche. Elle affiche la lettre de l'entrée sélectionnée pour une ligne ou rien si les trois sources étaient égales sur une ligne. Pour les conflits, elle affiche un point d'interrogation \"?\" et la ligne affiche \"<Conflit de Fusion>\" tout en rouge. Étant donné que la résolution des conflits ligne par ligne prendrait beaucoup de temps, les lignes sont groupées en groupes ayant les mêmes caractéristiques de différences et conflits. Seuls les conflits d'espaces sont séparés des autres conflits pour faciliter la fusion de fichiers où l'indentation a changé pour beaucoup de lignes."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:457
+#, no-c-format
+msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:457
+#, fuzzy, 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 "Quand vous cliquez dans la colonne de résumé avec le bouton gauche de la souris dans une fenêtre alors le groupe correspondant à cette ligne sera sélectionné dans toutes les fenêtres et le début de ce groupe sera affiché. (Cela peut invoquer un saut de repositionnement automatique dans la fenêtre si le début d'un groupe n'est pas visible). Ce groupe devient alors le \"groupe actuel\". Il est surligné et une barre noire apparaît sur le côté gauche du texte."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:463
+#, no-c-format
+msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. Tag: para
+#. +> trunk
+#: index.docbook:482
+#, fuzzy, 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 <No src line> 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 "Parfois, quand une ligne est supprimée soit par fusion automatique ou édition et qu'aucune autre ligne ne reste dans ce groupe, alors le texte <Pas de ligne à la source> apparaîtra sur cette ligne. C'est juste pour vous souvenir qu'il y avait une source ici si vous changez d'idée et sélectionnez une ligne de nouveau. Ce texte n'apparaîtra pas dans le fichier enregistré ou dans n'importe quelle sélection que vous copierez et collerez."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:488
+#, fuzzy, no-c-format
+msgid "The text \"<Merge Conflict>\" will appear in the clipboard if you copy and paste some text containing such a line. But still be careful to do so."
+msgstr "Le texte \"<Conflit de Fusion>\" apparaîtra dans le presse-papiers si vous copiez et collez du texte contenant une ligne au maximum. Mais faites toujours attention à cela."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:492
+#, no-c-format
+msgid "Choosing Input A, B, or C for All Conflicts"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:492
+#, fuzzy, 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 "La fusion normale démarrera par la résolution automatique de conflits simples. Mais le menu \"Fusion\" propose quelques actions pour d'autres besoins communs. Si vous avez à sélectionner la même source pour la plupart des conflits, alors vous pouvez choisir \"A\", \"B\" ou \"C\" partout, ou seulement pour les conflits restant non résolus, ou pour les conflits d'espacement non résolus. Si vous voulez décider chaque différence vous même, vous pouvez \"Mettre des deltas aux conflits\". Ou si vous voulez retourner aux choix automatiques de KDiff3 alors sélectionnez \"Résoudre automatiquement les conflits simples\". KDiff3 redémarre alors la fusion. Pour les actions changeant vos précédentes modifications KDiff3 vous demandera votre confirmation avant de continuer."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:503
+#, fuzzy, 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 "Note : Quand vous choisissez une des sources pour les conflits d'espacement non résolus et que les options \"Ignorer les nombres\" ou \"Ignorer les commentaires C/C++\" sont utilisées alors les changements dans les nombres ou commentaires seront aussi traités comme des espaces."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:508
+#, no-c-format
+msgid "Automatic Merge of Version Control Keywords and History (Log)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:508
+#, no-c-format
+msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:528
+#, no-c-format
+msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:551
+#, no-c-format
+msgid "Note that &kdiff3; will remove duplicate history entries. 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:564
+#, no-c-format
+msgid ""
+"Example: Assume a history that looks like this: <screen>\n"
+"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:568
+#, no-c-format
+msgid "The line with the \"$Log$\"-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
+#. +> trunk
+#: 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"
+"</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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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"
+"</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
+#. +> trunk
+#: 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:"
+msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
+msgstr ""
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:607
+#, no-c-format
+msgid "Navigation And Editing"
+msgstr "Navigation et Édition"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:608
+#, fuzzy, 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 "La majorité de la navigation sera effectuée avec les barres de défilement et la souris mais vous pouvez aussi naviguer avec les touches. Si vous cliquez dans une des fenêtres alors vous pouvez utilisez les touches page précédente, page suivante, home, fin, ctrl-home, ctrl-fin et les flèches comme vous le feriez dans les autres programmes. La colonne de résumé située à côté de la barre de défilement verticale des fichiers en entrée peut aussi être utilisée pour naviguer en cliquant dessus."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:615
+#, fuzzy, no-c-format
+msgid "You can also use the wheel mouse to scroll up and down."
+msgstr "Vous pouvez aussi utiliser la molette de la souris pour monter et descendre."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:617
+#, fuzzy, 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 "Dans l'éditeur de résultat de la fusion vous pouvez aussi utiliser les autres touches pour l'édition. Vous pouvez basculer entre les modes insérer et remplacer avec la touche Insertion. (Le mode par défaut est le mode d'insertion)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:621
+#, fuzzy, 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 "Un clic gauche dans une colonne de résumé synchronisera toutes les fenêtres pour qu'elles affichent le début du même groupe de lignes (comme expliqué dans la section <link linkend=\"merging\">\"Fusion\"</link>)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:625
+#, fuzzy, 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 "La barre de boutons contient aussi sept bouttons de navigation avec lesquels vous pouvez naviguer vers la première/actuelle/dernière différence, vers la différence précédente/suivante (ctrl-haut/ctrl-bas), vers le conflit précédent/suivant (ctrl-pgpréc/ctrl-pgsuiv), ou vers le conflit non résolu précédent/suivant. Notez que pour KDiff3 un \"conflit\" qui n'a pas été résolu automatiquement au début de la fusion reste un \"conflit\" même s'il est résolu. Voila la nécessité de distinguer les \"conflits non résolus\"."
+
+# Tag: emphasis
+#. Tag: title
+#. +> trunk
+#: index.docbook:633
+#, fuzzy, no-c-format
+msgid "Auto-Advance"
+msgstr "Délai d'avancée automatique (en ms) :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:634
+#, fuzzy, 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- & 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 "Il y a aussi un bouton \"Aller automatiquement au conflit non résolu suivant après la sélection de la source\" (Avancée automatique). Si vous activez cette option, alors, quand une source est sélectionnée, KDiff3 avancera automatiquement en sélectionnant le prochain conflit non résolu. Cela vous aidera si vous voulez toujours ne choisir qu'une source. Si vous avez besoin de deux sources, ou si vous voulez éditer après la sélection, alors vous voudrez probablement désactiver cette fonctionnalité. Avant d'avancer au conflit suivant KDiff3 vous montre les modifications de ce choix pour un court laps de temps. Ce délai est ajustable dans les Options de Fusion et de Diff : Vous pouvez spécifier le \"Délai d'avancée automatique\" en millisecondes entre 0 et 2000. Astuce : Vous êtes fatigué d'effectuer trop de clics ? - Utilisez un court délai d'avancée automatique et les raccourcis Ctrl-1/2/3 pour sélectionner A/B/C pour les conflits."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:650
+#, no-c-format
+msgid "Select, Copy And Paste"
+msgstr "Sélectionner, Copier et Coller"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:651
+#, fuzzy, 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 "La fenêtre d'entrée n'affiche pas de curseur, les sélections peuvent donc être effectuées via la souris en cliquant avec le bouton gauche au début, en gardant le bouton pressé et en se déplaçant à la fin de la sélection souhaitée, où vous relâchez le bouton. Vous pouvez aussi sélectionner un mot en double cliquant dessus. Dans l'éditeur de résultat de la fusion vous pouvez aussi sélectionner via le clavier en gardant le bouton \"Maj\" pressé et en naviguant via les flèches."
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. Tag: para
+#. +> trunk
+#: index.docbook:667
+#, fuzzy, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
+msgstr "Pour copier vers le presse-papiers vous devez cliquez sur le boutton \"Copier\" (Ctrl-C ou Ctrl-Inser). Mais il existe une fonctionnalité \"Copier automatiquement la sélection\". Si elle est activée, alors tout ce que vous sélectionnerez sera copié automatiquement vers le presse papier et vous n'aurez pas besoin de copier. Mais faites attention lorsque vous utilisez cela car le contenu du presse-papiers peut être effacé accidentellement."
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:686
+#, no-c-format
+msgid "Saving"
+msgstr "Enregistrer"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:687
+#, fuzzy, 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 "L'enregistrement ne sera autorisé que quand tous les conflits seront résolus. Si le fichier existe déjà et que la fonctionnalité \"Effectuer une copie de sauvegarde des fichiers\" est activée alors le fichier existant sera renommé avec une extension en \".orig\", mais si un fichier .orig existe déjà il sera supprimé. Quand vous quittez ou lancez une autre analyse diff et que les données n'ont pas encore été enregistrées, alors KDiff3 vous demandera si vous voulez enregistrer, annuler ou continuer sans enregistrer. (KDiff3 ne saisit aucun signal. Donc si vous \"tuez\" KDiff3 vos données seront perdues)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:695
+#, fuzzy, 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 "Les fins de ligne sont enregistrées selon la méthode normale de l'OS. Pour les Unix chaque fin de ligne se termine avec un caractère \"\\n\", tandis que pour les systèmes basés sur Win32 chaque ligne se termine avec un retour chariot et \"\\r\\n\". KDiff3 ne préserve pas les fins de ligne des fichiers en entrée, ce qui signifie aussi que vous ne devriez pas utiliser KDiff3 pour les fichiers binaires."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:704
+#, no-c-format
+msgid "Finding Strings"
+msgstr "Trouver des chaînes"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:705
+#, fuzzy, 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 "Vous pouvez chercher une chaîne dans n'importe quelle fenêtre de KDiff3. La commande \"Chercher...\" (Ctrl-F) dans le menu Édition ouvre une fenêtre vous permettant de spécifier la chaîne à rechercher. Vous pouvez aussi sélectionner la fenêtre dans laquelle la chaîne doit être cherchée. La recherche reste toujours au premier plan. En utilisant \"Chercher le suivant\" (F3), vous chercherez l'occurrence suivante. Si vous sélectionner plusieurs fenêtres, alors la première fenêtre sera scannée du début jusqu'à la fin avant que la recherche ne démarre dans la fenêtre suivante au premier plan, etc."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:716
+#, fuzzy, no-c-format
+msgid "Printing"
+msgstr "Attention"
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:726
+#, no-c-format
+msgid "All:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:726
+#, no-c-format
+msgid "Print everything."
+msgstr ""
+
+#. Tag: term
+#. +> trunk
+#: index.docbook:727
+#, no-c-format
+msgid "Current:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: 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 achieved by specifying page number 10000 for printing.)"
+msgstr ""
+
+# Tag: emphasis
+#. Tag: term
+#. +> trunk
+#: index.docbook:729
+#, fuzzy, no-c-format
+msgid "Selection:"
+msgstr "Copier automatiquement la sélection :"
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. +> trunk
+#: index.docbook:735
+#, fuzzy, no-c-format
+msgid "Range:"
+msgstr "Langue :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:735
+#, no-c-format
+msgid "Specify the first and last page."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:738
+#, no-c-format
+msgid "Other important options for printing will be taken from the normal options:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:741
+#, no-c-format
+msgid "Font, font size"
+msgstr ""
+
+# Tag: emphasis
+#. Tag: para
+#. +> trunk
+#: index.docbook:742
+#, fuzzy, no-c-format
+msgid "Show line numbers"
+msgstr "Afficher les numéros de ligne :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:743
+#, no-c-format
+msgid "Word wrap"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:744
+#, fuzzy, no-c-format
+msgid "<para>Colors</para>"
+msgstr "<para>...</para>"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:745
+#, no-c-format
+msgid "etc."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:747
+#, no-c-format
+msgid "Landscape formatting is also recommended for printing."
+msgstr ""
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:752
+#, no-c-format
+msgid "Options"
+msgstr "Options"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:753
+#, fuzzy, 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 "Les options et la liste des fichiers récemment ouverts seront enregistrées lorsque vous quitterez le programme, et rechargées lorsque vous le démarrerez. (Menu Options / Configurer KDiff3)..."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:757
+#, no-c-format
+msgid "Font"
+msgstr "Police"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Sélectionnez un taille de police fixe. (Sur certains systèmes cette fenêtre présentera aussi des tailles de police variable, mais vous ne devriez pas les utiliser)."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:763
+#, no-c-format
+msgid "Italic Font for Deltas:"
+msgstr "Police italique pour les différences :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Si vous sélectionnez cela, alors les différences de texte seront affichées dans la version italique de la police. Si la police ne supporte pas l'italique, cela ne fera rien."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:770
+#, no-c-format
+msgid "<title>Colors</title>"
+msgstr ""
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:772
+#, no-c-format
+msgid "Foreground color:"
+msgstr "Couleur du premier plan :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:772 index.docbook:785
+#, no-c-format
+msgid "Usually black."
+msgstr "Habituellement le noir."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:773
+#, no-c-format
+msgid "Background color:"
+msgstr "Couleur de l'arrière plan :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:773
+#, no-c-format
+msgid "Usually white."
+msgstr "Habituellement le blanc."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:774
+#, no-c-format
+msgid "Diff Background color:"
+msgstr "Couleur de l'arrière plan de Diff :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:774
+#, no-c-format
+msgid "Usually light gray."
+msgstr "Habituellement le gris clair."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:775
+#, no-c-format
+msgid "Color A:"
+msgstr "Couleur A :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:775
+#, no-c-format
+msgid "Usually dark blue."
+msgstr "Habituellement le bleu foncé."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:776
+#, no-c-format
+msgid "Color B:"
+msgstr "Couleur B :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:776
+#, no-c-format
+msgid "Usually dark green."
+msgstr "Habituellement le vert foncé."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:777
+#, no-c-format
+msgid "Color C:"
+msgstr "Couleur C :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:777
+#, no-c-format
+msgid "Usually dark magenta."
+msgstr "Habituellement le mauve foncé."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:778
+#, no-c-format
+msgid "Conflict Color:"
+msgstr "Couleur de conflit :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:778 index.docbook:783
+#, no-c-format
+msgid "Usually red."
+msgstr "Habituellement le rouge."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:779
+#, no-c-format
+msgid "Current range background color:"
+msgstr "Couleur de l'arrière plan de la sélection actuelle :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:779
+#, no-c-format
+msgid "Usually light yellow."
+msgstr "Habituellement le jaune clair."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:780
+#, no-c-format
+msgid "Current range diff background color:"
+msgstr "Couleur de l'arrière plan de la sélection différant actuelle :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:780 index.docbook:784
+#, no-c-format
+msgid "Usually dark yellow."
+msgstr "Habituellement le jaune foncé"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:781
+#, no-c-format
+msgid "Color for manually aligned difference ranges:"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:781
+#, fuzzy, no-c-format
+msgid "Usually orange."
+msgstr "Habituellement le rouge."
+
+# Tag: title
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:782
+#, fuzzy, no-c-format
+msgid "Newest file color in directory comparison:"
+msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:782
+#, fuzzy, no-c-format
+msgid "Usually green."
+msgstr "Habituellement le vert foncé."
+
+# Tag: title
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:783
+#, fuzzy, no-c-format
+msgid "Oldest file color in directory comparison:"
+msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
+
+# Tag: title
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:784
+#, fuzzy, no-c-format
+msgid "Middle age file color in directory comparison:"
+msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
+
+# Tag: title
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:785
+#, fuzzy, no-c-format
+msgid "Color for missing files in directory comparison:"
+msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
+
+#. Tag: para
+#. +> trunk
+#: 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
+#. Tag: para
+#. +> trunk
+#: index.docbook:790
+#, fuzzy, 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 "Pour les systèmes ne comprenant que 16 ou 256 couleurs certaines couleurs ne sont pas disponibles en forme pure. Sur ces systèmes le boutton \"Par défaut\" choisira une couleur pure."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:796
+#, no-c-format
+msgid "Editor Settings"
+msgstr "Options de l'éditeur"
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:798
+#, no-c-format
+msgid "Tab inserts spaces:"
+msgstr "Tabulation insère des espaces :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Si ceci est désactivé et que vous pressez la touche de tabulation, un caractère de tabulation est inséré, sinon la quantité appropriée de caractères est insérée."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:801
+#, no-c-format
+msgid "Tab size:"
+msgstr "Taille de la tabulation :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:801
+#, no-c-format
+msgid "Can be adjusted for your specific needs. Default is 8."
+msgstr "Peut être ajustée pour vos besoins spécifique. Par défaut, 8."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:802
+#, no-c-format
+msgid "Auto indentation:"
+msgstr "Indentation automatique :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:802
+#, fuzzy, no-c-format
+msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
+msgstr "Quand vous pressez le bouton Entrée ou Retour l'indentation de la ligne précédente est utilisée pour la nouvelle ligne."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:804
+#, no-c-format
+msgid "Auto copy selection:"
+msgstr "Copier automatiquement la sélection :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:804
+#, fuzzy, no-c-format
+#| msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitely copy it."
+msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
+msgstr "Chaque sélection est copiée automatiquement vers le presse-papiers quand cette option est activée."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:806
+#, no-c-format
+msgid "Line end style:"
+msgstr "Style de fin de ligne :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: 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 "Quand vous enregistrez vous pouvez sélectionner quel style de fin de ligne vous préférez. La configuration par défaut est le choix commun pour le système d'exploitation utilisé."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:811
+#, fuzzy, no-c-format
+msgid "Diff Settings"
+msgstr "Options de Comparaison et de Fusion"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:812
+#, fuzzy, 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 "Quand vous comparez des fichiers, KDiff3 essaie d'abord de comparer les lignes qui sont égales dans les trois fichiers. Il ne peut ignorer les espaces que dans cette étape. La seconde étape compare chaque ligne. Dans cette étape les espaces ne seront pas ignorés. Durant la fusion les espaces ne seront pas ignorés non plus."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:820
+#, no-c-format
+msgid "Ignore numbers:"
+msgstr "Ignorer les nombres :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:820
+#, fuzzy, 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 "Désactivé par défaut. Les chiffres ('0'-'9', '.', '-') seront ignorés dans la première partie de l'analyse durant laquelle la comparaison des lignes est effectuée. Dans le résultat les différences seront affichées dans tous les cas, mais elles sont traitées comme des espaces."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:825
+#, no-c-format
+msgid "Ignore C/C++ comments:"
+msgstr "Ignorer les commentaires C/C++ :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:825
+#, no-c-format
+msgid "Default is off. Changes in comments will be treated like changes in white space."
+msgstr "Désactivé par défaut. Les changements dans les commentaires seront traités comme les changements dans les espaces."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:828
+#, no-c-format
+msgid "Ignore case:"
+msgstr "Ignorer la casse :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:828
+#, fuzzy, no-c-format
+msgid "Default is off. Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space."
+msgstr "Désactivé par défaut. Les changements dans les commentaires seront traités comme les changements dans les espaces."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:831 index.docbook:998
+#, no-c-format
+msgid "Preprocessor-Command:"
+msgstr "Commande Préprocesseur :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:831 index.docbook:834
+#, no-c-format
+msgid "See <link linkend=\"preprocessors\">next section</link>."
+msgstr "Se reporter à la <link linkend=\"preprocessors\">section suivante</link>."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:834 index.docbook:1005
+#, no-c-format
+msgid "Line-Matching Preprocessor-Command:"
+msgstr "Commande préprocesseur de comparaison de ligne :"
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:837
+#, no-c-format
+msgid "Try Hard:"
+msgstr "S'efforcer :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:837
+#, 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 "S'efforcer de trouver des différences encore plus petites. (Activé par défaut). Ceci sera probablement efficace pour les fichiers lourds et compliqués, lent pour les fichiers très lourds."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:844
+#, fuzzy, no-c-format
+msgid "Merge Settings"
+msgstr "Options de Comparaison et de Fusion"
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:846
+#, no-c-format
+msgid "Auto Advance Delay (ms):"
+msgstr "Délai d'avancée automatique (en ms) :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:846
+#, 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 "Quand le mode d'avancée automatique est activé, cette option spécifie la durée d'affichage du résultat de la sélection avant de sauter au conflit non résolu suivant."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:850
+#, no-c-format
+msgid "White space 2/3-file merge default:"
+msgstr "Choix par défaut pour les espaces lors d'une fusion à 2/3 fichiers :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:850
+#, fuzzy, 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 "Résoudre automatiquement tous les conflits d'espaces en choisissant le fichier spécifié. (Le choix par défaut est le choix manuel). Utile si tous les espaces ne sont pas vraiment importants dans les fichiers. Si vous avez besoin de cela occasionellement, il est mieux d'utiliser \"Choisir A/B/C pour tous les conflits d'espaces non résolus\" dans le menu de fusion. Notez que si vous activésoit \"Ignorer les nombres\" ou \"Ignorer les commentaires C/C++\" alors ce choix automatique est aussi appliqué pour les conflits dans les nombres ou les commentaires."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:857
+#, no-c-format
+msgid "Auto merge regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:857
+#, 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
+#. +> trunk
+#: index.docbook:860
+#, no-c-format
+msgid "Run regular expression auto merge on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:860
+#, 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
+#. +> trunk
+#: index.docbook:863
+#, no-c-format
+msgid "History start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:863
+#, no-c-format
+msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:868
+#, no-c-format
+msgid "History entry start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:868
+#, 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
+#. +> trunk
+#: index.docbook:875
+#, no-c-format
+msgid "History merge sorting:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:875
+#, no-c-format
+msgid "Enable version control history sorting."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:878
+#, no-c-format
+msgid "History entry start sort key order:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:878
+#, 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
+#. +> trunk
+#: index.docbook:886
+#, no-c-format
+msgid "Merge version control history on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:886
+#, no-c-format
+msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:889
+#, no-c-format
+msgid "Max number of history entries:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:889
+#, 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
+#. +> trunk
+#: index.docbook:892
+#, no-c-format
+msgid "Test your regular expressions"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:892
+#, 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
+#. +> trunk
+#: index.docbook:898
+#, no-c-format
+msgid "Irrelevant merge command:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:898
+#, 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:910
+#, no-c-format
+msgid "Directory Merge"
+msgstr "Fusion de dossiers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:911
+#, 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 "Ces options sont en relation avec le scan de dossiers et le déroulement de la fusion : Reportez-vous à la <link linkend=\"dirmergeoptions\">Documentation sur la Comparaison/Fusion de dossiers</link> pour plus de détails."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:915
+#, no-c-format
+msgid "Yet there is one option here that is also relevant for saving single files:"
+msgstr "Il y a déjà une option ici qui est aussi pertinente pour l'enregistrement de fichiers seuls :"
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:919 index.docbook:1621
+#, no-c-format
+msgid "Backup files:"
+msgstr "Fichiers de sauvegarde :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:919
+#, fuzzy, 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 "Quand un fichier est enregistré et qu'une ancienne version existe déjà, alors la version originale sera renommée avec une extension \".orig\". Si un ancien fichier de sauvegarde portant l'extension \".orig\" existe déjà, alors il sera supprimé sans sauvegarde."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:927
+#, no-c-format
+msgid "Regional and Language Options"
+msgstr "Options Linguistiques et Régionales"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:929
+#, no-c-format
+msgid "Language:"
+msgstr "Langue :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:929
+#, fuzzy, 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 "Ajuste la langue de l'interface utilisateur. Changer cette option n'affecte pas le fonctionnement de votre programme. Vous devrez quitter et redémarrer KDiff3 pour que la langue soit changée. (Cette option n'est pas disponible dans la version KDE de KDiff3 car la langue est ajustable dans les options KDE globales.)"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:931
+#, no-c-format
+msgid "Use the same encoding for everything:"
+msgstr "Utiliser le même encodage pour tout :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:931
+#, 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 "Les options d'encodage suivantes peuvent être ajustées séparemment pour chaque élement ou si cette option est activée, toutes les valeurs prendront la même valeur."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:933
+#, no-c-format
+msgid "Local Encoding:"
+msgstr "Encodage local :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:933
+#, 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 "Sous le sélecteur d'encodage apparait une note vous informant de l'encodage local. (Elle n'est pas ajustable mais informative si vous ne connaissez pas votre encodage local, vous devrez la sélectionner.)"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:935
+#, no-c-format
+msgid "File Encoding for A/B/C:"
+msgstr "Encodage du fichier pour A/B/C :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:935
+#, 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 "Ajuste l'encodage pour les fichiers en entrée. Ceci a un effet sur l'interpretation des caractères spéciaux. Etant donné que vous pouvez ajuster chaque encodage séparemment et même comparer et fusionner les fichiers enregistrés en utilisant des encodages différents."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:937
+#, no-c-format
+msgid "File Encoding for Merge Output and Saving:"
+msgstr "Encodage pour la sortie de la fusion et l'enregistrement :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:937
+#, no-c-format
+msgid "When you have edited a file, then you can adjust which encoding will be used when saving to disk."
+msgstr "Quand vous avez édité un fichier, alors vous pouvez ajuster quel encodage sera utilisé lors de l'enregistrement sur le disque."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:939
+#, no-c-format
+msgid "File Encoding for Preprocessor Files:"
+msgstr "Encodage pour les fichiers préprocesseurs :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:939
+#, 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 "Quand vous définissez des préprocesseurs ils peuvent ne pas pouvoir opérer dans votre encodage. (par exemple, vos fichiers sont en unicode 16-bits et votre préprocesseur ne peut prendre que de l'ascii 8-bits.) Avec cette option vous pouvez définir l'encodage de la sortie du préprocesseur."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:941
+#, no-c-format
+msgid "Right To Left Language:"
+msgstr "Langue de droite à gauche :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:941
+#, fuzzy, 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 "Certaines langues sont écrites de droite à gauche. Quand cette case est cochée, KDiff3 écrit le texte de droite à gauche dans la fenêtre d'entrée et dans la fenêtre de sortie de fusion. Notez que si vous lancez KDiff3 avec l'option de la ligne de comande \"--reverse\", ce sera la même chose. (C'est une fonctionnalité proposée par Qt.) Cette documentation a été écrite en estimant que \"Langue de droite à gauche\" était désactivée. Certaines références pour \"gauche\" ou \"droite\" doivent alors être remplacées par leurs contraire si vous utilisez ces options."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:947
+#, no-c-format
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:948
+#, fuzzy, no-c-format
+msgid "(These options and actions are available in menus or the buttonbar.)"
+msgstr "(Ces options et actions sont disponibles dans les menus ou la barre des boutons)."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:950
+#, no-c-format
+msgid "Show line numbers:"
+msgstr "Afficher les numéros de ligne :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:950
+#, no-c-format
+msgid "You can select if line numbers should be shown for the input files."
+msgstr "Vous pouvez sélectionner si les numéros de ligne doivent être affichés pour les fichiers en entrée."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:952
+#, no-c-format
+msgid "Show space and tabulator characters for differences:"
+msgstr "Afficher les espaces et les alinéas pour les différences :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:952
+#, no-c-format
+msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
+msgstr "Parfois les espaces et alinéas visibles peuvent vous déranger. Vous pouvez désactiver cette option."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:954
+#, no-c-format
+msgid "Show white space:"
+msgstr "Afficher les espaces :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:954
+#, fuzzy, 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 "Désactivez cette option pour supprimer tous les surlignements ou les changements d'espaces dans le texte ou dans les colonnes d'aperçu. (Notez que cela s'applique aussi aux changements dans les nombres ou commentaires quand les options \"Ignorer les nombres\" ou \"Ignorer les commentaires\" sont actives)."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:958
+#, no-c-format
+msgid "Overview options:"
+msgstr "Options de l'aperçu :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:958
+#, fuzzy, 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 "Ces choix ne sont disponibles que si vous comparez trois fichiers. Dans le mode normal toutes les différences sont affichées dans une colonne d'aperçu codée en une seule colonne. Mais parfois vous pouvez être particulièrement intéressés par les différences entre seulement deux de ces trois fichiers. En sélectionnant l'aperçu \"A et B\", \"A et C\" ou \"B et C\", une seconde colonne d'aperçu sera affichée avec les informations nécessaires à côté de l'aperçu normal."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:965
+#, no-c-format
+msgid "Word wrap diff windows:"
+msgstr "Fenêtre de coupe des mots :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:965
+#, no-c-format
+msgid "Wrap lines when their length would exceed the width of a window."
+msgstr "Coupe des mots lorsque leur longueur dépasse la largeur de la fenêtre."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:968
+#, no-c-format
+msgid "Show Window A/B/C:"
+msgstr "Afficher la fenêtre A/B/C :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:968
+#, fuzzy, 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 "Parfois vous voudrez mieux utiliser l'espace sur l'écran pour les longues lignes. Cachez les fenêtres qui ne sont pas importantes. (Dans le menu Fenêtre)."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:971
+#, no-c-format
+msgid "Toggle Split Orientation:"
+msgstr "Sens de la séparation des fenêtres :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:971
+#, fuzzy, 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 "Choisir entre les fenêtres de comparaison affichées côte à côte (A à côté de B à côté de C) ou l'une au-dessus de l'autre (A sur B sur C). Cela devrait aussi vous aider si les lignes sont longues. (Dans le menu Fenêtre)."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:975
+#, no-c-format
+msgid "Start a merge quickly:"
+msgstr "Démarrer une fusion rapide :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:975
+#, fuzzy, 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 "Parfois vous voyez des différences et vous décidez de fusionner. <inlinemediaobject><imageobject><imagedata fileref=\"merge_current.png\" format=\"PNG\"/></imageobject></inlinemediaobject> \"Fusionner le fichier actuel\" dans le menu Dossiers fonctionne aussi si vous voulez comparer deux fichiers. Un simple clic démarre la fusion et utilise le nom de fichier du dernier fichier en entrée comme étant le nom du fichier résultat de la fusion par défaut. (Quand ceci est utilisé pour redémarrer une fusion, alors le nom de fichier résultat sera conservé)."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:985
+#, no-c-format
+msgid "Configuring Keyboard-Shortcuts"
+msgstr "Configurer les raccourcis clavier"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:986
+#, fuzzy, no-c-format
+msgid "Currently only the KDE-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
+msgstr "Actuellement seule la version KDE supporte la configuration des raccourcis clavier par l'utilisateur. (Menu Configuration / Configurer les raccourcis clavier)..."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:993
+#, no-c-format
+msgid "Preprocessor Commands"
+msgstr "Commandes préprocesseur"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:994
+#, fuzzy, no-c-format
+msgid "&kdiff3; supports two preprocessor options."
+msgstr "KDiff3 supporte deux options préprocesseur."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:998
+#, fuzzy, 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 "Quand un fichier est lu, il sera traité à travers cette commande externe. Le résultat de cette commande sera visible à la place du fichier original. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Utilisez cela pour exclure les parties du fichier qui vous gênent, ou corriger automatiquement l'indentation, etc."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1005
+#, 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 "Quand un fichier est lu, il sera traité à travers cette commande externe. Si une commande préprocessus (voir ci-dessus) est aussi spécifiée, alors le fichier résultat de la commande préprocesseur est utilisé pour le préprocessus de traitement de lignes. Le résultat de cette dernière ne sera utilisé que durant la phase de comparaison de lignes de l'analyse. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Chaque ligne en entrée a une ligne en sortie correspondante."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1015
+#, 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 "L'idée est de permettre à l'utilisateur d'avoir une plus grande flexibilité de configuration du résultat de la comparaison. Mais cela nécessite un programme externe, et beaucoup d'utilisateurs ne veulent pas en écrire un eux-mêmes. La bonne nouvelle est que très souvent <command>sed</command> ou <command>perl</command> feront l'affaire."
+"</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
+#. Tag: title
+#. +> trunk
+#: index.docbook:1038
+#, no-c-format
+msgid "<command>sed</command> Basics"
+msgstr "Bases de <command>sed</command>"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1039
+#, fuzzy, 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 "Cette section n'introduit qu'aux fonctions les plus basiques de <command>sed</command>. Pour plus d'informations reportez vous à <ulink url=\"info:/sed\">la page info de sed</ulink> ou <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>. Une version précompilée pour Windows peut être trouvée à <ulink url=\"http://unxutils.sourceforge.net\">http://unxutils.sourceforge.net</ulink>. Notez que les exemples qui suivent partent du principe que la commande <command>sed</command> est dans un dossier de la variable d'environnement PATH. Si ce n'est pas le cas, vous devrez spécifier le chemin complet absolu pour la commande. Notez aussi que les exemples qui suivent utilisent les guillemets simples (') qui ne fonctionnent pas sous windows. Sur windows vous devez utilisez les doubles guillemets (\") à la place."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1050
+#, 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
+#. +> trunk
+#: index.docbook:1052
+#, no-c-format
+msgid ""
+"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
+"</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"
+"</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."
+msgid "Examples For <command>sed</command>-Use In &kdiff3;"
+msgstr "Exemples d'utilisations de <command>sed</command> dans KDiff3"
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1069
+#, no-c-format
+msgid "Ignoring Other Types Of Comments"
+msgstr "Ignorer les autres types de commentaires"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1070
+#, fuzzy, 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 ""
+"Actuellement KDiff3 ne comprend que les commentaires C/C++. En utilisant la commande préprocesseur de traitement de ligne vous pouvez aussi ignorer d'autres types de commentaires, en les convertissant en commentaires C/C++. Exemple : Pour ignorer les commentaires commençant par \"#\", vous devriez les convertir en \"//\". Notez que vous devrez aussi activer l'option \"Ignorer les commentaires C/C++\" pour que cela ait un effet. La commande préprocesseur de traitement de ligne appropriée serait <screen>\n"
+" <command>sed</command> 's/#/\\/\\//'\n"
+"</screen> Étant donné que pour <command>sed</command> le caractère \"/\" a un sens particulier, il est nécessaire de placer le caractère \"\\\" devant chaque \"/\" dans une chaîne de remplacement. Parfois le \"\\\" est nécessaire pour ajouter ou supprimer un sens particulier de certains caractères. Le guillemet simple (') avant et après la commande de substitution est désormais important, car sinon le shell essaierait d'interpréter certains caractères spéciaux comme'#', '$' ou '\\' avant de les passer à <command>sed</command>. Notez que sur Windows vous aurez besoin des doubles marques de citation ici (\"). Windows substitue les autres caractères comme '%', alors vous pourriez avoir quelques essais à faire."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1089
+#, no-c-format
+msgid "Caseinsensitive Diff"
+msgstr "Comparaison non sensible à la casse"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1090
+#, fuzzy, 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 ""
+"Utilisez la commande préprocesseur de traitement de ligne suivante pour convertir toutes ce qui est situé en entrée en majuscules : <screen>\n"
+" <command>sed</command> 's/\\(.*\\)/\\U\\1/'\n"
+"</screen> Ici \".*\" est une expression rationnelle qui trouve, dans ce contexte, tous les caractères de la ligne. Le \"\\1\" est la chaîne de remplacement en référence au texte trouvé dans la première paire de \"\\(\" et \"\\)\". Le \"\\U\" convertit le texte inséré en majuscules."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1100
+#, no-c-format
+msgid "Ignoring Version Control Keywords"
+msgstr "Ignorer les mots clés CVS"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1101
+#, fuzzy, 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"
+"</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 ""
+"CVS et d'autres systèmes de contrôle de version utilisent des mots clés pour insérer les chaînes générées automatiquement (<ulink url=\"info:/cvs/Keyword substitution\">info:/cvs/Keyword substitution</ulink>). Tous suivent le modèle \"$KEYWORD generated text$\". Nous avons maintenant besoin d'une commande préprocesseur de traitement de ligne qui ne supprime que le texte généré : <screen>\n"
+"</screen> Le \"\\|\" sépare les mots clés possibles. Vous pouvez vouloir modifier cette liste selon vos besoins. Le \"\\\" avant le \"$\" est nécessaire car sinon le \"$\" signifie fin de la ligne."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1111
+#, 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 "Quand vous ferez des expérimentations avec <command>sed</command> vous pourrez arriver à comprendre toutes ces expressions rationnelles. Elles sont utiles car beaucoup d'autres programmes supportent ces mêmes fonctionnalités."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1118
+#, no-c-format
+msgid "Ignoring Numbers"
+msgstr "Ignorer les nombres"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1119
+#, fuzzy, 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"
+"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
+msgstr ""
+"Ignorer les nombres est actuellement une option intégrée. Mais en tant qu'autre exemple, c'est ce qui se passerait si vous aviez mis comme commande préprocesseur de traitement de ligne. <screen>\n"
+"</screen> Chaque caractère dans '[' ']' est remplacé par rien."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1127
+#, no-c-format
+msgid "Ignoring Certain Columns"
+msgstr "Ignorer certaines colonnes"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1128
+#, fuzzy, 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"
+"</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 ""
+"Parfois un texte est très strictement formaté, et il y a certaines colonnes que vous voudrez toujours ignorer, tandis que vous voudrez en gardez d'autres pour l'analyse. Dans l'exemple qui suit les cinq premières colonnes (caractères de chaque ligne) sont ignorés, les dix colonnes suivantes sont conservées, puis de nouveaux cinq colonnes sont ignorées et le reste de la ligne est conservé. <screen>\n"
+"</screen> Chaque point '.' correspond à un caractère. Le \"\\1\" et \"\\2\" dans la chaîne de remplacement réfère au texte correspondant situé entre la première paire de \"\\(\" et\"\\)\" dénotant que le texte doit être conservé."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1138
+#, no-c-format
+msgid "Combining Several Substitutions"
+msgstr "Combiner plusieurs substitutions"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1139
+#, fuzzy, 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 "Parfois vous voudrez appliquer plusieurs substitutions à la fois. Vous pouvez alors utilisez le point-virgule ';' pour les séparer les unes des autres. Exemple :"
+"</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 "Ordre d'exécution des commandes préprocesseur"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1160
+#, no-c-format
+msgid "The data is piped through all internal and external preprocessors in the following order:"
+msgstr "Les données traversent tous les préprocesseurs internes et externes dans l'ordre suivant :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1165
+#, no-c-format
+msgid "Normal preprocessor,"
+msgstr "Préprocesseur normal,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1166
+#, no-c-format
+msgid "Line-Matching-Preprocessor,"
+msgstr "Préprocesseur de traitement de ligne,"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1167
+#, no-c-format
+msgid "Ignore case (conversion to uppercase),"
+msgstr "Ignorer la casse (conversion en majuscule),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1168
+#, no-c-format
+msgid "Detection of C/C++ comments,"
+msgstr "Détection des commentaires C/C++,"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1169
+#, no-c-format
+msgid "Ignore numbers,"
+msgstr "Ignorer les nombres,"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1170
+#, no-c-format
+msgid "Ignore white space"
+msgstr "Ignorer les espaces"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1172
+#, 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 "Les données après le préprocesseur normal seront conservées pour l'affichage et la fusion. Les autres opérations ne modifient que les données que l'algorithme de comparaison de lignes peut voir."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1175
+#, 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 "Dans les rares cas ou vous utiliserez un préprocesseur normal, notez que le préprocesseur de traitement de ligne prend la sortie du préprocesseur normal en tant qu'entrée."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1181
+#, no-c-format
+msgid "Warning"
+msgstr "Attention"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1182
+#, fuzzy, 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 "Les commandes préprocesseur sont très souvent utiles, mais comme avec toutes les options modifiant vos textes ou cachant certaines différences automatiquement, vous pouvez accidentellement sauter certaines différences et dans le pire des cas supprimer des données importantes."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1186
+#, fuzzy, 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 want 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 "C'est pour cette raison que durant une fusion, si une commande préprocesseur normale est utilisée, KDiff3 vous en informera et vous demandera si elle doit être ou non désactivée. Mais ne vous inquiétez pas si une commande préprocesseur de traitement de ligne est active. La fusion ne sera pas terminée tant que tous les conflits ne seront pas résolus. SI vous avez désactivé \"Afficher les espaces\", alors les différences qui seront supprimées avec la commande préprocesseur de traitement de ligne seront aussi invisibles. Si le boutton d'enregistrement reste désactivé durant une fusion (à cause de conflits restants), assurez vous d'avoir activé \"Montrer les espaces\". Si vous ne voulez pas fusionner ces différences moins importantes manuellement, vous pouvez sélectionner \"Choisir [A|B|C] pour tous les conflits d'espaces non résolus\" dans le menu Fusion."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1201
+#, fuzzy, no-c-format
+msgid "Directory Comparison and Merge with &kdiff3;"
+msgstr "Comparaison et Fusion de dossiers avec KDiff3"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1202
+#, fuzzy, no-c-format
+msgid "Introduction into Directory Comparison and Merge"
+msgstr "Démarrer une comparaison ou une fusion de dossiers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1203
+#, fuzzy, 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 "Souvent les programmeurs doivent modifier beaucoup de fichiers dans un dossiers pour parvenir à leur but. Pour cela KDiff3 vous permet aussi de comparer et de fusionner des dossiers complets récursivement !"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1207
+#, fuzzy, 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 "Bien souvent la comparaison et la fusion de dossiers semble bien compliquée, il y a beaucoup de détails dont que vous devriez savoir. Le plus important est bien sur le fait que maintenant beaucoup de fichiers peuvent être affectés par chaque opération. Si vous n'avez pas de sauvegardes de vos données originales, alors il peut être très difficile voire impossible de revenir à l'état original. Donc, avant de démarrer une fusion, assurez-vous que vos données sont en sécurité, et qu'un retour à l'état initial est possible. Vous pouvez faire une archive ou utiliser un système de contrôle de version (CVS), mais même les programmeurs expérimentés et les intégrateurs ont besoin des anciennes sources. Et notez que même si moi (auteur de KDiff3) ait essayé de faire de mon mieux, je ne peux pas garantir qu'il n'y ait pas de bogues. Et selon la GNU-GPL il n'y a AUCUNE GARANTIE sur quoi que ce soit pour ce programme. Alors soyez humble et gardez toujours à l'esprit :"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1221
+#, no-c-format
+msgid "To err is human, but to really mess things up you need a computer."
+msgstr "L'erreur est humaine, mais pour vraiment faire n'importe quoi vous avez besoin d'un ordinateur."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1223
+#, fuzzy, no-c-format
+msgid "So this is what this program can do for you: &kdiff3; ..."
+msgstr "Voila ce que ce programme peut faire pour vous : KDiff3..."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1227
+#, no-c-format
+msgid "... reads and compares two or three directories recursively,"
+msgstr "...lit et compare deux ou trois dossiers récursivement,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1228
+#, no-c-format
+msgid "... takes special care of symbolic links,"
+msgstr "... fait spécialement attention aux liens symboliques,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1229
+#, no-c-format
+msgid "... lets you browse files on mouse double click,"
+msgstr "... vous permet de naviguer dans vos fichiers avec des double-clics,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1230
+#, no-c-format
+msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
+msgstr "... pour chacun d'eux propose une opération de fusion, que vous pouvez changer avant de démarrer une fusion de dossiers,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1232
+#, no-c-format
+msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
+msgstr "... vous permet de simuler la fusion et de lister les actions qui auraient eu lieu, sans les faire,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1234
+#, no-c-format
+msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
+msgstr "... vous permet de faire réellement la fusion, et vous permet d'interagir lorsqu'une action manuelle est nécessaire,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1236
+#, fuzzy, no-c-format
+msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
+msgstr "... vous permet de lancer l'opération pour tous les éléments (touche F7) ou pour l'élément sélectionné (touche F6),"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1237
+#, fuzzy, no-c-format
+msgid "... lets you continue the merge after manual interaction with key F7,"
+msgstr "... vous permet de continuer la fusion après une interaction manuelle avec la touche F7,"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1238
+#, fuzzy, no-c-format
+msgid "... optionally creates backups, with the \".orig\" extension,"
+msgstr "... crée des copies de sauvegarde en option, portant l'extension \".orig\","
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1243
+#, no-c-format
+msgid "Starting Directory Comparison Or Merge"
+msgstr "Démarrer une comparaison ou une fusion de dossiers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1244
+#, 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 "C'est très similaire à la fusion et à la comparaison d'un seul fichier. Vous devrez juste spécifier les dossiers depuis la ligne de commande ou la fenêtre d'ouverture de fichiers."
+" <command>kdiff3</command> <replaceable>dos1 dos2 dos3</replaceable> -o <replaceable>dossier de destination</replaceable>"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1258
+#, fuzzy, 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 "Quand trois dossiers sont fusionnés alors <replaceable>dos1</replaceable> est utilisé comme la base de la fusion. Si aucun dossier de destination n'est spécifié, alors KDiff3 utilisera <replaceable>dos3</replaceable> comme dossier de destination de la fusion."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1265
+#, fuzzy, 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 "Notez que seule la comparaison démarre automatiquement, pas la fusion. Pour cela vous devrez sélectionner le choix du menu ou appuyez sur la touche F7. (Plus de détails à la suite)."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1272
+#, fuzzy, no-c-format
+msgid "Directory Merge Visible Information"
+msgstr "Information visible"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1273
+#, 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 "Lors de la lecture des dossiers, une boîte de dialogue apparat vous informant de la progression. Si vous annulez le scan de dossier, alors seuls les fichiers déjà comparés seront listés."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1277
+#, fuzzy, no-c-format
+msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
+msgstr "Quand le scan de dossiers est terminé KDiff3 affiche une liste avec les résultats à gauche, ..."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1284
+#, no-c-format
+msgid "... and details about the currently selected item on the right:"
+msgstr "... et les détails concernant l'élément actuellement sélectionné à droite :"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1292
+#, no-c-format
+msgid "The Name Column"
+msgstr "La colonne de nom"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1293
+#, 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 "Chaque fichier et dossier ayant été trouvé durant le scan et affiché ici dans une arborescence. Vous pouvez sélectionner un élément en cliquant dessus avec la souris."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1296
+#, fuzzy, 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 "Les dossiers sont fermés par défaut. Vous pouvez les développer ou les fermer on cliquant sur \"+\"/\"-\", en double cliquant sur l'élément ou simplement en utilisant les flèches gauche/droite du clavier. Le menu \"Dossier\" contient aussi deux actions \"Naviguer dans tous les sous-dossiers\" et \"Refermer tous les sous-dossiers\" avec lesquelles vous pouvez fermer ou développer tous les dossiers d'un seul coup."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1302
+#, no-c-format
+msgid "If you double-click a file item then the file comparison starts and the file-diff-window will appear."
+msgstr "Si vous double-cliquez sur un fichier, alors la comparaison démarre et la fenêtre de comparaison apparaîtra."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1306
+#, fuzzy, 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 "L'image de la colonne de nom reflète du type de fichier dans le premier dossier (\"A\"). Cela peut être :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1311
+#, no-c-format
+msgid "Normal file"
+msgstr "Fichier normal"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1312
+#, no-c-format
+msgid "Normal directory (directory-image)"
+msgstr "Dossier normal (image de dossier)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1313
+#, no-c-format
+msgid "Link to a file (file-image with a link arrow)"
+msgstr "Lien vers un fichier (image de fichier avec une flèche)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1314
+#, no-c-format
+msgid "Link to a directory (directory-image with a link arrow)"
+msgstr "Lien vers un dossier (image de dossier avec une flèche)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1316
+#, 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 "SI le type de fichier est différent dans les autres dossiers, alors cela est visible dans les colonnes A/B/C et dans la fenêtre affichant les détails concernant les éléments sélectionnés. Notez que dans un cas comme cela aucune opération de fusion ne peut être sélectionnée automatiquement. Quand une fusion est démarrée, alors l'utilisateur sera informé de problèmes de ce type."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1325
+#, no-c-format
+msgid "The Columns A/B/C and the Coloring Scheme"
+msgstr "Les colonnes A/B/C et le système de coloration"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1326
+#, 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 "Comme cela peut être vu dans l'image ci-dessous les couleurs rouge, vert, jaune et noir sont utilisées dans les colonnes A/B/C."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1331
+#, no-c-format
+msgid "Black: This item doesn't exist in this directory."
+msgstr "Noir : Cela ne semble pas exister dans ce dossier."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1332
+#, no-c-format
+msgid "Green: Newest item."
+msgstr "Vert : Élément le plus récent."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1333
+#, no-c-format
+msgid "Yellow: Older than green, newer than red."
+msgstr "Jaune : Plus vieux que le vert, plus récent que le rouge."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1334
+#, no-c-format
+msgid "Red: Oldest item."
+msgstr "Rouge : Élément le plus ancien."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1336
+#, 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 "Mais pour les éléments qui sont identiques dans la comparaison leur couleur est aussi identique même si leur âge ne l'est pas."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1339
+#, 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 "Les dossiers sont considérés comme égaux si tous les éléments qu'ils contiennent sont égaux. Alors ils auront aussi la même couleur. Mais l'âge d'un dossier n'est pas considéré pour sa couleur."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1343
+#, 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 "L'idée pour le schéma de coloration vient de <ulink url=\"http://samba.org/cgi-bin/cvsweb/dirdiff\">dirdiff</ulink>. Les couleurs ressemblent aux couleurs d'une feuille d'un arbre qui est verte au printemps, puis devient jaune à l'automne pour devenir rouge à l'hiver."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1350
+#, no-c-format
+msgid "The Operation Column"
+msgstr "La colonne d'opération"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1351
+#, fuzzy, 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 "Après avoir comparé les dossiers, KDiff3 évalue aussi une proposition pour l'opération de fusion. Cela est affiché dans la colonne \"Opération\". Vous pouvez modifier l'opération en cliquant sur l'opération que vous voulez changer. Un petit menu se déroulera vous permettant de sélectionner une opération pour cet élément. (Vous pouvez aussi sélectionner les opérations les plus importantes via le clavier. Ctrl+1/2/3/4/Del sélectionnera ainsi respectivement A/B/C/Fusion/Suppression (si disponibles). Cette opération sera exécutée durant la fusion. Cela dépend de l'élément et du mode de fusion dans lequel vous êtes. Le mode de fusion est un des modes qui suit "
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1362
+#, fuzzy, no-c-format
+msgid "Three directory-merge (\"A\" is treated as older base of both)."
+msgstr "Fusion à trois dossiers (\"A\" est considéré comme la base des deux autres)."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1363
+#, no-c-format
+msgid "Two directory-merge."
+msgstr "Fusion de deux dossiers."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1364
+#, fuzzy, no-c-format
+msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
+msgstr "Deux dossiers en mode synchronisé (activé via l'option \"Synchroniser les dossiers\")."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1366
+#, no-c-format
+msgid "In three directory merge the operation proposal will be: If for an item ..."
+msgstr "Dans le cas d'une fusion à trois dossiers l'opération proposée sera : Si pour un élément ..."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1370
+#, fuzzy, no-c-format
+msgid "... all three directories are equal: Copy from C"
+msgstr "... les trois dossiers sont égaux : Copie depuis C"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1371
+#, fuzzy, 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 "... A et C sont égaux mais B ne l'est pas : Copier depuis B (ou si B n'existe pas, supprimer la destination si elle existe)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1373
+#, fuzzy, 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 "... A et B sont égaux mais C ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1375
+#, fuzzy, 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 "... B et C sont égaux mais A ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1377
+#, fuzzy, no-c-format
+msgid "... only A exists: Delete the destination (if exists)"
+msgstr "... seul A existe : Supprimer la destination (si elle existe)"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1378
+#, fuzzy, no-c-format
+msgid "... only B exists: Copy from B"
+msgstr "... seul B existe : Copier depuis B"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1379
+#, fuzzy, no-c-format
+msgid "... only C exists: Copy from C"
+msgstr "... seul C existe : Copier depuis C"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1380
+#, fuzzy, no-c-format
+msgid "... A, B and C are not equal: Merge"
+msgstr "... A, B et C ne sont pas égaux : Fusion"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1381
+#, fuzzy, 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 "... A, B et C n'ont pas le m me type de fichier (par exemple A est un dossier, B un fichier : \"Erreur : Conflit de types de fichiers\". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1385
+#, no-c-format
+msgid "In two directory merge the operation proposal will be: If for an item ..."
+msgstr "Dans la fusion à deux dossiers, l'opération proposée sera : Si pour un élément ..."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1389
+#, fuzzy, no-c-format
+msgid "... both directories are equal: Copy from B"
+msgstr "les deux dossiers sont égaux : Copier depuis B"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1390
+#, fuzzy, no-c-format
+msgid "... A exists, but not B: Copy from A"
+msgstr "... A existe, mais pas B : Copier depuis A"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1391
+#, fuzzy, no-c-format
+msgid "... B exists, but not A: Copy from B"
+msgstr "... B existe, mais pas A : Copier depuis B"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1392
+#, fuzzy, no-c-format
+msgid "... A and B exist but are not equal: Merge"
+msgstr "... A et B existent mais ne sont pas égaux : Fusion"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1393 index.docbook:1410
+#, fuzzy, 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 "... A, et B n'ont pas le même type de fichier (par exemple A est un dossier, B un fichier : \"Erreur : Conflit de types de fichiers\". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1397
+#, fuzzy, 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 "Le mode de synchronisation est actif s'il n'y a que deux dossiers, qu'aucune destination explicite n'a été spécifiée et que l'option \"Synchroniser les dossiers\" est active. KDiff3 sélectionne alors une opération par défaut pour que les deux dossiers soient les m mes après-coup. Si pour un élément ..."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1404
+#, fuzzy, no-c-format
+msgid "... both directories are equal: Nothing will be done."
+msgstr "... les deux dossiers sont égaux : Rien ne sera fait."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1405
+#, fuzzy, no-c-format
+msgid "... A exists, but not B: Copy A to B"
+msgstr "... A existe, mais pas B : Copier A vers B"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1406
+#, fuzzy, no-c-format
+msgid "... B exists, but not A: Copy B to A"
+msgstr "... B existe, mais pas A : Copier B vers A"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1407
+#, fuzzy, 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 "... A et B existent, mais sont différents : Fusion et stockage du résultat dans les deux dossiers. Pour l'utilisateur le nom de fichier visible est B, mais alors KDiff3 copie aussi B vers A)."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1414
+#, fuzzy, 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 "Quand deux dossiers sont fusionnés et que l'option \"Copier le plus récent à la place de fusionner\" est sélectionnée, alors KDiff3 regardera les dates et proposera de choisir le fichier le plus récent. Si les fichiers ne sont pas égaux mais ont les mêmes dates alors l'opération contiendra \"Erreur : Les dates sont les mêmes mais les fichiers ne le sont pas\". Tant que des éléments comme ceux-ci existent la fusion ne pourra pas commencer."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1423
+#, no-c-format
+msgid "The Status Column"
+msgstr "La colonne d'état"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1424
+#, fuzzy, 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 "Durant la fusion, les fichiers seront traités les uns après les autres. La colonne d'état affichera \"Terminé\" pour les éléments où l'opération de fusion s'est bien déroulée, et d'autres textes si une chose non attendue est arrivée. Quand une fusion est terminée, vous devriez faire une dernière vérification pour voir si l'état de tous les éléments est correct."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1433
+#, no-c-format
+msgid "Statistics Columns"
+msgstr "Colonne de statistiques"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1434
+#, fuzzy, 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 "Quand le mode de comparaison de fichiers \"Analyse complète\" est activé dans les options, alors KDiff3 affichera des colonnes contenant le nombres de conflits non résolus, résolus et conflits d'espacement ou non. (La colonne résolu s'affichera seulement lors de la comparaison ou fusion de trois dossiers)."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1441
+#, no-c-format
+msgid "Selecting Listed Files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1442
+#, 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
+#. +> trunk
+#: index.docbook:1446
+#, no-c-format
+msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1447
+#, no-c-format
+msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1448
+#, no-c-format
+msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1449
+#, no-c-format
+msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1450
+#, no-c-format
+msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1452
+#, 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
+#. +> trunk
+#: index.docbook:1457
+#, 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
+#. +> trunk
+#: index.docbook:1460
+#, 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:1468
+#, fuzzy, no-c-format
+msgid "Doing A Directory Merge"
+msgstr "Fusion de dossiers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1469
+#, 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 "Vous pouvez soit fusionner l'élément sélectionné actuellement (fichier ou dossier), out tous les éléments. Quand vous aurez fait tous les choix (aussi dans les sous-dossiers) alors vous pourrez démarrer la fusion."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1473
+#, fuzzy, no-c-format
+msgid "Be aware that if you didn't specify a destination directory explicitly, 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 "Soyez conscient que si vous ne spécifiez pas de dossier de destination explicitement, alors la destination sera \"C\" dans le mode de fusion a trois dossiers, \"B\" dans le mode de fusion à deux dossiers, et dans le mode synchronisé, ce sera \"A\" ou/et \"B\""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1477
+#, 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 "Si vous avez spécifié un dossier de destination vérifiez aussi que tous éléments devant être à la sortie, sont dans l'arborescence. Il y a quelques options qui font que certains éléments sont oubliés de la comparaison et la fusion de dossiers. Vérifiez ces options pour éviter des mauvaises surprises :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1484
+#, fuzzy, no-c-format
+msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
+msgstr "\"Dossiers récursifs\" : Si cette option est désactivée, alors les éléments contenus dans les sous-dossiers ne seront pas trouvés."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1486
+#, fuzzy, no-c-format
+msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
+msgstr "\"Modèle\"/\"Anti-modèle\" : Inclure/exclure les éléments qui correspondent"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1487
+#, fuzzy, no-c-format
+#| msgid "Find Hidden Files and Directories:"
+msgid "\"Find hidden files and directories\""
+msgstr "Trouver les fichiers et dossiers cachés :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1488
+#, no-c-format
+msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1490
+#, 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
+#. +> trunk
+#: index.docbook:1495
+#, 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
+#. +> trunk
+#: index.docbook:1499
+#, no-c-format
+msgid "If you are satisfied so far, the rest is easy."
+msgstr "Si vous êtes satisfait ici, le reste et simple."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1501
+#, fuzzy, 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 "Pour fusionner tous les éléments : Sélectionnez \"Démarrer/Continuer la fusion de dossiers\" dans le menu \"Dossier\" ou appuyez sur la touche F7 (qui est le raccourci). Pour fusionner seulement l'élément actuel : Sélectionnez \"Lancer l'opération pour l'élément actuel\" ou appuyez sur F6."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1506
+#, 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 "Si à cause de conflits de type de fichiers certains éléments portant des opérations non valables existent, alors un boîte de dialogue apparaîtra et certains de ces éléments seront pointés, pour que vous puissiez sélectionner une opération valable"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1510
+#, fuzzy, no-c-format
+msgid "If you merge all items a dialog will appear giving you the options \"Do it\", \"Simulate it\" and \"Cancel\"."
+msgstr "Si vous fusionnez tous les éléments, une fenêtre apparaîtra vous proposant de \"Le faire\", \"Le simuler\" ou \"Annuler\"."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1515
+#, fuzzy, 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 "Sélectionnez \"Le simuler\" si vous voulez voir comment cela serait sans le faire réellement. Une liste de toutes les opérations sera affichée."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1517
+#, fuzzy, no-c-format
+msgid "Otherwise select \"Do it\" to really start merging."
+msgstr "Sinon sélectionnez \"Le faire\" pour démarrer réellement la fusion."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1519
+#, fuzzy, 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 "Alors KDiff3 lancera l'opération spécifiée pour tous les éléments. Si une interaction manuelle est nécessaire (fusion d'un seul fichier), alors une fenêtre de fusion s'ouvrira (<link linkend=\"dirmergebigscreenshot\">voir la grosse capture d'écran</link>)."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1523
+#, fuzzy, 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 "Quand vous en aurez terminé avec un fichier, sélectionnez de nouveau \"Démarrer/Continuer la fusion de dossiers\" ou utilisez la touche F7. SI vous n'avez pas encore enregistré les résultats, une fenêtre vous le proposera. Alors KDiff3 continuera avec l'élément suivant."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1527
+#, fuzzy, 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 "Quand KDIff3 rencontre une erreur, il vous en informe et affiche l'information détaillée de l'état. Au bas de cette liste, il y aura quelques messages d'erreur qui vous aideront à comprendre la cause du problème. Quand vous continuerez la fusion, KDiff3 vous proposera de réessayer ou de sauter l'élément qui à causé le problème. Cela signifie qu'avant de continuer vous pouvez choisir une autre opération ou résoudre le problèmes par d'autres moyens."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1534
+#, fuzzy, no-c-format
+msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
+msgstr "Quand la fusion est complète, alors KDiff3 vous informera via une boîte de dialogue."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1537
+#, fuzzy, 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 "Si certains éléments ont été fusionnés individuellement, KDiff3 s'en rappellera (tant que la session de fusion continue), et ne fusionne pas ces éléments de nouveau plus tard quand la fusion de tous les éléments est lancée. Même si la fusion a été sautée ou si rien n'a été enregistré ces éléments sont comptés comme complétés. La fusion ne sera refaite que si vous changez l'opération de fusion de l'élément."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1547
+#, no-c-format
+msgid "Options for Comparing and Merging Directories"
+msgstr "Options pour la comparaison et la fusion de dossiers"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1548
+#, fuzzy, no-c-format
+msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
+msgstr "Les options de Kdiff3 (menu \"Configuration\"/\"Configurer KDiff3...\") ont maintenant une section appelée \"Fusion de dossiers\" contenant ces options :"
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1554
+#, no-c-format
+msgid "Recursive Directories:"
+msgstr "Dossiers récursifs :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1554
+#, no-c-format
+msgid "Select whether to search directories recursively."
+msgstr "Sélectionner s'il faut rechercher les dossiers récursivement."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1556
+#, no-c-format
+msgid "File Pattern(s):"
+msgstr "Modèle(s) de fichier :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1556
+#, fuzzy, 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 "Seuls les fichiers qui correspondent à un modèle ici seront mis dans l'arborescence. Plus d'un modèle peut être spécifié en utilisant le point-virgule \";\" comme séparateur. Les jokers valables sont '*' et '?' (par exemple pour \"*.cpp;*.h\". L'option par défaut est \"*\". Les dossiers ne seront pas reconnus par ce modèle."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1560
+#, fuzzy, no-c-format
+msgid "File Anti-Pattern(s):"
+msgstr "Modèle(s) de fichier :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1560
+#, fuzzy, 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 "Les fichiers et dossiers correspondants à cette règle seront exclus de l'arborescence. Plus d'un modèle peut être spécifié ici en utilisant le point-virgule \";\" comme séparateur. Les jokers valides sont : '*' et '?'. Le modèle par défaut est \"*.orig;*.o\"."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1564
+#, fuzzy, no-c-format
+msgid "Directory Anti-Pattern(s):"
+msgstr "Anti-modèle(s) :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1564
+#, fuzzy, 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 "Les fichiers et dossiers correspondants à cette règle seront exclus de l'arborescence. Plus d'un modèle peut être spécifié ici en utilisant le point-virgule \";\" comme séparateur. Les jokers valides sont : '*' et '?'. Le modèle par défaut est \"*.orig;*.o\"."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1568
+#, no-c-format
+msgid "Use CVS-Ignore:"
+msgstr "Ignorer comme CVS :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1568
+#, fuzzy, 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 "Ignorer les fichiers et dossiers qui seraient aussi ignorés par CVS. Beaucoup de fichiers générés automatiquement sont ignorés par CVS. Le gros avantage est que cela peut être spécifique à un dossier via un fichier local \".cvsignore\". (Reportez-vous à <ulink url=\"info:/cvs/cvsignore\">info:/cvs/cvsignore</ulink>)."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1573
+#, no-c-format
+msgid "Find Hidden Files and Directories:"
+msgstr "Trouver les fichiers et dossiers cachés :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1573
+#, fuzzy, 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 "Sur certains systèmes de fichiers les fichiers ont un attribut \"Caché\". Sur d'autres un nom de fichier commençant par un point \".\" le cache. Cette option vous permet de décider s'il faut inclure ces fichiers dans l'arborescence ou non. Option activée par défaut."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1577
+#, no-c-format
+msgid "Follow File Links:"
+msgstr "Suivre les liens vers les fichiers :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1577
+#, 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 "Pour les liens vers les fichiers : Quand cette option est désactivée, alors les liens symboliques sont comparés. Quand elle est activée, alors ce sont les fichiers situé derrière les liens qui sont comparés. Désactivée par défaut."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1580
+#, no-c-format
+msgid "Follow Directory Links:"
+msgstr "Suivre les liens vers les dossiers :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1580
+#, fuzzy, 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 "Pour les liens vers les dossiers : Quand désactivé, alors les liens symboliques seront comparés. Quand activée alors le lien sera traité comme un dossier et sera scanné récursivement. (Notez que le programme ne vérifie pas si le lien est \"récursif\". Si par exemple un dossier contenait un lien vers lui-même, cela causerait une boucle infinie, et après quelque temps il y aurait dépassement de tampon ou toute la mémoire serait utilisée, crashant le programme."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1587
+#, no-c-format
+msgid "Case Sensitive Filename Comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1587
+#, no-c-format
+msgid "Default is false on Windows, true for other operating systems."
+msgstr ""
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1589
+#, no-c-format
+msgid "File Comparison Mode:"
+msgstr "Mode de comparaison des fichiers :"
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1591
+#, no-c-format
+msgid "Binary Comparison:"
+msgstr "Comparaison binaire"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1591
+#, no-c-format
+msgid "This is the default file comparison mode."
+msgstr "C'est le mode de comparaison de fichiers par défaut."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1594
+#, no-c-format
+msgid "Full Analysis:"
+msgstr "Analyse complète"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1594
+#, 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 "Faire une analyse complète de chaque fichier et afficher la colonne d'informations statistiques. (Nombre de conflits résolus, non résolus, d'espacement ou non). L'analyse complète est plus lente qu'une simple analyse binaire, et plus lente quand utilisée sur des fichiers ne contenant pas du texte. (Spécifiez les anti-modèles de fichiers appropriés)."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1601
+#, no-c-format
+msgid "Trust the modification date:"
+msgstr "Croire la date de modification :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1601
+#, 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 "Si vous comparez des gros dossiers sur un réseau lent, cela peut être plus rapide de ne comparer que les dates de modification et les longueurs des fichiers. Mais cette augmentation de vitesse comporte néanmoins un petit doute. Utilisez cette option avec précaution. Désactivée par défaut."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1605
+#, no-c-format
+msgid "Trust the size:"
+msgstr "Croire la taille :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1605
+#, 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 "Identique à croire la date de modification. Pas de réelle comparaison, les deux fichiers sont considérés comme égaux si leur tailles sont égales. C'est utile lorsqu'une opération de copie ne conserve pas la date de modification. Utilisez cette option avec précaution. Désactivé par défaut."
+
+# Tag: emphasis
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1612
+#, no-c-format
+msgid "Synchronize Directories:"
+msgstr "Synchroniser des dossiers :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1612
+#, 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 "Active le \"Mode synchroniser\" quand deux dossiers sont comparés et qu'il n'y a pas de dossier de destination explicitement spécifié. Dans ce mode les opérations proposées seront choisies pour que les deux dossier sources soient égaux après coup. Aussi le résultat de la fusion sera écrit dans les deux dossiers. Désactivé par défaut."
+
+#. Tag: emphasis
+#. +> trunk
+#: index.docbook:1617
+#, no-c-format
+msgid "Copy newer instead of merging:"
+msgstr "Copier le plus récent au lieu de fusionner :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1617
+#, fuzzy, 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 "Au lieu de fusionner l'opération proposée sera copier la source la plus récente si des changements ont eu lieu. (Considéré comme peu sur, car cela implique la connaissance que l'autre fichier n'a pas été édité. Vérifiez le pour vous assurez dans tous les cas). Désactivé par défaut."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1621
+#, fuzzy, 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 "Si un fichier ou un dossier complet est remplacé par un autre ou est supprimé alors la version originale sera renommée avec une extension \".orig\". Si un ancien fichier de sauvegarde portant l'extension \".orig\" existe toujours alors il sera supprimé sans sauvegarde. Cela affecte aussi la fusion de simples fichiers, pas seulement le mode de fusion de dossiers. Activé par défaut."
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1629
+#, no-c-format
+msgid "Other Functions in Directory Merge Window"
+msgstr ""
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1630
+#, no-c-format
+msgid "Split/Full Screen Mode"
+msgstr "Mode plein écran/écran partagé"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1631
+#, fuzzy, 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 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 "Habituellement la vue de la liste de fusion de dossiers reste visible quand un fichier simple est comparé ou fusionné. Avec la souris vous pouvez déplacer la barre de séparation qui sépare la liste de fichiers de la fenêtre de comparaison. Si vous ne voulez pas faire cela, vous pouvez désactiver \"Scinder la fenêtre\" Dans le menu \"Dossier\". vous pouvez aussi utiliser \"Basculer la vue\" dans le menu \"Dossier\" pour basculer entre la liste de fichiers et la fenêtre de comparaison qui occupait tout l'écran."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1640
+#, no-c-format
+msgid "Comparing or Merging a Single File"
+msgstr "Comparer ou Fusionner un simple fichier"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1641
+#, fuzzy, 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 "Probablement vous préférerez un simple double clic sur un fichier pour le comparer. Néanmoins il existe aussi une entrée dans le menu \"Dossier\". vous pouvez aussi fusionner directement un simple fichier, sans lancer la fusion de dossiers via \"Fusionner un simple fichier\" dans le menu \"Dossier\". A l'enregistrement des résultats l'état sera validé, et le fichier ne sera plus fusionné si une fusion de dossiers est démarrée."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1648
+#, fuzzy, no-c-format
+msgid "But note that this status information will be lost when you rerun a directory scan: \"Directory\"-menu: \"Rescan\""
+msgstr "Mais notez que l'information de l'état sera perdue lorsque vous relancerez un scan de dossier via : \"Dossier\"/\"Rescanner\""
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1653
+#, fuzzy, no-c-format
+msgid "Comparing or Merging Files with Different Names"
+msgstr "Comparer ou Fusionner un simple fichier"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1654
+#, 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
+#. +> trunk
+#: index.docbook:1657
+#, 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
+#. +> trunk
+#: index.docbook:1661
+#, no-c-format
+msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
+#. +> trunk
+#: index.docbook:1665
+#, 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
+#. Tag: title
+#. +> trunk
+#: index.docbook:1673
+#, no-c-format
+msgid "Miscellaneous Topics"
+msgstr "Sujets divers"
+
+#. Tag: title
+#. +> trunk
+#: index.docbook:1675
+#, fuzzy, no-c-format
+msgid "Networktransparency via KIO"
+msgstr "Transparence réseau via KIO."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1676
+#, no-c-format
+msgid "KIO-Slaves"
+msgstr "KIO-Slaves"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1677
+#, fuzzy, 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 "KDE supporte la transparence réseau via KIO. KDiff3 utilise cela pour lire les fichiers en entrée ou scanner les dossiers. Cela signifie que vous pouvez spécifier des fichiers et des dossiers locaux ou distants via des URL."
+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 "La première ligne compare un fichier local avec un fichier sur un serveur FTP. La seconde compare un dossier contenu dans une archive compressée a un dossier local."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1689
+#, no-c-format
+msgid "Other KIO-slaves that are interesting are:"
+msgstr "Les autres KIOslaves intéressants sont :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1693
+#, no-c-format
+msgid "Files from the WWW (http:),"
+msgstr "Fichiers depuis le WWW (http:),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1694
+#, no-c-format
+msgid "Files from the FTP (ftp:),"
+msgstr "Fichiers depuis un FTP (ftp:),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1695
+#, no-c-format
+msgid "Encrypted file transfer (fish:, sftp:),"
+msgstr "Transfert de fichier crypté (fish;, sftp;),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1696
+#, fuzzy, no-c-format
+msgid "Windows-resources (smb:),"
+msgstr "Ressources Windows (smb:),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1697
+#, no-c-format
+msgid "Local files (file:),"
+msgstr "Fichiers locaux (file:),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1699
+#, no-c-format
+msgid "Other things that are possible, but probably less useful are:"
+msgstr "D'autres choses sont possibles, mais probablement moins utiles sont :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1703
+#, no-c-format
+msgid "Man-pages (man:),"
+msgstr "Pages man (man:),"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1704
+#, no-c-format
+msgid "Info-pages (info:),"
+msgstr "Pages info (info:),"
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1708
+#, fuzzy, no-c-format
+msgid "How To Write URLs"
+msgstr "Comment écrire des URL"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1709
+#, fuzzy, no-c-format
+msgid "An URL has a different syntax compared with paths for local files and directories. Some things should be considered:"
+msgstr "Une URL a une syntaxe différence par rapport aux chemins pour les fichiers et dossiers locaux. Certains éléments doivent être considérés :"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1714
+#, fuzzy, no-c-format
+msgid "A path can be relative and can contain \".\" or \"..\". This is not possible for URLs which are always absolute."
+msgstr "Un chemin peut être relatif et contenir \".\" ou \"..\". Ce n'est pas possible pour les URL qui sont toujours absolues."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1717
+#, fuzzy, 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 "Les caractères spéciaux doivent être écrits avec des espaces (\"#\"->\"%23\", espace>\"%20\", etc). Par exemple un fichier nommé \"#foo#\" aura l'URL \"file:/%23foo%23\"."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1720
+#, fuzzy, no-c-format
+msgid "When URLs don't work as expected, try to open them in Konqueror first."
+msgstr "Quand les URL ne fonctionnent pas comme attendu, essayez de les ouvrir tout d'abord avec Konqueror."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1727
+#, no-c-format
+msgid "Capabilities of KIO-Slaves"
+msgstr "Possibilités des KIO-Slaves"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1728
+#, fuzzy, no-c-format
+msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
+msgstr "La transparence réseau à un inconvénient : Toutes les ressources n'ont les mêmes possibilités."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1730
+#, fuzzy, 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 "Parfois ceci est dû au système de fichiers du serveur, parfois au protocole. Voici une liste de restrictions :"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1735
+#, no-c-format
+msgid "Sometimes there is no support for links."
+msgstr "Parfois il n'y a pas de support des liens."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1737
+#, 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 "Ou il n'y a pas moyen de distinguer si un lien pointe vers un fichier ou un dossier ; on estime que c'est toujours un fichier.(ftp :, sftp :)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1740
+#, no-c-format
+msgid "Can't always determine the filesize."
+msgstr "Ne peut pas toujours déterminer la taille des fichiers."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1742
+#, no-c-format
+msgid "Limited support for permissions."
+msgstr "Support limité des permissions."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1744
+#, 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 "Il est impossible de modifier les permissions ou la date de dernière modification, les permissions ou la date de dernière modification d'une copie diffèrent donc de l'original. (Voir l'option \"Croire la taille\"). (Modifier les permissions ou la date de dernière modification n'est possible que pour les fichiers locaux)."
+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 "Des outils nommés \"KDiff\" et \"KDiff2\" (désormais appelé \"Kompare\") existent déjà. \"KDiff3\" suggère aussi qu'il peut fusionner comme l'outil \"diff3\" dans la collection des Outils Diff."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1795
+#, fuzzy, no-c-format
+msgid "Why did I release it under GPL?"
+msgstr "Pourquoi le logiciel est-il sous licence GPL ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1797
+#, fuzzy, 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 "J'utilise les programmes GPL depuis très longtemps désormais et j'ai appris beaucoup de choses en jetant un oeil aux sources. Voici mon \"Merci\" à tous les programmeurs qui ont aussi ou qui feront aussi de même."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1803
+#, no-c-format
+msgid "Some buttons and functions are missing. What's wrong?"
+msgstr "Certains boutons ou fonctions sont manquantes. Quel est le problème ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1805
+#, fuzzy, no-c-format
+msgid "You compiled from source but you probably didn't specify the correct KDE-prefix. By default &kdiff3; is installed in /usr/local but then KDE can't find the user-interface resource file (i.e. kdiff3ui.rc). The README-file contains more information about the correct prefix."
+msgstr "Vous avez compilé depuis la source mais vous n'avez probablement pas spécifier le bon préfixe de KDE lors de la configuration. Par défaut configure veut installer dans /usr/local mais dans ce cas KDE ne peut trouver le fichier de ressource de l'interface utilisateur (c.é.d. kdiff3ui.rc). Le fichier README contient plus d'informations à propos du préfixe correct."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1812
+#, no-c-format
+msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
+msgstr "Souvent les lignes similaires mais non identiques apparaissent côte à côte mais parfois pas. Pourquoi ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1815
+#, fuzzy, 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 "Les lignes ou seules les quantités d'espaces sont différentes sont traitées comme \"égales\", tandis qu'une différence d'un caractère seulement peut changer l'état des lignes en \"différentes\". Si des lignes similaires apparaissent côte à côte, c'est actuellement une coïncidence mais heureusement c'est souvent le cas."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1823
+#, no-c-format
+msgid "Why must all conflicts be solved before the merge result can be saved?"
+msgstr "Pourquoi tous les conflits doivent-ils être résolus avant que le résultat de la fusion puisse être enregistré ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1825
+#, 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 "Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de la fusion se souvient ou elle commence ou se termine. Cela est nécessaire pour que les conflits puissent être résolus manuellement en sélectionnant simplement le bouton de source (A, B ou C). Cette information sera perdue quand vous enregistrerez un texte et c'est trop compliqué de créer un format de fichier spécial supportant l'enregistrement et la restauration de toutes les informations nécessaires."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1834
+#, 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
+#. +> trunk
+#: index.docbook:1836
+#, no-c-format
+msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
+msgstr ""
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1840
+#, fuzzy, no-c-format
+msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
+msgstr "Pourquoi l'éditeur dans la fenêtre de résultat n'a pas de fonction \"annuler\" ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1842
+#, 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 "C'était très compliqué jusqu'à présent. Vous pouvez toujours restaurer une version depuis une source (A, B ou C) en cliquant sur le bouton respectif. Pour une édition importante, l'utilisation d'un autre éditeur comme Kwrite est recommandée."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1848
+#, fuzzy, no-c-format
+msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
+msgstr "Quand j'ai supprimé du texte, soudainement, \"<Pas de ligne de la source>\" est apparu et ne peut être supprimé. Qu'est-ce que cela signifie et comment supprimer cela ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1851
+#, fuzzy, no-c-format
+msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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 original 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 "Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de fusion se souvient, de son début et de sa fin. \"<Pas de ligne de la source>\" signifie qu'il n'y a plus rien dans une section, même plus de caractère de nouvelle ligne. Cela peut apparaître soit lors de la fusion automatique ou lors de l'édition. Ce n'est pas un problème, étant donné que cela n'apparaîtra pas dans le fichier enregistré. Si vous voulez que la source originale réapparaisse, sélectionnez juste la section (un clic sur la colonne de résumé de gauche) et cliquez alors le bouton de source avec le contenu nécessaire (A/B ou C)."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1862
+#, fuzzy, no-c-format
+msgid "Why doesn't &kdiff3; support syntax-highlighting?"
+msgstr "Pourquoi KDiff3 ne supporte-t-il pas le surlignement des syntaxes ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1864
+#, fuzzy, no-c-format
+msgid "&kdiff3; already uses many colors for difference highlighting. More highlighting would be confusing. Use another editor for this."
+msgstr "KDiff3 utilise déjà beaucoup de couleurs pour le surlignement des différences. Plus de surlignement amènerait de la confusion. Utilisez un autre éditeur pour cela."
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1869
+#, no-c-format
+msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1871
+#, 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
+#. +> trunk
+#: index.docbook:1874
+#, 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
+#. +> trunk
+#: index.docbook:1880
+#, 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
+#. +> trunk
+#: index.docbook:1884
+#, 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 clipboard 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
+#. +> trunk
+#: index.docbook:1892
+#, no-c-format
+msgid "Where has the directory option \"List only deltas\" gone?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1894
+#, 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
+#. +> trunk
+#: index.docbook:1899
+#, no-c-format
+msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1902
+#, 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
+#. Tag: para
+#. +> trunk
+#: index.docbook:1908
+#, no-c-format
+msgid "There is so much information here, but your question is still not answered?"
+msgstr "Il y a beaucoup d'informations ici, mais votre question ne trouve toujours pas de réponse ?"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1910
+#, no-c-format
+msgid "Please send me your question. I appreciate every comment."
+msgstr "Veuillez m'envoyer vos questions. J'apprécie chaque commentaire."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1919
+#, no-c-format
+msgid "Credits and License"
+msgstr "Remerciements et licence"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1921
+#, no-c-format
+msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
+msgstr "&kdiff3; - Outil de Comparaison et de Fusion de Fichiers et Dossier"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1924
+#, fuzzy, no-c-format
+msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
+msgstr "Programme protégé par copyright 2002-2005 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1927
+#, no-c-format
+msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
+msgstr "Beaucoup de bonnes idées et de rapports de bogue viennent de collègues et de beaucoup d'inconnus du Web. Merci !"
+msgstr "<para>Traduction française par Simon Depiets <email>2df@tuxfamily.org</email>.</para>"
+
+# Tag: chapter
+#. Tag: chapter
+#. +> trunk
+#: index.docbook:1935
+#, no-c-format
+msgid "&underFDL; &underGPL;"
+msgstr "&underFDL; &underGPL;"
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1945
+#, no-c-format
+msgid "Installation"
+msgstr "Installation"
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1948
+#, no-c-format
+msgid "How to obtain &kdiff3;"
+msgstr "Comment obtenir &kdiff3;"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1950
+#, fuzzy, 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 "Vous pouvez télécharger la dernière version de KDiff3 depuis sa page web <ulink url=\"http://kdiff3.sourceforge.net\">http://kdiff3.sourceforge.net</ulink>."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1952
+#, fuzzy, no-c-format
+msgid "&kdiff3; is also available for other platforms. See the homepage for details."
+msgstr "KDiff3 est aussi disponibles sur d'autres plates-formes. Veuillez vous reporter à la page web pour plus de détails."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1960
+#, no-c-format
+msgid "Requirements"
+msgstr "Configuration minimale"
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1962
+#, fuzzy, no-c-format
+msgid "In order to successfully use all features of &kdiff3;, you need &kde; > 4.4."
+msgstr "Pour utiliser avec succès toutes les fonctionnalités de &kdiff3;, vous aurez besoin de &kde; >3.1."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1964
+#, fuzzy, 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 "Pour plus d'informations sur le lancement de KDiff3 sur d'autres plates-formes sans KDE, veuillez vous reportez à la <ulink url=\"http://kdiff3.sourceforge.net\">page web</ulink>."
+
+# Tag: para
+#. Tag: para
+#. +> trunk
+#: index.docbook:1967
+#, fuzzy, 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 "Vous pouvez trouver une liste des changements sur<ulink url=\"http://kdiff3.sourceforge.net/ChangeLog\">http://kdiff3.sourceforge.net/ChangeLog</ulink> ou dans le fichier \"ChangeLog\" de la source."
+
+# Tag: title
+#. Tag: title
+#. +> trunk
+#: index.docbook:1975
+#, no-c-format
+msgid "Compilation and Installation"
+msgstr "Compilation et Installation"
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1977
+#, no-c-format
+msgid "Information how to compile and install &kdiff3; on a system with &kde; you find in the README file in the base directory of the &kdiff3; distribution"
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1980
+#, no-c-format
+msgid "Since &kdiff3; uses <command>cmake</command> you should have no trouble compiling it. Should you run into problems please report them to the &kde; mailing lists."
+msgstr ""
+
+#. Tag: para
+#. +> trunk
+#: index.docbook:1984
+#, no-c-format
+msgid "If you don't use KDE follow the instructions for Qt-only systems in the README file."
-msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
-msgstr "Beaucoup d'outils graphiques pour diff existent. Pourquoi choisir KDiff3 Laissez moi vous expliquer pourquoi je l'ai écrit."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:103
-#, fuzzy, 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 a été créé car j'ai eu a faire une fusion difficile. Fusionner est nécessaire quand beaucoup de gens travaillent sur les mêmes fichiers dans un projet. Une fusion peut parfois être automatisée, quand l'outil de fusion n'a pas seulement les fichiers modifiés (appelés \"branches\"), mais aussi le fichier original (appelé \"base\"). L'outil de fusion choisira automatiquement la modification faite uniquement dans une seule branche. Quand beaucoup de contributeurs auront changé les mêmes lignes, alors l'outil de fusion détectera un conflit et vous devrez le résoudre manuellement."
-
-#. Tag: para
-#. +> trunk
-#: 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 "La fusion fut donc difficile car un contributeur a changé beaucoup de choses. Un autre a aussi changé beaucoup de texte dans le même fichier, ce qui résulte en beaucoup de conflits lors de la fusion."
-
-#. Tag: para
-#. +> trunk
-#: 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 "L'outil que j'ai utilisé ne m'a donc montré que les lignes modifiées mais pas ce qui avait changé dans ces lignes. La fusion fut un vrai cauchemar."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Voila donc le début. La première version a montré les différences dans une ligne et les différences d'espaces. Plus tard beaucoup d'autres options furent ajoutées pour augmenter l'utilité."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Par exemple si vous voulez comparer du texte rapidement, alors vous pouvez le copier dans le presse-papiers et le coller dans une autre fenêtre diff."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Une option qui me demanda beaucoup d'efforts fut la comparaison de dossiers et la facilitation de la fusion, qui a transformé le navigateur en navigateur complet."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:127
-#, fuzzy, no-c-format
-msgid "I hope &kdiff3; works for you too. Have fun!"
-msgstr "J'espère que KDiff3 marche chez vous aussi. Amusez vous !"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:129
-#, no-c-format
-msgid "Joachim Eibl (2003)"
-msgstr "Joachim Eibl (2003)"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:134
-#, no-c-format
-msgid "Screenshots and Features"
-msgstr "Captures d'écrans et caractéristiques"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:135
-#, no-c-format
-msgid "This screenshot shows the difference between two text files"
-msgstr "Cette capture d'écran montre la différence entre deux fichiers texte."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:136
-#, fuzzy, no-c-format
-msgid "(Using an early version of &kdiff3;):"
-msgstr "(Utilisant une ancienne version de KDiff3) :"
-
-#. Tag: para
-#. +> trunk
-#: 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 ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:154
-#, fuzzy, no-c-format
-msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
-msgstr "KDiff3 vous aide aussi à comparer et fusionner des dossiers complets. Cette capture d'écran montre KDiff3 pendant une fusion de dossiers :"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:163
-#, no-c-format
-msgid "More Features"
-msgstr "Plus d'options"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:164
-#, no-c-format
-msgid "Line-By-Line And Char-By-Char Diff-Viewer"
-msgstr "Visionneuse de différences ligne par ligne et caractère par caractère"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:165
-#, fuzzy, no-c-format
-msgid "By using the possibilities 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 "En utilisant les possibilités d'affichages colorés d'une interface graphique, KDiff3 montre exactement quelle est la différence. Quand vous aurez a traiter beaucoup de texte, cela vous aidera beaucoup."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:173
-#, no-c-format
-msgid "See White-Space Differences At One Glance"
-msgstr "Voir les différences d'espaces en un coup d'oeil."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Les espaces et alinéas apparaissent visiblement. Quand des lignes diffèrent seulement d'un espace, cela peut être vu en un coup d'oeil dans la colonne sur le côté gauche. Plus de problèmes quand les gens changent les espaces."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:183
-#, no-c-format
-msgid "Triple-Diff"
-msgstr "Triple comparaison"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:184
-#, no-c-format
-msgid "Analyze three files and see where they differ."
-msgstr "Analyser trois fichiers et voir en quoi ils diffèrent."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Les fenêtres de gauche/millieu/droite sont appelées A/B/C et on respectivement les couleurs bleu/vert/mauve."
-
-#. Tag: para
-#. +> trunk
-#: 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 "Si un des fichiers et le même et un des fichiers est différent sur une ligne alors la couleur montre quel fichier est différent. La couleur rouge montre que les deux sont différents."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:198
-#, no-c-format
-msgid "Comfortable Merge Of Two Or Three Input Files"
-msgstr "Fusion confortable de deux ou trois fichiers."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:199
-#, fuzzy, 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 peut être utilisé pour fusionner deux ou trois fichiers et faire autant de fusions automatiques que possible. Le résultat est représenté dans une fenêtre modifiable ou la plupart des conflits peuvent être résolus avec un simple clic de souris. Sélectionnez les boutons A/B/C depuis la barre des boutons pour sélectionner la source qui doit être utilisée. Vous pouvez aussi utiliser plus d'une source. Cette fenêtre est aussi un éditeur pour les conflits nécessitant des corrections plus poussées pouvant être corrigées sans autre outil."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:209
-#, no-c-format
-msgid "And ..."
-msgstr "Et ..."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:211
-#, no-c-format
-msgid "Fast navigation via buttons."
-msgstr "Une navigation rapide via les bouttons."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:212
-#, no-c-format
-msgid "A mouse-click into a summary column sync's all windows to show the same position."
-msgstr "Un clic de souris dans la colonne du sommaire synchronise toutes les fenêtres pour indiquer la même position."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:213
-#, no-c-format
-msgid "Select and copy from any window and paste into the merge result window."
-msgstr "Sélectionnez et copiez depuis n'importe qu'elle fenêtre et collez dans la fenêtre de résultat de la fusion."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:214
-#, no-c-format
-msgid "Overview column that shows where the changes and conflicts are."
-msgstr "La colonne d'aperçu qui montre où les changements et conflits sont situés."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:215
-#, no-c-format
-msgid "The colors are adjustable to your specific preferences."
-msgstr "Les couleurs sont ajustables a vos préférences."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:216
-#, no-c-format
-msgid "Adjustable Tab size."
-msgstr "Taille des alinéas ajustable."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:217
-#, no-c-format
-msgid "Option to insert spaces instead of tabs."
-msgstr "Option pour insérer des espaces à la place des alinéas."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:218
-#, no-c-format
-msgid "Open files comfortably via dialog or specify files on the command line."
-msgstr "Ouvrir les fichiers confortablement via une boîte de dialogue ou spécifier les fichiers via la ligne de commande."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:219
-#, fuzzy, no-c-format
-msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
-msgstr "Chercher une partie d'un texte dans toutes les fenêtres. Trouver (Ctrl+F) et trouver le suivant (F3)."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:220
-#, no-c-format
-msgid "Show the line numbers for each line."
-msgstr "Indiquer le numéro de ligne pour chaque ligne."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:221
-#, no-c-format
-msgid "Paste clipboard or drag text into a diff input window."
-msgstr "Coller le presse-papiers ou tirer un texte dans une fenêtre diff."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:222
-#, no-c-format
-msgid "Networktransparency via KIO."
-msgstr "Transparence réseau via KIO."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:223
-#, no-c-format
-msgid "Can be used as diff-viewer in KDevelop 3."
-msgstr "Peut être utilisé pour voir les diff dans KDevelop 3."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:224
-#, no-c-format
-msgid "Word-wrap for long lines."
-msgstr "Coupage des mots dans les lignes longues."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:225
-#, no-c-format
-msgid "Support for Unicode, UTF-8 and other codecs."
-msgstr "Support d'Unicode, UTF-8 et autres."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:226
-#, no-c-format
-msgid "Support for right to left languages."
-msgstr "Support des langues écrivant de droite à gauche."
-msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
-msgstr "Notez que <replaceable>fichier1</replaceable> sera traité comme étant la base de <replaceable>fichier2</replaceable> et <replaceable>fichier3</replaceable>."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:258
-#, no-c-format
-msgid "Special case: Files with the same name"
-msgstr "Cas spécial : fichiers du même nom"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:259
-#, fuzzy, 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 "Si tous les fichiers ont le même nom mais sont situés dans des dossiers différents, vous pouvez réduire la saisie en ne spécifiant que le nom d'un fichier, pour le premier fichier. Ex :"
-" --out file Fichier de résultat, encore. (Par compatibilité avec certains outils).\n"
-" --auto Pas d'interface graphique si tous les conflits se résolvent tout seuls. (Nécessite -o fichier)\n"
-" --qall Ne pas résoudre les conflits automatiquement. (Par compatibilité)...\n"
-" --L1 alias1 Alias pour le fichier 1 (base).\n"
-" --L2 alias2 Alias pour le fichier 2.\n"
-" --L3 alias3 Alias pour le fichier 3.\n"
-" -L, --fname alias Alias alternatif. Mettez cela une fois pour chaque entrée.\n"
-" -u N'a pas d'effet. Pour la compatibilité avec certains outils."
-
-#. Tag: para
-#. +> trunk
-#: 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 ""
-
-#. Tag: para
-#. +> trunk
-#: 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 ""
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:283
-#, fuzzy, no-c-format
-msgid "Ignorable command line options"
-msgstr "Options en ligne de commande"
-
-#. Tag: para
-#. +> trunk
-#: 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:"
-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 ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:300
-#, no-c-format
-msgid "Open-Dialog"
-msgstr "Fenêtre d'ouverture"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:301
-#, no-c-format
-msgid "Since many input files must be selectable, the program has a special open dialog:"
-msgstr "Étant donné que plusieurs fichiers doivent être sélectionnes en entrée, le programme a une fenêtre d'ouverture spéciale :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:307
-#, fuzzy, 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 "La fenêtre d'ouverture vous permet d'éditer les noms des fichier à la main, en sélectionnant un fichier via le navigateur (\"Fichier...\") ou vous permet de choisir des fichiers récemment utilisés via la liste défilante. Si vous rouvrez la fenêtre, alors les noms actuels seront toujours ici. Le troisième fichier d'entrée n'est pas nécessaire. SI l'entrée pour \"C\" reste vide, alors une analyse diff de deux fichiers seulement sera effectuée."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:314
-#, fuzzy, 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 "Vous pouvez aussi sélectionner un dossier via \"Dossier...\". Si pour A un dossier est spécifié alors une comparaison/fusion de dossiers débutera."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:319
-#, fuzzy, 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 "Si \"Fusionner\" est sélectionné, alors la ligne \"Sortie\" devient éditable. Mais il n'est pas nécessaire de spécifier le fichier du résultat de la fusion immédiatement. Vous pouvez aussi le faire au moment de l'enregistrement."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:323
-#, fuzzy, no-c-format
-msgid "The \"Configure...\"-button opens the options-dialog, so that you can set the options before running the analysis."
-msgstr "Le bouton \"Configurer...\" ouvre la fenêtre des options pour que vous puissiez mettre en place les options avant de débuter l'analyse."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:329
-#, no-c-format
-msgid "Paste and Drop Input"
-msgstr "La saisie en Coller et Lâcher"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:330
-#, fuzzy, 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 "Parfois vous voulez comparer les parties d'un texte qui n'est pas un fichier. KDiff3 vous permet aussi de coller le texte du presse-papiers dans une fenêtre de diff sélectionnée. L'analyse diff est alors immédiate. Dans la fenêtre ouverte vous n'aurez pas besoin de spécifier des fichiers, mais simplement de la fermer via \"Annuler\"."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Vous pouvez aussi utiliser la méthode du tirer/lâcher : Tirez un fichier depuis le navigateur ou sélectionnez du texte depuis un éditeur et lâchez le dans la fenêtre de diff."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Quelle est l'idée ? Parfois un fichier contient deux fonctions similaires, mais vérifier à quel niveau elles sont similaires est compliqué si vous devez d'abord créer deux fichiers puis les charger. Maintenant vous pouvez simplement copier, coller et comparer les sections en question."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:342
-#, fuzzy, no-c-format
-msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
-msgstr "Note : Actuellement vous ne pouvez rien tirer depuis KDiff3. Seulement le lâchage dans l'entrée de diff est géré."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:345
-#, fuzzy, 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 "Attention : Certains éditeurs interprètent toujours la méthode du tirer/lâcher vers un autre programme comme un couper (à la place de copier) et coller. Vos données originales pourraient alors être perdues."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:351
-#, fuzzy, no-c-format
-msgid "Comparing Files And Interpreting The Information In The Input Windows"
-msgstr "Interpréter l'information dans les fenêtres de saisie"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:355
-#, no-c-format
-msgid "Info Line"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:355
-#, fuzzy, 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 "En haut de chaque fenêtre il y a sa \"ligne d'informations\". Les lignes d'informations des fenêtres de saisie contiennent une lettre \"A\", \"B\" ou \"C\", le nom de fichier et le numéro de ligne de la première ligne visible dans la fenêtre. (Notez que la fenêtre \"C\" est optionnelle). Chaque ligne d'information apparaît dans une couleur différente. (Si les chemins sont trop longs, alors vous pouvez déplacer la souris sur la ligne d'information et une bulle apparaîtra, vous montrant le nom complet)."
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:364
-#, fuzzy, no-c-format
-msgid "Coloring"
-msgstr "Couleurs"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:364
-#, fuzzy, 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 "Les trois fenêtres de saisies sont assignées aux lettres \"A\", \"B\" et \"C\". \"A\" a la couleur bleue, \"B\" le vert et \"C\" le mauve. (Ce sont les options par défaut, mais elles peuvent être changées via le Menu Options)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:368
-#, fuzzy, 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 "Quand une différence est détectée les couleurs montrent quel fichier diffère. Quand les deux fichiers en entrée diffèrent, alors la couleur utilisée est le rouge par défaut (\"Couleur de conflit\" dans les Options). Ce schéma de couleur est particulièrement utile si vous avez trois fichiers en entrée, ce qui sera vu dans la prochaine section (<link linkend=\"merging\">Fusion</link>)."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:374
-#, no-c-format
-msgid "Summary Column"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:374
-#, fuzzy, 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 "A la gauche de chaque texte se trouve la \"colonne de résumé\". Si des différences sont trouvées sur une ligne alors la colonne de résumé affiché la couleur respective. Pour une différence d'espace seulement la colonne est changée. Pour les langages de programmation où les espaces ne sont pas si importants, il est pratique de voir d'un coup d'oeil si quelque chose d'important a été modifié. (En C/C++ les espaces ne sont intéressants que dans les chaînes, commentaires, pour le préprocesseur et dans quelques situations très ésotériques)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "La ligne verticale séparant la colonne de résumé et le texte est interrompue si le fichier en entrée n'a pas de lignes. Quand la coupe des mots est activée, alors cette ligne verticale apparaît en pointillé."
-
-# Tag: emphasis
-#. Tag: title
-#. +> trunk
-#: index.docbook:385
-#, fuzzy, no-c-format
-msgid "Overview Column"
-msgstr "Options de l'aperçu :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:385
-#, fuzzy, 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 "Sur le côté droit une colonne d'\"aperçu\" est visible à gauche de la barre de défilement verticale. Cela montre la colonne de résumé compressée de l'entrée \"A\". Toutes les différences et conflits sont visibles d'un coup d'oeil. Quand seulement deux fenêtre de saisie sont utilisées, alors toutes les différences apparaîtront en rouge ici car chaque différence est aussi un conflit. Un rectangle noir encadre les parties visibles des entrées. Pour les fichiers très longs, quand le nombre de lignes est plus grand que la hauteur de la colonne d'aperçu en pixels, alors plusieurs lignes partagent la seule ligne d'aperçu. Un conflit a alors la priorité maximale sur les autres simples différences, qui ont la priorité sur les lignes ou rien ne change, pour qu'aucune différence ou conflit ne soit perdu ici. En cliquant sur cette colonne d'aperçu le texte correspondant sera affiché."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:397
-#, no-c-format
-msgid "Manually Aligning Lines"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:408
-#, no-c-format
-msgid "Currently merging doesn't support the use of manual diff help."
-msgstr ""
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:410
-#, no-c-format
-msgid "Manually Joining and Splitting Diff Sections"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:425
-#, no-c-format
-msgid "Merging And The Merge Output Editor Window"
-msgstr "Fusionner et la Fenêtre d'édition du Résultat de la Fusion"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:429
-#, fuzzy, 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 "La fenêtre d'édition du résultat de la fusion (située sous la fenêtre de saisie de diff) a aussi une ligne d'information en haut affichant \"Résultat :\", le nom du fichier et \"[Modifié]\" si vous avez édité quelque chose. Habituellement elle contiendra du texte à travers les facilités de fusion automatique, mais conserve souvent quelques conflits."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:434
-#, fuzzy, 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 "!!! L'enregistrement est désactivé avant que tous les conflits ne soient résolus !!! (Utilisez les boutons \"Aller au conflit suivant/précédent\" pour trouver les conflits restants)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:437
-#, no-c-format
-msgid "With only two input files every difference is also a conflict that must be solved manually."
-msgstr "Avec seulement deux fichiers en entrée, chaque différence est aussi un conflit devant être résolu manuellement."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Avec trois fichiers en entrée, le premier fichier est traité comme la base, alors que les second et troisième fichiers en entrée contiennent des modifications. Quand dans une ligne seulement soit B ou C a changé mais pas les deux, la source changée sera sélectionnée. Seulement si B et C ont changé sur les mêmes lignes, alors l'outil détectera un conflit devant être résolu manuellement. Quand B et C sont les mêmes, mais différents de A, alors C est sélectionné."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:447
-#, fuzzy, no-c-format
-msgid "The Summary Column"
-msgstr "La colonne d'état"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:447
-#, fuzzy, 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 \"<Merge Conflict>\", 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 "La fenêtre d'édition du résultat de la fusion a aussi une colonne de résumé sur la gauche. Elle affiche la lettre de l'entrée sélectionnée pour une ligne ou rien si les trois sources étaient égales sur une ligne. Pour les conflits, elle affiche un point d'interrogation \"?\" et la ligne affiche \"<Conflit de Fusion>\" tout en rouge. Étant donné que la résolution des conflits ligne par ligne prendrait beaucoup de temps, les lignes sont groupées en groupes ayant les mêmes caractéristiques de différences et conflits. Seuls les conflits d'espaces sont séparés des autres conflits pour faciliter la fusion de fichiers où l'indentation a changé pour beaucoup de lignes."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:457
-#, no-c-format
-msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:457
-#, fuzzy, 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 "Quand vous cliquez dans la colonne de résumé avec le bouton gauche de la souris dans une fenêtre alors le groupe correspondant à cette ligne sera sélectionné dans toutes les fenêtres et le début de ce groupe sera affiché. (Cela peut invoquer un saut de repositionnement automatique dans la fenêtre si le début d'un groupe n'est pas visible). Ce groupe devient alors le \"groupe actuel\". Il est surligné et une barre noire apparaît sur le côté gauche du texte."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:463
-#, no-c-format
-msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. Tag: para
-#. +> trunk
-#: index.docbook:482
-#, fuzzy, 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 <No src line> 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 "Parfois, quand une ligne est supprimée soit par fusion automatique ou édition et qu'aucune autre ligne ne reste dans ce groupe, alors le texte <Pas de ligne à la source> apparaîtra sur cette ligne. C'est juste pour vous souvenir qu'il y avait une source ici si vous changez d'idée et sélectionnez une ligne de nouveau. Ce texte n'apparaîtra pas dans le fichier enregistré ou dans n'importe quelle sélection que vous copierez et collerez."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:488
-#, fuzzy, no-c-format
-msgid "The text \"<Merge Conflict>\" will appear in the clipboard if you copy and paste some text containing such a line. But still be careful to do so."
-msgstr "Le texte \"<Conflit de Fusion>\" apparaîtra dans le presse-papiers si vous copiez et collez du texte contenant une ligne au maximum. Mais faites toujours attention à cela."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:492
-#, no-c-format
-msgid "Choosing Input A, B, or C for All Conflicts"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:492
-#, fuzzy, 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 "La fusion normale démarrera par la résolution automatique de conflits simples. Mais le menu \"Fusion\" propose quelques actions pour d'autres besoins communs. Si vous avez à sélectionner la même source pour la plupart des conflits, alors vous pouvez choisir \"A\", \"B\" ou \"C\" partout, ou seulement pour les conflits restant non résolus, ou pour les conflits d'espacement non résolus. Si vous voulez décider chaque différence vous même, vous pouvez \"Mettre des deltas aux conflits\". Ou si vous voulez retourner aux choix automatiques de KDiff3 alors sélectionnez \"Résoudre automatiquement les conflits simples\". KDiff3 redémarre alors la fusion. Pour les actions changeant vos précédentes modifications KDiff3 vous demandera votre confirmation avant de continuer."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:503
-#, fuzzy, 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 "Note : Quand vous choisissez une des sources pour les conflits d'espacement non résolus et que les options \"Ignorer les nombres\" ou \"Ignorer les commentaires C/C++\" sont utilisées alors les changements dans les nombres ou commentaires seront aussi traités comme des espaces."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:508
-#, no-c-format
-msgid "Automatic Merge of Version Control Keywords and History (Log)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:508
-#, no-c-format
-msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:528
-#, no-c-format
-msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:551
-#, no-c-format
-msgid "Note that &kdiff3; will remove duplicate history entries. 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:564
-#, no-c-format
-msgid ""
-"Example: Assume a history that looks like this: <screen>\n"
-"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:568
-#, no-c-format
-msgid "The line with the \"$Log$\"-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
-#. +> trunk
-#: 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"
-"</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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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"
-"</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
-#. +> trunk
-#: 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:"
-msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
-msgstr ""
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:607
-#, no-c-format
-msgid "Navigation And Editing"
-msgstr "Navigation et Édition"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:608
-#, fuzzy, 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 "La majorité de la navigation sera effectuée avec les barres de défilement et la souris mais vous pouvez aussi naviguer avec les touches. Si vous cliquez dans une des fenêtres alors vous pouvez utilisez les touches page précédente, page suivante, home, fin, ctrl-home, ctrl-fin et les flèches comme vous le feriez dans les autres programmes. La colonne de résumé située à côté de la barre de défilement verticale des fichiers en entrée peut aussi être utilisée pour naviguer en cliquant dessus."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:615
-#, fuzzy, no-c-format
-msgid "You can also use the wheel mouse to scroll up and down."
-msgstr "Vous pouvez aussi utiliser la molette de la souris pour monter et descendre."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:617
-#, fuzzy, 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 "Dans l'éditeur de résultat de la fusion vous pouvez aussi utiliser les autres touches pour l'édition. Vous pouvez basculer entre les modes insérer et remplacer avec la touche Insertion. (Le mode par défaut est le mode d'insertion)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:621
-#, fuzzy, 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 "Un clic gauche dans une colonne de résumé synchronisera toutes les fenêtres pour qu'elles affichent le début du même groupe de lignes (comme expliqué dans la section <link linkend=\"merging\">\"Fusion\"</link>)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:625
-#, fuzzy, 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 "La barre de boutons contient aussi sept bouttons de navigation avec lesquels vous pouvez naviguer vers la première/actuelle/dernière différence, vers la différence précédente/suivante (ctrl-haut/ctrl-bas), vers le conflit précédent/suivant (ctrl-pgpréc/ctrl-pgsuiv), ou vers le conflit non résolu précédent/suivant. Notez que pour KDiff3 un \"conflit\" qui n'a pas été résolu automatiquement au début de la fusion reste un \"conflit\" même s'il est résolu. Voila la nécessité de distinguer les \"conflits non résolus\"."
-
-# Tag: emphasis
-#. Tag: title
-#. +> trunk
-#: index.docbook:633
-#, fuzzy, no-c-format
-msgid "Auto-Advance"
-msgstr "Délai d'avancée automatique (en ms) :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:634
-#, fuzzy, 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- & 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 "Il y a aussi un bouton \"Aller automatiquement au conflit non résolu suivant après la sélection de la source\" (Avancée automatique). Si vous activez cette option, alors, quand une source est sélectionnée, KDiff3 avancera automatiquement en sélectionnant le prochain conflit non résolu. Cela vous aidera si vous voulez toujours ne choisir qu'une source. Si vous avez besoin de deux sources, ou si vous voulez éditer après la sélection, alors vous voudrez probablement désactiver cette fonctionnalité. Avant d'avancer au conflit suivant KDiff3 vous montre les modifications de ce choix pour un court laps de temps. Ce délai est ajustable dans les Options de Fusion et de Diff : Vous pouvez spécifier le \"Délai d'avancée automatique\" en millisecondes entre 0 et 2000. Astuce : Vous êtes fatigué d'effectuer trop de clics ? - Utilisez un court délai d'avancée automatique et les raccourcis Ctrl-1/2/3 pour sélectionner A/B/C pour les conflits."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:650
-#, no-c-format
-msgid "Select, Copy And Paste"
-msgstr "Sélectionner, Copier et Coller"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:651
-#, fuzzy, 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 "La fenêtre d'entrée n'affiche pas de curseur, les sélections peuvent donc être effectuées via la souris en cliquant avec le bouton gauche au début, en gardant le bouton pressé et en se déplaçant à la fin de la sélection souhaitée, où vous relâchez le bouton. Vous pouvez aussi sélectionner un mot en double cliquant dessus. Dans l'éditeur de résultat de la fusion vous pouvez aussi sélectionner via le clavier en gardant le bouton \"Maj\" pressé et en naviguant via les flèches."
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. Tag: para
-#. +> trunk
-#: index.docbook:667
-#, fuzzy, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
-msgstr "Pour copier vers le presse-papiers vous devez cliquez sur le boutton \"Copier\" (Ctrl-C ou Ctrl-Inser). Mais il existe une fonctionnalité \"Copier automatiquement la sélection\". Si elle est activée, alors tout ce que vous sélectionnerez sera copié automatiquement vers le presse papier et vous n'aurez pas besoin de copier. Mais faites attention lorsque vous utilisez cela car le contenu du presse-papiers peut être effacé accidentellement."
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:686
-#, no-c-format
-msgid "Saving"
-msgstr "Enregistrer"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:687
-#, fuzzy, 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 "L'enregistrement ne sera autorisé que quand tous les conflits seront résolus. Si le fichier existe déjà et que la fonctionnalité \"Effectuer une copie de sauvegarde des fichiers\" est activée alors le fichier existant sera renommé avec une extension en \".orig\", mais si un fichier .orig existe déjà il sera supprimé. Quand vous quittez ou lancez une autre analyse diff et que les données n'ont pas encore été enregistrées, alors KDiff3 vous demandera si vous voulez enregistrer, annuler ou continuer sans enregistrer. (KDiff3 ne saisit aucun signal. Donc si vous \"tuez\" KDiff3 vos données seront perdues)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:695
-#, fuzzy, 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 "Les fins de ligne sont enregistrées selon la méthode normale de l'OS. Pour les Unix chaque fin de ligne se termine avec un caractère \"\\n\", tandis que pour les systèmes basés sur Win32 chaque ligne se termine avec un retour chariot et \"\\r\\n\". KDiff3 ne préserve pas les fins de ligne des fichiers en entrée, ce qui signifie aussi que vous ne devriez pas utiliser KDiff3 pour les fichiers binaires."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:704
-#, no-c-format
-msgid "Finding Strings"
-msgstr "Trouver des chaînes"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:705
-#, fuzzy, 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 "Vous pouvez chercher une chaîne dans n'importe quelle fenêtre de KDiff3. La commande \"Chercher...\" (Ctrl-F) dans le menu Édition ouvre une fenêtre vous permettant de spécifier la chaîne à rechercher. Vous pouvez aussi sélectionner la fenêtre dans laquelle la chaîne doit être cherchée. La recherche reste toujours au premier plan. En utilisant \"Chercher le suivant\" (F3), vous chercherez l'occurrence suivante. Si vous sélectionner plusieurs fenêtres, alors la première fenêtre sera scannée du début jusqu'à la fin avant que la recherche ne démarre dans la fenêtre suivante au premier plan, etc."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:716
-#, fuzzy, no-c-format
-msgid "Printing"
-msgstr "Attention"
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:726
-#, no-c-format
-msgid "All:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:726
-#, no-c-format
-msgid "Print everything."
-msgstr ""
-
-#. Tag: term
-#. +> trunk
-#: index.docbook:727
-#, no-c-format
-msgid "Current:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: 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 achieved by specifying page number 10000 for printing.)"
-msgstr ""
-
-# Tag: emphasis
-#. Tag: term
-#. +> trunk
-#: index.docbook:729
-#, fuzzy, no-c-format
-msgid "Selection:"
-msgstr "Copier automatiquement la sélection :"
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. +> trunk
-#: index.docbook:735
-#, fuzzy, no-c-format
-msgid "Range:"
-msgstr "Langue :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:735
-#, no-c-format
-msgid "Specify the first and last page."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:738
-#, no-c-format
-msgid "Other important options for printing will be taken from the normal options:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:741
-#, no-c-format
-msgid "Font, font size"
-msgstr ""
-
-# Tag: emphasis
-#. Tag: para
-#. +> trunk
-#: index.docbook:742
-#, fuzzy, no-c-format
-msgid "Show line numbers"
-msgstr "Afficher les numéros de ligne :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:743
-#, no-c-format
-msgid "Word wrap"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:744
-#, fuzzy, no-c-format
-msgid "<para>Colors</para>"
-msgstr "<para>...</para>"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:745
-#, no-c-format
-msgid "etc."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:747
-#, no-c-format
-msgid "Landscape formatting is also recommended for printing."
-msgstr ""
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:752
-#, no-c-format
-msgid "Options"
-msgstr "Options"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:753
-#, fuzzy, 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 "Les options et la liste des fichiers récemment ouverts seront enregistrées lorsque vous quitterez le programme, et rechargées lorsque vous le démarrerez. (Menu Options / Configurer KDiff3)..."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:757
-#, no-c-format
-msgid "Font"
-msgstr "Police"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Sélectionnez un taille de police fixe. (Sur certains systèmes cette fenêtre présentera aussi des tailles de police variable, mais vous ne devriez pas les utiliser)."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:763
-#, no-c-format
-msgid "Italic Font for Deltas:"
-msgstr "Police italique pour les différences :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Si vous sélectionnez cela, alors les différences de texte seront affichées dans la version italique de la police. Si la police ne supporte pas l'italique, cela ne fera rien."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:770
-#, no-c-format
-msgid "<title>Colors</title>"
-msgstr ""
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:772
-#, no-c-format
-msgid "Foreground color:"
-msgstr "Couleur du premier plan :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:772 index.docbook:785
-#, no-c-format
-msgid "Usually black."
-msgstr "Habituellement le noir."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:773
-#, no-c-format
-msgid "Background color:"
-msgstr "Couleur de l'arrière plan :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:773
-#, no-c-format
-msgid "Usually white."
-msgstr "Habituellement le blanc."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:774
-#, no-c-format
-msgid "Diff Background color:"
-msgstr "Couleur de l'arrière plan de Diff :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:774
-#, no-c-format
-msgid "Usually light gray."
-msgstr "Habituellement le gris clair."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:775
-#, no-c-format
-msgid "Color A:"
-msgstr "Couleur A :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:775
-#, no-c-format
-msgid "Usually dark blue."
-msgstr "Habituellement le bleu foncé."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:776
-#, no-c-format
-msgid "Color B:"
-msgstr "Couleur B :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:776
-#, no-c-format
-msgid "Usually dark green."
-msgstr "Habituellement le vert foncé."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:777
-#, no-c-format
-msgid "Color C:"
-msgstr "Couleur C :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:777
-#, no-c-format
-msgid "Usually dark magenta."
-msgstr "Habituellement le mauve foncé."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:778
-#, no-c-format
-msgid "Conflict Color:"
-msgstr "Couleur de conflit :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:778 index.docbook:783
-#, no-c-format
-msgid "Usually red."
-msgstr "Habituellement le rouge."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:779
-#, no-c-format
-msgid "Current range background color:"
-msgstr "Couleur de l'arrière plan de la sélection actuelle :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:779
-#, no-c-format
-msgid "Usually light yellow."
-msgstr "Habituellement le jaune clair."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:780
-#, no-c-format
-msgid "Current range diff background color:"
-msgstr "Couleur de l'arrière plan de la sélection différant actuelle :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:780 index.docbook:784
-#, no-c-format
-msgid "Usually dark yellow."
-msgstr "Habituellement le jaune foncé"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:781
-#, no-c-format
-msgid "Color for manually aligned difference ranges:"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:781
-#, fuzzy, no-c-format
-msgid "Usually orange."
-msgstr "Habituellement le rouge."
-
-# Tag: title
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:782
-#, fuzzy, no-c-format
-msgid "Newest file color in directory comparison:"
-msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:782
-#, fuzzy, no-c-format
-msgid "Usually green."
-msgstr "Habituellement le vert foncé."
-
-# Tag: title
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:783
-#, fuzzy, no-c-format
-msgid "Oldest file color in directory comparison:"
-msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
-
-# Tag: title
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:784
-#, fuzzy, no-c-format
-msgid "Middle age file color in directory comparison:"
-msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
-
-# Tag: title
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:785
-#, fuzzy, no-c-format
-msgid "Color for missing files in directory comparison:"
-msgstr "Ligne de commande pour lancer une comparaison ou fusion de dossiers :"
-
-#. Tag: para
-#. +> trunk
-#: 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
-#. Tag: para
-#. +> trunk
-#: index.docbook:790
-#, fuzzy, 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 "Pour les systèmes ne comprenant que 16 ou 256 couleurs certaines couleurs ne sont pas disponibles en forme pure. Sur ces systèmes le boutton \"Par défaut\" choisira une couleur pure."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:796
-#, no-c-format
-msgid "Editor Settings"
-msgstr "Options de l'éditeur"
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:798
-#, no-c-format
-msgid "Tab inserts spaces:"
-msgstr "Tabulation insère des espaces :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Si ceci est désactivé et que vous pressez la touche de tabulation, un caractère de tabulation est inséré, sinon la quantité appropriée de caractères est insérée."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:801
-#, no-c-format
-msgid "Tab size:"
-msgstr "Taille de la tabulation :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:801
-#, no-c-format
-msgid "Can be adjusted for your specific needs. Default is 8."
-msgstr "Peut être ajustée pour vos besoins spécifique. Par défaut, 8."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:802
-#, no-c-format
-msgid "Auto indentation:"
-msgstr "Indentation automatique :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:802
-#, fuzzy, no-c-format
-msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
-msgstr "Quand vous pressez le bouton Entrée ou Retour l'indentation de la ligne précédente est utilisée pour la nouvelle ligne."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:804
-#, no-c-format
-msgid "Auto copy selection:"
-msgstr "Copier automatiquement la sélection :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:804
-#, fuzzy, no-c-format
-#| msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitely copy it."
-msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
-msgstr "Chaque sélection est copiée automatiquement vers le presse-papiers quand cette option est activée."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:806
-#, no-c-format
-msgid "Line end style:"
-msgstr "Style de fin de ligne :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: 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 "Quand vous enregistrez vous pouvez sélectionner quel style de fin de ligne vous préférez. La configuration par défaut est le choix commun pour le système d'exploitation utilisé."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:811
-#, fuzzy, no-c-format
-msgid "Diff Settings"
-msgstr "Options de Comparaison et de Fusion"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:812
-#, fuzzy, 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 "Quand vous comparez des fichiers, KDiff3 essaie d'abord de comparer les lignes qui sont égales dans les trois fichiers. Il ne peut ignorer les espaces que dans cette étape. La seconde étape compare chaque ligne. Dans cette étape les espaces ne seront pas ignorés. Durant la fusion les espaces ne seront pas ignorés non plus."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:820
-#, no-c-format
-msgid "Ignore numbers:"
-msgstr "Ignorer les nombres :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:820
-#, fuzzy, 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 "Désactivé par défaut. Les chiffres ('0'-'9', '.', '-') seront ignorés dans la première partie de l'analyse durant laquelle la comparaison des lignes est effectuée. Dans le résultat les différences seront affichées dans tous les cas, mais elles sont traitées comme des espaces."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:825
-#, no-c-format
-msgid "Ignore C/C++ comments:"
-msgstr "Ignorer les commentaires C/C++ :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:825
-#, no-c-format
-msgid "Default is off. Changes in comments will be treated like changes in white space."
-msgstr "Désactivé par défaut. Les changements dans les commentaires seront traités comme les changements dans les espaces."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:828
-#, no-c-format
-msgid "Ignore case:"
-msgstr "Ignorer la casse :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:828
-#, fuzzy, no-c-format
-msgid "Default is off. Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space."
-msgstr "Désactivé par défaut. Les changements dans les commentaires seront traités comme les changements dans les espaces."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:831 index.docbook:998
-#, no-c-format
-msgid "Preprocessor-Command:"
-msgstr "Commande Préprocesseur :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:831 index.docbook:834
-#, no-c-format
-msgid "See <link linkend=\"preprocessors\">next section</link>."
-msgstr "Se reporter à la <link linkend=\"preprocessors\">section suivante</link>."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:834 index.docbook:1005
-#, no-c-format
-msgid "Line-Matching Preprocessor-Command:"
-msgstr "Commande préprocesseur de comparaison de ligne :"
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:837
-#, no-c-format
-msgid "Try Hard:"
-msgstr "S'efforcer :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:837
-#, 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 "S'efforcer de trouver des différences encore plus petites. (Activé par défaut). Ceci sera probablement efficace pour les fichiers lourds et compliqués, lent pour les fichiers très lourds."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:844
-#, fuzzy, no-c-format
-msgid "Merge Settings"
-msgstr "Options de Comparaison et de Fusion"
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:846
-#, no-c-format
-msgid "Auto Advance Delay (ms):"
-msgstr "Délai d'avancée automatique (en ms) :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:846
-#, 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 "Quand le mode d'avancée automatique est activé, cette option spécifie la durée d'affichage du résultat de la sélection avant de sauter au conflit non résolu suivant."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:850
-#, no-c-format
-msgid "White space 2/3-file merge default:"
-msgstr "Choix par défaut pour les espaces lors d'une fusion à 2/3 fichiers :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:850
-#, fuzzy, 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 "Résoudre automatiquement tous les conflits d'espaces en choisissant le fichier spécifié. (Le choix par défaut est le choix manuel). Utile si tous les espaces ne sont pas vraiment importants dans les fichiers. Si vous avez besoin de cela occasionellement, il est mieux d'utiliser \"Choisir A/B/C pour tous les conflits d'espaces non résolus\" dans le menu de fusion. Notez que si vous activésoit \"Ignorer les nombres\" ou \"Ignorer les commentaires C/C++\" alors ce choix automatique est aussi appliqué pour les conflits dans les nombres ou les commentaires."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:857
-#, no-c-format
-msgid "Auto merge regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:857
-#, 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
-#. +> trunk
-#: index.docbook:860
-#, no-c-format
-msgid "Run regular expression auto merge on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:860
-#, 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
-#. +> trunk
-#: index.docbook:863
-#, no-c-format
-msgid "History start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:863
-#, no-c-format
-msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:868
-#, no-c-format
-msgid "History entry start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:868
-#, 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
-#. +> trunk
-#: index.docbook:875
-#, no-c-format
-msgid "History merge sorting:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:875
-#, no-c-format
-msgid "Enable version control history sorting."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:878
-#, no-c-format
-msgid "History entry start sort key order:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:878
-#, 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
-#. +> trunk
-#: index.docbook:886
-#, no-c-format
-msgid "Merge version control history on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:886
-#, no-c-format
-msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:889
-#, no-c-format
-msgid "Max number of history entries:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:889
-#, 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
-#. +> trunk
-#: index.docbook:892
-#, no-c-format
-msgid "Test your regular expressions"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:892
-#, 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
-#. +> trunk
-#: index.docbook:898
-#, no-c-format
-msgid "Irrelevant merge command:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:898
-#, 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:910
-#, no-c-format
-msgid "Directory Merge"
-msgstr "Fusion de dossiers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:911
-#, 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 "Ces options sont en relation avec le scan de dossiers et le déroulement de la fusion : Reportez-vous à la <link linkend=\"dirmergeoptions\">Documentation sur la Comparaison/Fusion de dossiers</link> pour plus de détails."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:915
-#, no-c-format
-msgid "Yet there is one option here that is also relevant for saving single files:"
-msgstr "Il y a déjà une option ici qui est aussi pertinente pour l'enregistrement de fichiers seuls :"
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:919 index.docbook:1621
-#, no-c-format
-msgid "Backup files:"
-msgstr "Fichiers de sauvegarde :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:919
-#, fuzzy, 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 "Quand un fichier est enregistré et qu'une ancienne version existe déjà, alors la version originale sera renommée avec une extension \".orig\". Si un ancien fichier de sauvegarde portant l'extension \".orig\" existe déjà, alors il sera supprimé sans sauvegarde."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:927
-#, no-c-format
-msgid "Regional and Language Options"
-msgstr "Options Linguistiques et Régionales"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:929
-#, no-c-format
-msgid "Language:"
-msgstr "Langue :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:929
-#, fuzzy, 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 "Ajuste la langue de l'interface utilisateur. Changer cette option n'affecte pas le fonctionnement de votre programme. Vous devrez quitter et redémarrer KDiff3 pour que la langue soit changée. (Cette option n'est pas disponible dans la version KDE de KDiff3 car la langue est ajustable dans les options KDE globales.)"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:931
-#, no-c-format
-msgid "Use the same encoding for everything:"
-msgstr "Utiliser le même encodage pour tout :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:931
-#, 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 "Les options d'encodage suivantes peuvent être ajustées séparemment pour chaque élement ou si cette option est activée, toutes les valeurs prendront la même valeur."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:933
-#, no-c-format
-msgid "Local Encoding:"
-msgstr "Encodage local :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:933
-#, 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 "Sous le sélecteur d'encodage apparait une note vous informant de l'encodage local. (Elle n'est pas ajustable mais informative si vous ne connaissez pas votre encodage local, vous devrez la sélectionner.)"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:935
-#, no-c-format
-msgid "File Encoding for A/B/C:"
-msgstr "Encodage du fichier pour A/B/C :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:935
-#, 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 "Ajuste l'encodage pour les fichiers en entrée. Ceci a un effet sur l'interpretation des caractères spéciaux. Etant donné que vous pouvez ajuster chaque encodage séparemment et même comparer et fusionner les fichiers enregistrés en utilisant des encodages différents."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:937
-#, no-c-format
-msgid "File Encoding for Merge Output and Saving:"
-msgstr "Encodage pour la sortie de la fusion et l'enregistrement :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:937
-#, no-c-format
-msgid "When you have edited a file, then you can adjust which encoding will be used when saving to disk."
-msgstr "Quand vous avez édité un fichier, alors vous pouvez ajuster quel encodage sera utilisé lors de l'enregistrement sur le disque."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:939
-#, no-c-format
-msgid "File Encoding for Preprocessor Files:"
-msgstr "Encodage pour les fichiers préprocesseurs :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:939
-#, 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 "Quand vous définissez des préprocesseurs ils peuvent ne pas pouvoir opérer dans votre encodage. (par exemple, vos fichiers sont en unicode 16-bits et votre préprocesseur ne peut prendre que de l'ascii 8-bits.) Avec cette option vous pouvez définir l'encodage de la sortie du préprocesseur."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:941
-#, no-c-format
-msgid "Right To Left Language:"
-msgstr "Langue de droite à gauche :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:941
-#, fuzzy, 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 "Certaines langues sont écrites de droite à gauche. Quand cette case est cochée, KDiff3 écrit le texte de droite à gauche dans la fenêtre d'entrée et dans la fenêtre de sortie de fusion. Notez que si vous lancez KDiff3 avec l'option de la ligne de comande \"--reverse\", ce sera la même chose. (C'est une fonctionnalité proposée par Qt.) Cette documentation a été écrite en estimant que \"Langue de droite à gauche\" était désactivée. Certaines références pour \"gauche\" ou \"droite\" doivent alors être remplacées par leurs contraire si vous utilisez ces options."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:947
-#, no-c-format
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:948
-#, fuzzy, no-c-format
-msgid "(These options and actions are available in menus or the buttonbar.)"
-msgstr "(Ces options et actions sont disponibles dans les menus ou la barre des boutons)."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:950
-#, no-c-format
-msgid "Show line numbers:"
-msgstr "Afficher les numéros de ligne :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:950
-#, no-c-format
-msgid "You can select if line numbers should be shown for the input files."
-msgstr "Vous pouvez sélectionner si les numéros de ligne doivent être affichés pour les fichiers en entrée."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:952
-#, no-c-format
-msgid "Show space and tabulator characters for differences:"
-msgstr "Afficher les espaces et les alinéas pour les différences :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:952
-#, no-c-format
-msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
-msgstr "Parfois les espaces et alinéas visibles peuvent vous déranger. Vous pouvez désactiver cette option."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:954
-#, no-c-format
-msgid "Show white space:"
-msgstr "Afficher les espaces :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:954
-#, fuzzy, 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 "Désactivez cette option pour supprimer tous les surlignements ou les changements d'espaces dans le texte ou dans les colonnes d'aperçu. (Notez que cela s'applique aussi aux changements dans les nombres ou commentaires quand les options \"Ignorer les nombres\" ou \"Ignorer les commentaires\" sont actives)."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:958
-#, no-c-format
-msgid "Overview options:"
-msgstr "Options de l'aperçu :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:958
-#, fuzzy, 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 "Ces choix ne sont disponibles que si vous comparez trois fichiers. Dans le mode normal toutes les différences sont affichées dans une colonne d'aperçu codée en une seule colonne. Mais parfois vous pouvez être particulièrement intéressés par les différences entre seulement deux de ces trois fichiers. En sélectionnant l'aperçu \"A et B\", \"A et C\" ou \"B et C\", une seconde colonne d'aperçu sera affichée avec les informations nécessaires à côté de l'aperçu normal."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:965
-#, no-c-format
-msgid "Word wrap diff windows:"
-msgstr "Fenêtre de coupe des mots :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:965
-#, no-c-format
-msgid "Wrap lines when their length would exceed the width of a window."
-msgstr "Coupe des mots lorsque leur longueur dépasse la largeur de la fenêtre."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:968
-#, no-c-format
-msgid "Show Window A/B/C:"
-msgstr "Afficher la fenêtre A/B/C :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:968
-#, fuzzy, 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 "Parfois vous voudrez mieux utiliser l'espace sur l'écran pour les longues lignes. Cachez les fenêtres qui ne sont pas importantes. (Dans le menu Fenêtre)."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:971
-#, no-c-format
-msgid "Toggle Split Orientation:"
-msgstr "Sens de la séparation des fenêtres :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:971
-#, fuzzy, 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 "Choisir entre les fenêtres de comparaison affichées côte à côte (A à côté de B à côté de C) ou l'une au-dessus de l'autre (A sur B sur C). Cela devrait aussi vous aider si les lignes sont longues. (Dans le menu Fenêtre)."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:975
-#, no-c-format
-msgid "Start a merge quickly:"
-msgstr "Démarrer une fusion rapide :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:975
-#, fuzzy, 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 "Parfois vous voyez des différences et vous décidez de fusionner. <inlinemediaobject><imageobject><imagedata fileref=\"merge_current.png\" format=\"PNG\"/></imageobject></inlinemediaobject> \"Fusionner le fichier actuel\" dans le menu Dossiers fonctionne aussi si vous voulez comparer deux fichiers. Un simple clic démarre la fusion et utilise le nom de fichier du dernier fichier en entrée comme étant le nom du fichier résultat de la fusion par défaut. (Quand ceci est utilisé pour redémarrer une fusion, alors le nom de fichier résultat sera conservé)."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:985
-#, no-c-format
-msgid "Configuring Keyboard-Shortcuts"
-msgstr "Configurer les raccourcis clavier"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:986
-#, fuzzy, no-c-format
-msgid "Currently only the KDE-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
-msgstr "Actuellement seule la version KDE supporte la configuration des raccourcis clavier par l'utilisateur. (Menu Configuration / Configurer les raccourcis clavier)..."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:993
-#, no-c-format
-msgid "Preprocessor Commands"
-msgstr "Commandes préprocesseur"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:994
-#, fuzzy, no-c-format
-msgid "&kdiff3; supports two preprocessor options."
-msgstr "KDiff3 supporte deux options préprocesseur."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:998
-#, fuzzy, 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 "Quand un fichier est lu, il sera traité à travers cette commande externe. Le résultat de cette commande sera visible à la place du fichier original. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Utilisez cela pour exclure les parties du fichier qui vous gênent, ou corriger automatiquement l'indentation, etc."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1005
-#, 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 "Quand un fichier est lu, il sera traité à travers cette commande externe. Si une commande préprocessus (voir ci-dessus) est aussi spécifiée, alors le fichier résultat de la commande préprocesseur est utilisé pour le préprocessus de traitement de lignes. Le résultat de cette dernière ne sera utilisé que durant la phase de comparaison de lignes de l'analyse. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Chaque ligne en entrée a une ligne en sortie correspondante."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1015
-#, 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 "L'idée est de permettre à l'utilisateur d'avoir une plus grande flexibilité de configuration du résultat de la comparaison. Mais cela nécessite un programme externe, et beaucoup d'utilisateurs ne veulent pas en écrire un eux-mêmes. La bonne nouvelle est que très souvent <command>sed</command> ou <command>perl</command> feront l'affaire."
-"</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
-#. Tag: title
-#. +> trunk
-#: index.docbook:1038
-#, no-c-format
-msgid "<command>sed</command> Basics"
-msgstr "Bases de <command>sed</command>"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1039
-#, fuzzy, 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 "Cette section n'introduit qu'aux fonctions les plus basiques de <command>sed</command>. Pour plus d'informations reportez vous à <ulink url=\"info:/sed\">la page info de sed</ulink> ou <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>. Une version précompilée pour Windows peut être trouvée à <ulink url=\"http://unxutils.sourceforge.net\">http://unxutils.sourceforge.net</ulink>. Notez que les exemples qui suivent partent du principe que la commande <command>sed</command> est dans un dossier de la variable d'environnement PATH. Si ce n'est pas le cas, vous devrez spécifier le chemin complet absolu pour la commande. Notez aussi que les exemples qui suivent utilisent les guillemets simples (') qui ne fonctionnent pas sous windows. Sur windows vous devez utilisez les doubles guillemets (\") à la place."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1050
-#, 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
-#. +> trunk
-#: index.docbook:1052
-#, no-c-format
-msgid ""
-"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
-"</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"
-"</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."
-msgid "Examples For <command>sed</command>-Use In &kdiff3;"
-msgstr "Exemples d'utilisations de <command>sed</command> dans KDiff3"
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1069
-#, no-c-format
-msgid "Ignoring Other Types Of Comments"
-msgstr "Ignorer les autres types de commentaires"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1070
-#, fuzzy, 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 ""
-"Actuellement KDiff3 ne comprend que les commentaires C/C++. En utilisant la commande préprocesseur de traitement de ligne vous pouvez aussi ignorer d'autres types de commentaires, en les convertissant en commentaires C/C++. Exemple : Pour ignorer les commentaires commençant par \"#\", vous devriez les convertir en \"//\". Notez que vous devrez aussi activer l'option \"Ignorer les commentaires C/C++\" pour que cela ait un effet. La commande préprocesseur de traitement de ligne appropriée serait <screen>\n"
-" <command>sed</command> 's/#/\\/\\//'\n"
-"</screen> Étant donné que pour <command>sed</command> le caractère \"/\" a un sens particulier, il est nécessaire de placer le caractère \"\\\" devant chaque \"/\" dans une chaîne de remplacement. Parfois le \"\\\" est nécessaire pour ajouter ou supprimer un sens particulier de certains caractères. Le guillemet simple (') avant et après la commande de substitution est désormais important, car sinon le shell essaierait d'interpréter certains caractères spéciaux comme'#', '$' ou '\\' avant de les passer à <command>sed</command>. Notez que sur Windows vous aurez besoin des doubles marques de citation ici (\"). Windows substitue les autres caractères comme '%', alors vous pourriez avoir quelques essais à faire."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1089
-#, no-c-format
-msgid "Caseinsensitive Diff"
-msgstr "Comparaison non sensible à la casse"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1090
-#, fuzzy, 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 ""
-"Utilisez la commande préprocesseur de traitement de ligne suivante pour convertir toutes ce qui est situé en entrée en majuscules : <screen>\n"
-" <command>sed</command> 's/\\(.*\\)/\\U\\1/'\n"
-"</screen> Ici \".*\" est une expression rationnelle qui trouve, dans ce contexte, tous les caractères de la ligne. Le \"\\1\" est la chaîne de remplacement en référence au texte trouvé dans la première paire de \"\\(\" et \"\\)\". Le \"\\U\" convertit le texte inséré en majuscules."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1100
-#, no-c-format
-msgid "Ignoring Version Control Keywords"
-msgstr "Ignorer les mots clés CVS"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1101
-#, fuzzy, 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"
-"</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 ""
-"CVS et d'autres systèmes de contrôle de version utilisent des mots clés pour insérer les chaînes générées automatiquement (<ulink url=\"info:/cvs/Keyword substitution\">info:/cvs/Keyword substitution</ulink>). Tous suivent le modèle \"$KEYWORD generated text$\". Nous avons maintenant besoin d'une commande préprocesseur de traitement de ligne qui ne supprime que le texte généré : <screen>\n"
-"</screen> Le \"\\|\" sépare les mots clés possibles. Vous pouvez vouloir modifier cette liste selon vos besoins. Le \"\\\" avant le \"$\" est nécessaire car sinon le \"$\" signifie fin de la ligne."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1111
-#, 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 "Quand vous ferez des expérimentations avec <command>sed</command> vous pourrez arriver à comprendre toutes ces expressions rationnelles. Elles sont utiles car beaucoup d'autres programmes supportent ces mêmes fonctionnalités."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1118
-#, no-c-format
-msgid "Ignoring Numbers"
-msgstr "Ignorer les nombres"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1119
-#, fuzzy, 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"
-"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
-msgstr ""
-"Ignorer les nombres est actuellement une option intégrée. Mais en tant qu'autre exemple, c'est ce qui se passerait si vous aviez mis comme commande préprocesseur de traitement de ligne. <screen>\n"
-"</screen> Chaque caractère dans '[' ']' est remplacé par rien."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1127
-#, no-c-format
-msgid "Ignoring Certain Columns"
-msgstr "Ignorer certaines colonnes"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1128
-#, fuzzy, 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"
-"</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 ""
-"Parfois un texte est très strictement formaté, et il y a certaines colonnes que vous voudrez toujours ignorer, tandis que vous voudrez en gardez d'autres pour l'analyse. Dans l'exemple qui suit les cinq premières colonnes (caractères de chaque ligne) sont ignorés, les dix colonnes suivantes sont conservées, puis de nouveaux cinq colonnes sont ignorées et le reste de la ligne est conservé. <screen>\n"
-"</screen> Chaque point '.' correspond à un caractère. Le \"\\1\" et \"\\2\" dans la chaîne de remplacement réfère au texte correspondant situé entre la première paire de \"\\(\" et\"\\)\" dénotant que le texte doit être conservé."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1138
-#, no-c-format
-msgid "Combining Several Substitutions"
-msgstr "Combiner plusieurs substitutions"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1139
-#, fuzzy, 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 "Parfois vous voudrez appliquer plusieurs substitutions à la fois. Vous pouvez alors utilisez le point-virgule ';' pour les séparer les unes des autres. Exemple :"
-"</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 "Ordre d'exécution des commandes préprocesseur"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1160
-#, no-c-format
-msgid "The data is piped through all internal and external preprocessors in the following order:"
-msgstr "Les données traversent tous les préprocesseurs internes et externes dans l'ordre suivant :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1165
-#, no-c-format
-msgid "Normal preprocessor,"
-msgstr "Préprocesseur normal,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1166
-#, no-c-format
-msgid "Line-Matching-Preprocessor,"
-msgstr "Préprocesseur de traitement de ligne,"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1167
-#, no-c-format
-msgid "Ignore case (conversion to uppercase),"
-msgstr "Ignorer la casse (conversion en majuscule),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1168
-#, no-c-format
-msgid "Detection of C/C++ comments,"
-msgstr "Détection des commentaires C/C++,"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1169
-#, no-c-format
-msgid "Ignore numbers,"
-msgstr "Ignorer les nombres,"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1170
-#, no-c-format
-msgid "Ignore white space"
-msgstr "Ignorer les espaces"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1172
-#, 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 "Les données après le préprocesseur normal seront conservées pour l'affichage et la fusion. Les autres opérations ne modifient que les données que l'algorithme de comparaison de lignes peut voir."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1175
-#, 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 "Dans les rares cas ou vous utiliserez un préprocesseur normal, notez que le préprocesseur de traitement de ligne prend la sortie du préprocesseur normal en tant qu'entrée."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1181
-#, no-c-format
-msgid "Warning"
-msgstr "Attention"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1182
-#, fuzzy, 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 "Les commandes préprocesseur sont très souvent utiles, mais comme avec toutes les options modifiant vos textes ou cachant certaines différences automatiquement, vous pouvez accidentellement sauter certaines différences et dans le pire des cas supprimer des données importantes."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1186
-#, fuzzy, 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 want 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 "C'est pour cette raison que durant une fusion, si une commande préprocesseur normale est utilisée, KDiff3 vous en informera et vous demandera si elle doit être ou non désactivée. Mais ne vous inquiétez pas si une commande préprocesseur de traitement de ligne est active. La fusion ne sera pas terminée tant que tous les conflits ne seront pas résolus. SI vous avez désactivé \"Afficher les espaces\", alors les différences qui seront supprimées avec la commande préprocesseur de traitement de ligne seront aussi invisibles. Si le boutton d'enregistrement reste désactivé durant une fusion (à cause de conflits restants), assurez vous d'avoir activé \"Montrer les espaces\". Si vous ne voulez pas fusionner ces différences moins importantes manuellement, vous pouvez sélectionner \"Choisir [A|B|C] pour tous les conflits d'espaces non résolus\" dans le menu Fusion."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1201
-#, fuzzy, no-c-format
-msgid "Directory Comparison and Merge with &kdiff3;"
-msgstr "Comparaison et Fusion de dossiers avec KDiff3"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1202
-#, fuzzy, no-c-format
-msgid "Introduction into Directory Comparison and Merge"
-msgstr "Démarrer une comparaison ou une fusion de dossiers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1203
-#, fuzzy, 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 "Souvent les programmeurs doivent modifier beaucoup de fichiers dans un dossiers pour parvenir à leur but. Pour cela KDiff3 vous permet aussi de comparer et de fusionner des dossiers complets récursivement !"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1207
-#, fuzzy, 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 "Bien souvent la comparaison et la fusion de dossiers semble bien compliquée, il y a beaucoup de détails dont que vous devriez savoir. Le plus important est bien sur le fait que maintenant beaucoup de fichiers peuvent être affectés par chaque opération. Si vous n'avez pas de sauvegardes de vos données originales, alors il peut être très difficile voire impossible de revenir à l'état original. Donc, avant de démarrer une fusion, assurez-vous que vos données sont en sécurité, et qu'un retour à l'état initial est possible. Vous pouvez faire une archive ou utiliser un système de contrôle de version (CVS), mais même les programmeurs expérimentés et les intégrateurs ont besoin des anciennes sources. Et notez que même si moi (auteur de KDiff3) ait essayé de faire de mon mieux, je ne peux pas garantir qu'il n'y ait pas de bogues. Et selon la GNU-GPL il n'y a AUCUNE GARANTIE sur quoi que ce soit pour ce programme. Alors soyez humble et gardez toujours à l'esprit :"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1221
-#, no-c-format
-msgid "To err is human, but to really mess things up you need a computer."
-msgstr "L'erreur est humaine, mais pour vraiment faire n'importe quoi vous avez besoin d'un ordinateur."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1223
-#, fuzzy, no-c-format
-msgid "So this is what this program can do for you: &kdiff3; ..."
-msgstr "Voila ce que ce programme peut faire pour vous : KDiff3..."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1227
-#, no-c-format
-msgid "... reads and compares two or three directories recursively,"
-msgstr "...lit et compare deux ou trois dossiers récursivement,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1228
-#, no-c-format
-msgid "... takes special care of symbolic links,"
-msgstr "... fait spécialement attention aux liens symboliques,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1229
-#, no-c-format
-msgid "... lets you browse files on mouse double click,"
-msgstr "... vous permet de naviguer dans vos fichiers avec des double-clics,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1230
-#, no-c-format
-msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
-msgstr "... pour chacun d'eux propose une opération de fusion, que vous pouvez changer avant de démarrer une fusion de dossiers,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1232
-#, no-c-format
-msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
-msgstr "... vous permet de simuler la fusion et de lister les actions qui auraient eu lieu, sans les faire,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1234
-#, no-c-format
-msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
-msgstr "... vous permet de faire réellement la fusion, et vous permet d'interagir lorsqu'une action manuelle est nécessaire,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1236
-#, fuzzy, no-c-format
-msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
-msgstr "... vous permet de lancer l'opération pour tous les éléments (touche F7) ou pour l'élément sélectionné (touche F6),"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1237
-#, fuzzy, no-c-format
-msgid "... lets you continue the merge after manual interaction with key F7,"
-msgstr "... vous permet de continuer la fusion après une interaction manuelle avec la touche F7,"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1238
-#, fuzzy, no-c-format
-msgid "... optionally creates backups, with the \".orig\" extension,"
-msgstr "... crée des copies de sauvegarde en option, portant l'extension \".orig\","
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1243
-#, no-c-format
-msgid "Starting Directory Comparison Or Merge"
-msgstr "Démarrer une comparaison ou une fusion de dossiers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1244
-#, 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 "C'est très similaire à la fusion et à la comparaison d'un seul fichier. Vous devrez juste spécifier les dossiers depuis la ligne de commande ou la fenêtre d'ouverture de fichiers."
-" <command>kdiff3</command> <replaceable>dos1 dos2 dos3</replaceable> -o <replaceable>dossier de destination</replaceable>"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1258
-#, fuzzy, 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 "Quand trois dossiers sont fusionnés alors <replaceable>dos1</replaceable> est utilisé comme la base de la fusion. Si aucun dossier de destination n'est spécifié, alors KDiff3 utilisera <replaceable>dos3</replaceable> comme dossier de destination de la fusion."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1265
-#, fuzzy, 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 "Notez que seule la comparaison démarre automatiquement, pas la fusion. Pour cela vous devrez sélectionner le choix du menu ou appuyez sur la touche F7. (Plus de détails à la suite)."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1272
-#, fuzzy, no-c-format
-msgid "Directory Merge Visible Information"
-msgstr "Information visible"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1273
-#, 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 "Lors de la lecture des dossiers, une boîte de dialogue apparat vous informant de la progression. Si vous annulez le scan de dossier, alors seuls les fichiers déjà comparés seront listés."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1277
-#, fuzzy, no-c-format
-msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
-msgstr "Quand le scan de dossiers est terminé KDiff3 affiche une liste avec les résultats à gauche, ..."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1284
-#, no-c-format
-msgid "... and details about the currently selected item on the right:"
-msgstr "... et les détails concernant l'élément actuellement sélectionné à droite :"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1292
-#, no-c-format
-msgid "The Name Column"
-msgstr "La colonne de nom"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1293
-#, 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 "Chaque fichier et dossier ayant été trouvé durant le scan et affiché ici dans une arborescence. Vous pouvez sélectionner un élément en cliquant dessus avec la souris."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1296
-#, fuzzy, 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 "Les dossiers sont fermés par défaut. Vous pouvez les développer ou les fermer on cliquant sur \"+\"/\"-\", en double cliquant sur l'élément ou simplement en utilisant les flèches gauche/droite du clavier. Le menu \"Dossier\" contient aussi deux actions \"Naviguer dans tous les sous-dossiers\" et \"Refermer tous les sous-dossiers\" avec lesquelles vous pouvez fermer ou développer tous les dossiers d'un seul coup."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1302
-#, no-c-format
-msgid "If you double-click a file item then the file comparison starts and the file-diff-window will appear."
-msgstr "Si vous double-cliquez sur un fichier, alors la comparaison démarre et la fenêtre de comparaison apparaîtra."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1306
-#, fuzzy, 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 "L'image de la colonne de nom reflète du type de fichier dans le premier dossier (\"A\"). Cela peut être :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1311
-#, no-c-format
-msgid "Normal file"
-msgstr "Fichier normal"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1312
-#, no-c-format
-msgid "Normal directory (directory-image)"
-msgstr "Dossier normal (image de dossier)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1313
-#, no-c-format
-msgid "Link to a file (file-image with a link arrow)"
-msgstr "Lien vers un fichier (image de fichier avec une flèche)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1314
-#, no-c-format
-msgid "Link to a directory (directory-image with a link arrow)"
-msgstr "Lien vers un dossier (image de dossier avec une flèche)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1316
-#, 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 "SI le type de fichier est différent dans les autres dossiers, alors cela est visible dans les colonnes A/B/C et dans la fenêtre affichant les détails concernant les éléments sélectionnés. Notez que dans un cas comme cela aucune opération de fusion ne peut être sélectionnée automatiquement. Quand une fusion est démarrée, alors l'utilisateur sera informé de problèmes de ce type."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1325
-#, no-c-format
-msgid "The Columns A/B/C and the Coloring Scheme"
-msgstr "Les colonnes A/B/C et le système de coloration"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1326
-#, 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 "Comme cela peut être vu dans l'image ci-dessous les couleurs rouge, vert, jaune et noir sont utilisées dans les colonnes A/B/C."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1331
-#, no-c-format
-msgid "Black: This item doesn't exist in this directory."
-msgstr "Noir : Cela ne semble pas exister dans ce dossier."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1332
-#, no-c-format
-msgid "Green: Newest item."
-msgstr "Vert : Élément le plus récent."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1333
-#, no-c-format
-msgid "Yellow: Older than green, newer than red."
-msgstr "Jaune : Plus vieux que le vert, plus récent que le rouge."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1334
-#, no-c-format
-msgid "Red: Oldest item."
-msgstr "Rouge : Élément le plus ancien."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1336
-#, 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 "Mais pour les éléments qui sont identiques dans la comparaison leur couleur est aussi identique même si leur âge ne l'est pas."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1339
-#, 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 "Les dossiers sont considérés comme égaux si tous les éléments qu'ils contiennent sont égaux. Alors ils auront aussi la même couleur. Mais l'âge d'un dossier n'est pas considéré pour sa couleur."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1343
-#, 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 "L'idée pour le schéma de coloration vient de <ulink url=\"http://samba.org/cgi-bin/cvsweb/dirdiff\">dirdiff</ulink>. Les couleurs ressemblent aux couleurs d'une feuille d'un arbre qui est verte au printemps, puis devient jaune à l'automne pour devenir rouge à l'hiver."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1350
-#, no-c-format
-msgid "The Operation Column"
-msgstr "La colonne d'opération"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1351
-#, fuzzy, 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 "Après avoir comparé les dossiers, KDiff3 évalue aussi une proposition pour l'opération de fusion. Cela est affiché dans la colonne \"Opération\". Vous pouvez modifier l'opération en cliquant sur l'opération que vous voulez changer. Un petit menu se déroulera vous permettant de sélectionner une opération pour cet élément. (Vous pouvez aussi sélectionner les opérations les plus importantes via le clavier. Ctrl+1/2/3/4/Del sélectionnera ainsi respectivement A/B/C/Fusion/Suppression (si disponibles). Cette opération sera exécutée durant la fusion. Cela dépend de l'élément et du mode de fusion dans lequel vous êtes. Le mode de fusion est un des modes qui suit "
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1362
-#, fuzzy, no-c-format
-msgid "Three directory-merge (\"A\" is treated as older base of both)."
-msgstr "Fusion à trois dossiers (\"A\" est considéré comme la base des deux autres)."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1363
-#, no-c-format
-msgid "Two directory-merge."
-msgstr "Fusion de deux dossiers."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1364
-#, fuzzy, no-c-format
-msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
-msgstr "Deux dossiers en mode synchronisé (activé via l'option \"Synchroniser les dossiers\")."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1366
-#, no-c-format
-msgid "In three directory merge the operation proposal will be: If for an item ..."
-msgstr "Dans le cas d'une fusion à trois dossiers l'opération proposée sera : Si pour un élément ..."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1370
-#, fuzzy, no-c-format
-msgid "... all three directories are equal: Copy from C"
-msgstr "... les trois dossiers sont égaux : Copie depuis C"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1371
-#, fuzzy, 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 "... A et C sont égaux mais B ne l'est pas : Copier depuis B (ou si B n'existe pas, supprimer la destination si elle existe)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1373
-#, fuzzy, 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 "... A et B sont égaux mais C ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1375
-#, fuzzy, 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 "... B et C sont égaux mais A ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1377
-#, fuzzy, no-c-format
-msgid "... only A exists: Delete the destination (if exists)"
-msgstr "... seul A existe : Supprimer la destination (si elle existe)"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1378
-#, fuzzy, no-c-format
-msgid "... only B exists: Copy from B"
-msgstr "... seul B existe : Copier depuis B"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1379
-#, fuzzy, no-c-format
-msgid "... only C exists: Copy from C"
-msgstr "... seul C existe : Copier depuis C"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1380
-#, fuzzy, no-c-format
-msgid "... A, B and C are not equal: Merge"
-msgstr "... A, B et C ne sont pas égaux : Fusion"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1381
-#, fuzzy, 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 "... A, B et C n'ont pas le m me type de fichier (par exemple A est un dossier, B un fichier : \"Erreur : Conflit de types de fichiers\". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1385
-#, no-c-format
-msgid "In two directory merge the operation proposal will be: If for an item ..."
-msgstr "Dans la fusion à deux dossiers, l'opération proposée sera : Si pour un élément ..."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1389
-#, fuzzy, no-c-format
-msgid "... both directories are equal: Copy from B"
-msgstr "les deux dossiers sont égaux : Copier depuis B"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1390
-#, fuzzy, no-c-format
-msgid "... A exists, but not B: Copy from A"
-msgstr "... A existe, mais pas B : Copier depuis A"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1391
-#, fuzzy, no-c-format
-msgid "... B exists, but not A: Copy from B"
-msgstr "... B existe, mais pas A : Copier depuis B"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1392
-#, fuzzy, no-c-format
-msgid "... A and B exist but are not equal: Merge"
-msgstr "... A et B existent mais ne sont pas égaux : Fusion"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1393 index.docbook:1410
-#, fuzzy, 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 "... A, et B n'ont pas le même type de fichier (par exemple A est un dossier, B un fichier : \"Erreur : Conflit de types de fichiers\". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1397
-#, fuzzy, 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 "Le mode de synchronisation est actif s'il n'y a que deux dossiers, qu'aucune destination explicite n'a été spécifiée et que l'option \"Synchroniser les dossiers\" est active. KDiff3 sélectionne alors une opération par défaut pour que les deux dossiers soient les m mes après-coup. Si pour un élément ..."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1404
-#, fuzzy, no-c-format
-msgid "... both directories are equal: Nothing will be done."
-msgstr "... les deux dossiers sont égaux : Rien ne sera fait."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1405
-#, fuzzy, no-c-format
-msgid "... A exists, but not B: Copy A to B"
-msgstr "... A existe, mais pas B : Copier A vers B"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1406
-#, fuzzy, no-c-format
-msgid "... B exists, but not A: Copy B to A"
-msgstr "... B existe, mais pas A : Copier B vers A"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1407
-#, fuzzy, 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 "... A et B existent, mais sont différents : Fusion et stockage du résultat dans les deux dossiers. Pour l'utilisateur le nom de fichier visible est B, mais alors KDiff3 copie aussi B vers A)."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1414
-#, fuzzy, 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 "Quand deux dossiers sont fusionnés et que l'option \"Copier le plus récent à la place de fusionner\" est sélectionnée, alors KDiff3 regardera les dates et proposera de choisir le fichier le plus récent. Si les fichiers ne sont pas égaux mais ont les mêmes dates alors l'opération contiendra \"Erreur : Les dates sont les mêmes mais les fichiers ne le sont pas\". Tant que des éléments comme ceux-ci existent la fusion ne pourra pas commencer."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1423
-#, no-c-format
-msgid "The Status Column"
-msgstr "La colonne d'état"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1424
-#, fuzzy, 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 "Durant la fusion, les fichiers seront traités les uns après les autres. La colonne d'état affichera \"Terminé\" pour les éléments où l'opération de fusion s'est bien déroulée, et d'autres textes si une chose non attendue est arrivée. Quand une fusion est terminée, vous devriez faire une dernière vérification pour voir si l'état de tous les éléments est correct."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1433
-#, no-c-format
-msgid "Statistics Columns"
-msgstr "Colonne de statistiques"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1434
-#, fuzzy, 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 "Quand le mode de comparaison de fichiers \"Analyse complète\" est activé dans les options, alors KDiff3 affichera des colonnes contenant le nombres de conflits non résolus, résolus et conflits d'espacement ou non. (La colonne résolu s'affichera seulement lors de la comparaison ou fusion de trois dossiers)."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1441
-#, no-c-format
-msgid "Selecting Listed Files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1442
-#, 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
-#. +> trunk
-#: index.docbook:1446
-#, no-c-format
-msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1447
-#, no-c-format
-msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1448
-#, no-c-format
-msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1449
-#, no-c-format
-msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1450
-#, no-c-format
-msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1452
-#, 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
-#. +> trunk
-#: index.docbook:1457
-#, 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
-#. +> trunk
-#: index.docbook:1460
-#, 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:1468
-#, fuzzy, no-c-format
-msgid "Doing A Directory Merge"
-msgstr "Fusion de dossiers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1469
-#, 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 "Vous pouvez soit fusionner l'élément sélectionné actuellement (fichier ou dossier), out tous les éléments. Quand vous aurez fait tous les choix (aussi dans les sous-dossiers) alors vous pourrez démarrer la fusion."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1473
-#, fuzzy, no-c-format
-msgid "Be aware that if you didn't specify a destination directory explicitly, 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 "Soyez conscient que si vous ne spécifiez pas de dossier de destination explicitement, alors la destination sera \"C\" dans le mode de fusion a trois dossiers, \"B\" dans le mode de fusion à deux dossiers, et dans le mode synchronisé, ce sera \"A\" ou/et \"B\""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1477
-#, 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 "Si vous avez spécifié un dossier de destination vérifiez aussi que tous éléments devant être à la sortie, sont dans l'arborescence. Il y a quelques options qui font que certains éléments sont oubliés de la comparaison et la fusion de dossiers. Vérifiez ces options pour éviter des mauvaises surprises :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1484
-#, fuzzy, no-c-format
-msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
-msgstr "\"Dossiers récursifs\" : Si cette option est désactivée, alors les éléments contenus dans les sous-dossiers ne seront pas trouvés."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1486
-#, fuzzy, no-c-format
-msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
-msgstr "\"Modèle\"/\"Anti-modèle\" : Inclure/exclure les éléments qui correspondent"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1487
-#, fuzzy, no-c-format
-#| msgid "Find Hidden Files and Directories:"
-msgid "\"Find hidden files and directories\""
-msgstr "Trouver les fichiers et dossiers cachés :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1488
-#, no-c-format
-msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1490
-#, 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
-#. +> trunk
-#: index.docbook:1495
-#, 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
-#. +> trunk
-#: index.docbook:1499
-#, no-c-format
-msgid "If you are satisfied so far, the rest is easy."
-msgstr "Si vous êtes satisfait ici, le reste et simple."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1501
-#, fuzzy, 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 "Pour fusionner tous les éléments : Sélectionnez \"Démarrer/Continuer la fusion de dossiers\" dans le menu \"Dossier\" ou appuyez sur la touche F7 (qui est le raccourci). Pour fusionner seulement l'élément actuel : Sélectionnez \"Lancer l'opération pour l'élément actuel\" ou appuyez sur F6."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1506
-#, 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 "Si à cause de conflits de type de fichiers certains éléments portant des opérations non valables existent, alors un boîte de dialogue apparaîtra et certains de ces éléments seront pointés, pour que vous puissiez sélectionner une opération valable"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1510
-#, fuzzy, no-c-format
-msgid "If you merge all items a dialog will appear giving you the options \"Do it\", \"Simulate it\" and \"Cancel\"."
-msgstr "Si vous fusionnez tous les éléments, une fenêtre apparaîtra vous proposant de \"Le faire\", \"Le simuler\" ou \"Annuler\"."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1515
-#, fuzzy, 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 "Sélectionnez \"Le simuler\" si vous voulez voir comment cela serait sans le faire réellement. Une liste de toutes les opérations sera affichée."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1517
-#, fuzzy, no-c-format
-msgid "Otherwise select \"Do it\" to really start merging."
-msgstr "Sinon sélectionnez \"Le faire\" pour démarrer réellement la fusion."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1519
-#, fuzzy, 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 "Alors KDiff3 lancera l'opération spécifiée pour tous les éléments. Si une interaction manuelle est nécessaire (fusion d'un seul fichier), alors une fenêtre de fusion s'ouvrira (<link linkend=\"dirmergebigscreenshot\">voir la grosse capture d'écran</link>)."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1523
-#, fuzzy, 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 "Quand vous en aurez terminé avec un fichier, sélectionnez de nouveau \"Démarrer/Continuer la fusion de dossiers\" ou utilisez la touche F7. SI vous n'avez pas encore enregistré les résultats, une fenêtre vous le proposera. Alors KDiff3 continuera avec l'élément suivant."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1527
-#, fuzzy, 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 "Quand KDIff3 rencontre une erreur, il vous en informe et affiche l'information détaillée de l'état. Au bas de cette liste, il y aura quelques messages d'erreur qui vous aideront à comprendre la cause du problème. Quand vous continuerez la fusion, KDiff3 vous proposera de réessayer ou de sauter l'élément qui à causé le problème. Cela signifie qu'avant de continuer vous pouvez choisir une autre opération ou résoudre le problèmes par d'autres moyens."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1534
-#, fuzzy, no-c-format
-msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
-msgstr "Quand la fusion est complète, alors KDiff3 vous informera via une boîte de dialogue."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1537
-#, fuzzy, 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 "Si certains éléments ont été fusionnés individuellement, KDiff3 s'en rappellera (tant que la session de fusion continue), et ne fusionne pas ces éléments de nouveau plus tard quand la fusion de tous les éléments est lancée. Même si la fusion a été sautée ou si rien n'a été enregistré ces éléments sont comptés comme complétés. La fusion ne sera refaite que si vous changez l'opération de fusion de l'élément."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1547
-#, no-c-format
-msgid "Options for Comparing and Merging Directories"
-msgstr "Options pour la comparaison et la fusion de dossiers"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1548
-#, fuzzy, no-c-format
-msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
-msgstr "Les options de Kdiff3 (menu \"Configuration\"/\"Configurer KDiff3...\") ont maintenant une section appelée \"Fusion de dossiers\" contenant ces options :"
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1554
-#, no-c-format
-msgid "Recursive Directories:"
-msgstr "Dossiers récursifs :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1554
-#, no-c-format
-msgid "Select whether to search directories recursively."
-msgstr "Sélectionner s'il faut rechercher les dossiers récursivement."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1556
-#, no-c-format
-msgid "File Pattern(s):"
-msgstr "Modèle(s) de fichier :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1556
-#, fuzzy, 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 "Seuls les fichiers qui correspondent à un modèle ici seront mis dans l'arborescence. Plus d'un modèle peut être spécifié en utilisant le point-virgule \";\" comme séparateur. Les jokers valables sont '*' et '?' (par exemple pour \"*.cpp;*.h\". L'option par défaut est \"*\". Les dossiers ne seront pas reconnus par ce modèle."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1560
-#, fuzzy, no-c-format
-msgid "File Anti-Pattern(s):"
-msgstr "Modèle(s) de fichier :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1560
-#, fuzzy, 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 "Les fichiers et dossiers correspondants à cette règle seront exclus de l'arborescence. Plus d'un modèle peut être spécifié ici en utilisant le point-virgule \";\" comme séparateur. Les jokers valides sont : '*' et '?'. Le modèle par défaut est \"*.orig;*.o\"."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1564
-#, fuzzy, no-c-format
-msgid "Directory Anti-Pattern(s):"
-msgstr "Anti-modèle(s) :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1564
-#, fuzzy, 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 "Les fichiers et dossiers correspondants à cette règle seront exclus de l'arborescence. Plus d'un modèle peut être spécifié ici en utilisant le point-virgule \";\" comme séparateur. Les jokers valides sont : '*' et '?'. Le modèle par défaut est \"*.orig;*.o\"."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1568
-#, no-c-format
-msgid "Use CVS-Ignore:"
-msgstr "Ignorer comme CVS :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1568
-#, fuzzy, 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 "Ignorer les fichiers et dossiers qui seraient aussi ignorés par CVS. Beaucoup de fichiers générés automatiquement sont ignorés par CVS. Le gros avantage est que cela peut être spécifique à un dossier via un fichier local \".cvsignore\". (Reportez-vous à <ulink url=\"info:/cvs/cvsignore\">info:/cvs/cvsignore</ulink>)."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1573
-#, no-c-format
-msgid "Find Hidden Files and Directories:"
-msgstr "Trouver les fichiers et dossiers cachés :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1573
-#, fuzzy, 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 "Sur certains systèmes de fichiers les fichiers ont un attribut \"Caché\". Sur d'autres un nom de fichier commençant par un point \".\" le cache. Cette option vous permet de décider s'il faut inclure ces fichiers dans l'arborescence ou non. Option activée par défaut."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1577
-#, no-c-format
-msgid "Follow File Links:"
-msgstr "Suivre les liens vers les fichiers :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1577
-#, 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 "Pour les liens vers les fichiers : Quand cette option est désactivée, alors les liens symboliques sont comparés. Quand elle est activée, alors ce sont les fichiers situé derrière les liens qui sont comparés. Désactivée par défaut."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1580
-#, no-c-format
-msgid "Follow Directory Links:"
-msgstr "Suivre les liens vers les dossiers :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1580
-#, fuzzy, 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 "Pour les liens vers les dossiers : Quand désactivé, alors les liens symboliques seront comparés. Quand activée alors le lien sera traité comme un dossier et sera scanné récursivement. (Notez que le programme ne vérifie pas si le lien est \"récursif\". Si par exemple un dossier contenait un lien vers lui-même, cela causerait une boucle infinie, et après quelque temps il y aurait dépassement de tampon ou toute la mémoire serait utilisée, crashant le programme."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1587
-#, no-c-format
-msgid "Case Sensitive Filename Comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1587
-#, no-c-format
-msgid "Default is false on Windows, true for other operating systems."
-msgstr ""
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1589
-#, no-c-format
-msgid "File Comparison Mode:"
-msgstr "Mode de comparaison des fichiers :"
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1591
-#, no-c-format
-msgid "Binary Comparison:"
-msgstr "Comparaison binaire"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1591
-#, no-c-format
-msgid "This is the default file comparison mode."
-msgstr "C'est le mode de comparaison de fichiers par défaut."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1594
-#, no-c-format
-msgid "Full Analysis:"
-msgstr "Analyse complète"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1594
-#, 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 "Faire une analyse complète de chaque fichier et afficher la colonne d'informations statistiques. (Nombre de conflits résolus, non résolus, d'espacement ou non). L'analyse complète est plus lente qu'une simple analyse binaire, et plus lente quand utilisée sur des fichiers ne contenant pas du texte. (Spécifiez les anti-modèles de fichiers appropriés)."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1601
-#, no-c-format
-msgid "Trust the modification date:"
-msgstr "Croire la date de modification :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1601
-#, 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 "Si vous comparez des gros dossiers sur un réseau lent, cela peut être plus rapide de ne comparer que les dates de modification et les longueurs des fichiers. Mais cette augmentation de vitesse comporte néanmoins un petit doute. Utilisez cette option avec précaution. Désactivée par défaut."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1605
-#, no-c-format
-msgid "Trust the size:"
-msgstr "Croire la taille :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1605
-#, 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 "Identique à croire la date de modification. Pas de réelle comparaison, les deux fichiers sont considérés comme égaux si leur tailles sont égales. C'est utile lorsqu'une opération de copie ne conserve pas la date de modification. Utilisez cette option avec précaution. Désactivé par défaut."
-
-# Tag: emphasis
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1612
-#, no-c-format
-msgid "Synchronize Directories:"
-msgstr "Synchroniser des dossiers :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1612
-#, 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 "Active le \"Mode synchroniser\" quand deux dossiers sont comparés et qu'il n'y a pas de dossier de destination explicitement spécifié. Dans ce mode les opérations proposées seront choisies pour que les deux dossier sources soient égaux après coup. Aussi le résultat de la fusion sera écrit dans les deux dossiers. Désactivé par défaut."
-
-#. Tag: emphasis
-#. +> trunk
-#: index.docbook:1617
-#, no-c-format
-msgid "Copy newer instead of merging:"
-msgstr "Copier le plus récent au lieu de fusionner :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1617
-#, fuzzy, 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 "Au lieu de fusionner l'opération proposée sera copier la source la plus récente si des changements ont eu lieu. (Considéré comme peu sur, car cela implique la connaissance que l'autre fichier n'a pas été édité. Vérifiez le pour vous assurez dans tous les cas). Désactivé par défaut."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1621
-#, fuzzy, 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 "Si un fichier ou un dossier complet est remplacé par un autre ou est supprimé alors la version originale sera renommée avec une extension \".orig\". Si un ancien fichier de sauvegarde portant l'extension \".orig\" existe toujours alors il sera supprimé sans sauvegarde. Cela affecte aussi la fusion de simples fichiers, pas seulement le mode de fusion de dossiers. Activé par défaut."
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1629
-#, no-c-format
-msgid "Other Functions in Directory Merge Window"
-msgstr ""
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1630
-#, no-c-format
-msgid "Split/Full Screen Mode"
-msgstr "Mode plein écran/écran partagé"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1631
-#, fuzzy, 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 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 "Habituellement la vue de la liste de fusion de dossiers reste visible quand un fichier simple est comparé ou fusionné. Avec la souris vous pouvez déplacer la barre de séparation qui sépare la liste de fichiers de la fenêtre de comparaison. Si vous ne voulez pas faire cela, vous pouvez désactiver \"Scinder la fenêtre\" Dans le menu \"Dossier\". vous pouvez aussi utiliser \"Basculer la vue\" dans le menu \"Dossier\" pour basculer entre la liste de fichiers et la fenêtre de comparaison qui occupait tout l'écran."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1640
-#, no-c-format
-msgid "Comparing or Merging a Single File"
-msgstr "Comparer ou Fusionner un simple fichier"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1641
-#, fuzzy, 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 "Probablement vous préférerez un simple double clic sur un fichier pour le comparer. Néanmoins il existe aussi une entrée dans le menu \"Dossier\". vous pouvez aussi fusionner directement un simple fichier, sans lancer la fusion de dossiers via \"Fusionner un simple fichier\" dans le menu \"Dossier\". A l'enregistrement des résultats l'état sera validé, et le fichier ne sera plus fusionné si une fusion de dossiers est démarrée."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1648
-#, fuzzy, no-c-format
-msgid "But note that this status information will be lost when you rerun a directory scan: \"Directory\"-menu: \"Rescan\""
-msgstr "Mais notez que l'information de l'état sera perdue lorsque vous relancerez un scan de dossier via : \"Dossier\"/\"Rescanner\""
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1653
-#, fuzzy, no-c-format
-msgid "Comparing or Merging Files with Different Names"
-msgstr "Comparer ou Fusionner un simple fichier"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1654
-#, 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
-#. +> trunk
-#: index.docbook:1657
-#, 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
-#. +> trunk
-#: index.docbook:1661
-#, no-c-format
-msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
-#. +> trunk
-#: index.docbook:1665
-#, 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
-#. Tag: title
-#. +> trunk
-#: index.docbook:1673
-#, no-c-format
-msgid "Miscellaneous Topics"
-msgstr "Sujets divers"
-
-#. Tag: title
-#. +> trunk
-#: index.docbook:1675
-#, fuzzy, no-c-format
-msgid "Networktransparency via KIO"
-msgstr "Transparence réseau via KIO."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1676
-#, no-c-format
-msgid "KIO-Slaves"
-msgstr "KIO-Slaves"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1677
-#, fuzzy, 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 "KDE supporte la transparence réseau via KIO. KDiff3 utilise cela pour lire les fichiers en entrée ou scanner les dossiers. Cela signifie que vous pouvez spécifier des fichiers et des dossiers locaux ou distants via des URL."
-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 "La première ligne compare un fichier local avec un fichier sur un serveur FTP. La seconde compare un dossier contenu dans une archive compressée a un dossier local."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1689
-#, no-c-format
-msgid "Other KIO-slaves that are interesting are:"
-msgstr "Les autres KIOslaves intéressants sont :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1693
-#, no-c-format
-msgid "Files from the WWW (http:),"
-msgstr "Fichiers depuis le WWW (http:),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1694
-#, no-c-format
-msgid "Files from the FTP (ftp:),"
-msgstr "Fichiers depuis un FTP (ftp:),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1695
-#, no-c-format
-msgid "Encrypted file transfer (fish:, sftp:),"
-msgstr "Transfert de fichier crypté (fish;, sftp;),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1696
-#, fuzzy, no-c-format
-msgid "Windows-resources (smb:),"
-msgstr "Ressources Windows (smb:),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1697
-#, no-c-format
-msgid "Local files (file:),"
-msgstr "Fichiers locaux (file:),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1699
-#, no-c-format
-msgid "Other things that are possible, but probably less useful are:"
-msgstr "D'autres choses sont possibles, mais probablement moins utiles sont :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1703
-#, no-c-format
-msgid "Man-pages (man:),"
-msgstr "Pages man (man:),"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1704
-#, no-c-format
-msgid "Info-pages (info:),"
-msgstr "Pages info (info:),"
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1708
-#, fuzzy, no-c-format
-msgid "How To Write URLs"
-msgstr "Comment écrire des URL"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1709
-#, fuzzy, no-c-format
-msgid "An URL has a different syntax compared with paths for local files and directories. Some things should be considered:"
-msgstr "Une URL a une syntaxe différence par rapport aux chemins pour les fichiers et dossiers locaux. Certains éléments doivent être considérés :"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1714
-#, fuzzy, no-c-format
-msgid "A path can be relative and can contain \".\" or \"..\". This is not possible for URLs which are always absolute."
-msgstr "Un chemin peut être relatif et contenir \".\" ou \"..\". Ce n'est pas possible pour les URL qui sont toujours absolues."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1717
-#, fuzzy, 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 "Les caractères spéciaux doivent être écrits avec des espaces (\"#\"->\"%23\", espace>\"%20\", etc). Par exemple un fichier nommé \"#foo#\" aura l'URL \"file:/%23foo%23\"."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1720
-#, fuzzy, no-c-format
-msgid "When URLs don't work as expected, try to open them in Konqueror first."
-msgstr "Quand les URL ne fonctionnent pas comme attendu, essayez de les ouvrir tout d'abord avec Konqueror."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1727
-#, no-c-format
-msgid "Capabilities of KIO-Slaves"
-msgstr "Possibilités des KIO-Slaves"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1728
-#, fuzzy, no-c-format
-msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
-msgstr "La transparence réseau à un inconvénient : Toutes les ressources n'ont les mêmes possibilités."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1730
-#, fuzzy, 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 "Parfois ceci est dû au système de fichiers du serveur, parfois au protocole. Voici une liste de restrictions :"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1735
-#, no-c-format
-msgid "Sometimes there is no support for links."
-msgstr "Parfois il n'y a pas de support des liens."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1737
-#, 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 "Ou il n'y a pas moyen de distinguer si un lien pointe vers un fichier ou un dossier ; on estime que c'est toujours un fichier.(ftp :, sftp :)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1740
-#, no-c-format
-msgid "Can't always determine the filesize."
-msgstr "Ne peut pas toujours déterminer la taille des fichiers."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1742
-#, no-c-format
-msgid "Limited support for permissions."
-msgstr "Support limité des permissions."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1744
-#, 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 "Il est impossible de modifier les permissions ou la date de dernière modification, les permissions ou la date de dernière modification d'une copie diffèrent donc de l'original. (Voir l'option \"Croire la taille\"). (Modifier les permissions ou la date de dernière modification n'est possible que pour les fichiers locaux)."
-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 "Des outils nommés \"KDiff\" et \"KDiff2\" (désormais appelé \"Kompare\") existent déjà. \"KDiff3\" suggère aussi qu'il peut fusionner comme l'outil \"diff3\" dans la collection des Outils Diff."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1795
-#, fuzzy, no-c-format
-msgid "Why did I release it under GPL?"
-msgstr "Pourquoi le logiciel est-il sous licence GPL ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1797
-#, fuzzy, 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 "J'utilise les programmes GPL depuis très longtemps désormais et j'ai appris beaucoup de choses en jetant un oeil aux sources. Voici mon \"Merci\" à tous les programmeurs qui ont aussi ou qui feront aussi de même."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1803
-#, no-c-format
-msgid "Some buttons and functions are missing. What's wrong?"
-msgstr "Certains boutons ou fonctions sont manquantes. Quel est le problème ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1805
-#, fuzzy, no-c-format
-msgid "You compiled from source but you probably didn't specify the correct KDE-prefix. By default &kdiff3; is installed in /usr/local but then KDE can't find the user-interface resource file (i.e. kdiff3ui.rc). The README-file contains more information about the correct prefix."
-msgstr "Vous avez compilé depuis la source mais vous n'avez probablement pas spécifier le bon préfixe de KDE lors de la configuration. Par défaut configure veut installer dans /usr/local mais dans ce cas KDE ne peut trouver le fichier de ressource de l'interface utilisateur (c.é.d. kdiff3ui.rc). Le fichier README contient plus d'informations à propos du préfixe correct."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1812
-#, no-c-format
-msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
-msgstr "Souvent les lignes similaires mais non identiques apparaissent côte à côte mais parfois pas. Pourquoi ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1815
-#, fuzzy, 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 "Les lignes ou seules les quantités d'espaces sont différentes sont traitées comme \"égales\", tandis qu'une différence d'un caractère seulement peut changer l'état des lignes en \"différentes\". Si des lignes similaires apparaissent côte à côte, c'est actuellement une coïncidence mais heureusement c'est souvent le cas."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1823
-#, no-c-format
-msgid "Why must all conflicts be solved before the merge result can be saved?"
-msgstr "Pourquoi tous les conflits doivent-ils être résolus avant que le résultat de la fusion puisse être enregistré ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1825
-#, 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 "Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de la fusion se souvient ou elle commence ou se termine. Cela est nécessaire pour que les conflits puissent être résolus manuellement en sélectionnant simplement le bouton de source (A, B ou C). Cette information sera perdue quand vous enregistrerez un texte et c'est trop compliqué de créer un format de fichier spécial supportant l'enregistrement et la restauration de toutes les informations nécessaires."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1834
-#, 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
-#. +> trunk
-#: index.docbook:1836
-#, no-c-format
-msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
-msgstr ""
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1840
-#, fuzzy, no-c-format
-msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
-msgstr "Pourquoi l'éditeur dans la fenêtre de résultat n'a pas de fonction \"annuler\" ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1842
-#, 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 "C'était très compliqué jusqu'à présent. Vous pouvez toujours restaurer une version depuis une source (A, B ou C) en cliquant sur le bouton respectif. Pour une édition importante, l'utilisation d'un autre éditeur comme Kwrite est recommandée."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1848
-#, fuzzy, no-c-format
-msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
-msgstr "Quand j'ai supprimé du texte, soudainement, \"<Pas de ligne de la source>\" est apparu et ne peut être supprimé. Qu'est-ce que cela signifie et comment supprimer cela ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1851
-#, fuzzy, no-c-format
-msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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 original 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 "Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de fusion se souvient, de son début et de sa fin. \"<Pas de ligne de la source>\" signifie qu'il n'y a plus rien dans une section, même plus de caractère de nouvelle ligne. Cela peut apparaître soit lors de la fusion automatique ou lors de l'édition. Ce n'est pas un problème, étant donné que cela n'apparaîtra pas dans le fichier enregistré. Si vous voulez que la source originale réapparaisse, sélectionnez juste la section (un clic sur la colonne de résumé de gauche) et cliquez alors le bouton de source avec le contenu nécessaire (A/B ou C)."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1862
-#, fuzzy, no-c-format
-msgid "Why doesn't &kdiff3; support syntax-highlighting?"
-msgstr "Pourquoi KDiff3 ne supporte-t-il pas le surlignement des syntaxes ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1864
-#, fuzzy, no-c-format
-msgid "&kdiff3; already uses many colors for difference highlighting. More highlighting would be confusing. Use another editor for this."
-msgstr "KDiff3 utilise déjà beaucoup de couleurs pour le surlignement des différences. Plus de surlignement amènerait de la confusion. Utilisez un autre éditeur pour cela."
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1869
-#, no-c-format
-msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1871
-#, 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
-#. +> trunk
-#: index.docbook:1874
-#, 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
-#. +> trunk
-#: index.docbook:1880
-#, 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
-#. +> trunk
-#: index.docbook:1884
-#, 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 clipboard 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
-#. +> trunk
-#: index.docbook:1892
-#, no-c-format
-msgid "Where has the directory option \"List only deltas\" gone?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1894
-#, 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
-#. +> trunk
-#: index.docbook:1899
-#, no-c-format
-msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1902
-#, 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
-#. Tag: para
-#. +> trunk
-#: index.docbook:1908
-#, no-c-format
-msgid "There is so much information here, but your question is still not answered?"
-msgstr "Il y a beaucoup d'informations ici, mais votre question ne trouve toujours pas de réponse ?"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1910
-#, no-c-format
-msgid "Please send me your question. I appreciate every comment."
-msgstr "Veuillez m'envoyer vos questions. J'apprécie chaque commentaire."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1919
-#, no-c-format
-msgid "Credits and License"
-msgstr "Remerciements et licence"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1921
-#, no-c-format
-msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
-msgstr "&kdiff3; - Outil de Comparaison et de Fusion de Fichiers et Dossier"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1924
-#, fuzzy, no-c-format
-msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
-msgstr "Programme protégé par copyright 2002-2005 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1927
-#, no-c-format
-msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
-msgstr "Beaucoup de bonnes idées et de rapports de bogue viennent de collègues et de beaucoup d'inconnus du Web. Merci !"
-msgstr "<para>Traduction française par Simon Depiets <email>2df@tuxfamily.org</email>.</para>"
-
-# Tag: chapter
-#. Tag: chapter
-#. +> trunk
-#: index.docbook:1935
-#, no-c-format
-msgid "&underFDL; &underGPL;"
-msgstr "&underFDL; &underGPL;"
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1945
-#, no-c-format
-msgid "Installation"
-msgstr "Installation"
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1948
-#, no-c-format
-msgid "How to obtain &kdiff3;"
-msgstr "Comment obtenir &kdiff3;"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1950
-#, fuzzy, 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 "Vous pouvez télécharger la dernière version de KDiff3 depuis sa page web <ulink url=\"http://kdiff3.sourceforge.net\">http://kdiff3.sourceforge.net</ulink>."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1952
-#, fuzzy, no-c-format
-msgid "&kdiff3; is also available for other platforms. See the homepage for details."
-msgstr "KDiff3 est aussi disponibles sur d'autres plates-formes. Veuillez vous reporter à la page web pour plus de détails."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1960
-#, no-c-format
-msgid "Requirements"
-msgstr "Configuration minimale"
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1962
-#, fuzzy, no-c-format
-msgid "In order to successfully use all features of &kdiff3;, you need &kde; > 4.4."
-msgstr "Pour utiliser avec succès toutes les fonctionnalités de &kdiff3;, vous aurez besoin de &kde; >3.1."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1964
-#, fuzzy, 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 "Pour plus d'informations sur le lancement de KDiff3 sur d'autres plates-formes sans KDE, veuillez vous reportez à la <ulink url=\"http://kdiff3.sourceforge.net\">page web</ulink>."
-
-# Tag: para
-#. Tag: para
-#. +> trunk
-#: index.docbook:1967
-#, fuzzy, 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 "Vous pouvez trouver une liste des changements sur<ulink url=\"http://kdiff3.sourceforge.net/ChangeLog\">http://kdiff3.sourceforge.net/ChangeLog</ulink> ou dans le fichier \"ChangeLog\" de la source."
-
-# Tag: title
-#. Tag: title
-#. +> trunk
-#: index.docbook:1975
-#, no-c-format
-msgid "Compilation and Installation"
-msgstr "Compilation et Installation"
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1977
-#, no-c-format
-msgid "Information how to compile and install &kdiff3; on a system with &kde; you find in the README file in the base directory of the &kdiff3; distribution"
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1980
-#, no-c-format
-msgid "Since &kdiff3; uses <command>cmake</command> you should have no trouble compiling it. Should you run into problems please report them to the &kde; mailing lists."
-msgstr ""
-
-#. Tag: para
-#. +> trunk
-#: index.docbook:1984
-#, no-c-format
-msgid "If you don't use KDE follow the instructions for Qt-only systems in the README file."
+msgstr "Impossible de trouver les fichiers pour la comparaison."
+
+#. i18n: ectx: Menu (movement)
+#. +> trunk5
+#: kdiff3_part.rc:4
+#, kde-format
+msgid "&KDiff3"
+msgstr "&KDiff3"
+
+#. i18n: ectx: Menu (movement)
+#. +> trunk5
+#: kdiff3_part.rc:13
+#, kde-format
+msgid "Configure KDiff3"
+msgstr "Configurer KDiff3"
+
+#. i18n: ectx: ToolBar (mainToolBar)
+#. +> trunk5
+#: kdiff3_part.rc:16 main.cpp:83
+#, kde-format
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#. +> trunk5
+#: kdiff3_shell.cpp:74
+#, kde-format
+msgid ""
+"Could not initialize the KDiff3 part.\n"
+"This usually happens due to an installation problem. Please read the README-file in the source package for details."
+msgstr ""
+"Impossible d'initialiser le composant KDiff.\n"
+"Cet incident arrive d'ordinaire à cause d'un problème d'installation. Veuillez consulter le fichier README dans le paquetage source pour plus de détails."
+
+#. i18n: ectx: Menu (file)
+#. +> trunk5
+#: kdiff3_shell.rc:4
+#, kde-format
+msgid "&File"
+msgstr "&Fichier"
+
+#. i18n: ectx: Menu (directory)
+#. +> trunk5
+#: kdiff3_shell.rc:7
+#, kde-format
+msgid "&Directory"
+msgstr "&Dossier"
+
+#. i18n: ectx: Menu (dir_current_merge_menu)
+#. +> trunk5
+#: kdiff3_shell.rc:30
+#, kde-format
+msgid "Current Item Merge Operation"
+msgstr "Opération de fusion de l'élément actuel"
+
+#. i18n: ectx: Menu (dir_current_sync_menu)
+#. +> trunk5
+#: kdiff3_shell.rc:38
+#, kde-format
+msgid "Current Item Sync Operation"
+msgstr "Opération de synchronisation de l'élément actuel"
+
+#. i18n: ectx: Menu (movement)
+#. +> trunk5
+#: kdiff3_shell.rc:50
+#, kde-format
+msgid "M&ovement"
+msgstr "D&éplacement"
+
+#. i18n: ectx: Menu (diff)
+#. +> trunk5
+#: kdiff3_shell.rc:61
+#, kde-format
+msgid "D&iffview"
+msgstr "D&ifférences"
+
+#. i18n: ectx: Menu (merge)
+#. +> trunk5
+#: kdiff3_shell.rc:73
+#, kde-format
+msgid "M&erge"
+msgstr "F&usion"
+
+#. i18n: ectx: Menu (window)
+#. +> trunk5
+#: kdiff3_shell.rc:95
+#, kde-format
+msgid "&Window"
+msgstr "&Fenêtre"
+
+#. i18n: ectx: ToolBar (mainToolBar)
+#. +> trunk5
+#: kdiff3_shell.rc:106
+#, kde-format
+msgid "Main Toolbar"
+msgstr "Barre principale"
+
+#. +> trunk5
+#: main.cpp:63 main.cpp:67
+#, kde-format
+msgid "Ignored. (User defined.)"
+msgstr "Ignoré. (Défini par l'utilisateur)"
+
+#. +> trunk5
+#: main.cpp:87
+#, kde-format
+msgid " (64 bit)"
+msgstr "(64 bits)"
+
+#. +> trunk5
+#: main.cpp:89
+#, kde-format
+msgid " (32 bit)"
+msgstr "(32 bits)"
+
+#. +> trunk5
+#: main.cpp:90
+#, kde-format
+msgid "Tool for Comparison and Merge of Files and Directories"
+msgstr "Outil de comparaison et de fusion de fichiers et de dossiers"
+
+#. +> trunk5
+#: main.cpp:91
+#, kde-format
+msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port"
+msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves Portage vers KF5/Qt5"
+
+#. +> trunk5
+#: main.cpp:110
+#, kde-format
+msgid "Merge the input."
+msgstr "Fusionner les entrées."
+
+#. +> trunk5
+#: main.cpp:111
+#, kde-format
+msgid "Explicit base file. For compatibility with certain tools."
+msgstr "Fichier de base explicite. Pour la compatibilité avec certains outils."
+msgid "Cut off after specified number. Use -1 for infinite number of entries."
+msgstr "Couper après le nombre spécifié. Utiliser -1 pour un nombre illimité d'éléments."
+
+#. +> trunk5
+#: optiondialog.cpp:1084
+#, kde-format
+msgid "Test your regular expressions"
+msgstr "Testez vos expressions rationnelles"
+
+#. +> trunk5
+#: optiondialog.cpp:1089
+#, kde-format
+msgid "Irrelevant merge command:"
+msgstr "Commande de fusion non pertinente :"
+
+#. +> trunk5
+#: optiondialog.cpp:1094
+#, kde-format
+msgid ""
+"If specified this script is run after automerge\n"
+"when no other relevant changes were detected.\n"
+"Called with the parameters: filename1 filename2 filename3"
+msgstr ""
+"Si indiquée, ce script est lancé après une fusion automatique\n"
+"quand aucun autre changement pertinent n'a été détecté.\n"
+"Appelée avec les paramètres : nomfichier1 nomfichier2 nomfichier3"
+
+#. +> trunk5
+#: optiondialog.cpp:1099
+#, kde-format
+msgid "Auto save and quit on merge without conflicts"
+msgstr "Enregistrer automatiquement et quitter en cas de fusion sans conflits"
+
+#. +> trunk5
+#: optiondialog.cpp:1103
+#, kde-format
+msgid ""
+"If KDiff3 was started for a file-merge from the command line and all\n"
+"conflicts are solvable without user interaction then automatically save and quit.\n"
+"(Similar to command line option \"--auto\".)"
+msgstr ""
+"Lorsque KDiff3 a été lancé depuis la ligne de commande pour effectuer une fusion de fichiers et\n"
+"que tous les conflits peuvent être résolus sans interaction de l'utilisateur, alors cette commande enregistre automatiquement et ferme l'application.\n"
+"(Similaire à l'option en ligne de commande « --auto »)"
+
+#. +> trunk5
+#: optiondialog.cpp:1114 optiondialog.cpp:1115
+#, kde-format
+msgid "Directory"
+msgstr "Dossier"
+
+#. +> trunk5
+#: optiondialog.cpp:1127
+#, kde-format
+msgid "Recursive directories"
+msgstr "Dossiers récursifs"
+
+#. +> trunk5
+#: optiondialog.cpp:1130
+#, kde-format
+msgid "Whether to analyze subdirectories or not."
+msgstr "Si vous voulez ou non analyser les sous-dossiers."
+
+#. +> trunk5
+#: optiondialog.cpp:1132
+#, kde-format
+msgid "File pattern(s):"
+msgstr "Motif(s) de fichiers :"
+
+#. +> trunk5
+#: optiondialog.cpp:1138
+#, kde-format
+msgid ""
+"Pattern(s) of files to be analyzed. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Motif(s) de fichiers à analyser. \n"
+"Jokers : « * » et « ? » \n"
+"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
+
+#. +> trunk5
+#: optiondialog.cpp:1143
+#, kde-format
+msgid "File-anti-pattern(s):"
+msgstr "Motif(s) de fichiers refusé(s) :"
+
+#. +> trunk5
+#: optiondialog.cpp:1149
+#, kde-format
+msgid ""
+"Pattern(s) of files to be excluded from analysis. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Motif(s) de fichiers à exclure de l'analyse.\n"
+"Jokers : « * » et « ? »\n"
+"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
+
+#. +> trunk5
+#: optiondialog.cpp:1154
+#, kde-format
+msgid "Dir-anti-pattern(s):"
+msgstr "Motif(s) de dossiers exclu(s) :"
+
+#. +> trunk5
+#: optiondialog.cpp:1160
+#, kde-format
+msgid ""
+"Pattern(s) of directories to be excluded from analysis. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Motif(s) des dossiers à exclure de l'analyse. \n"
+"Jokers : « * » et « ? »\n"
+"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
+
+#. +> trunk5
+#: optiondialog.cpp:1165
+#, kde-format
+msgid "Use .cvsignore"
+msgstr "Utiliser .cvsignore"
+
+#. +> trunk5
+#: optiondialog.cpp:1169
+#, kde-format
+msgid ""
+"Extends the antipattern to anything that would be ignored by CVS.\n"
+"Via local \".cvsignore\" files this can be directory specific."
+msgstr ""
+"Étend l'exclusion de motif(s) à tout ce qui serait ignoré par CVS.\n"
+"Via les fichiers « .cvsignore » locaux, ce peut être spécifique à un dossier."
+
+#. +> trunk5
+#: optiondialog.cpp:1173
+#, kde-format
+msgid "Find hidden files and directories"
+msgstr "Chercher les fichiers et les dossiers cachés"
+
+#. +> trunk5
+#: optiondialog.cpp:1176
+#, fuzzy, kde-format
+#| msgid "Find hidden files and directories"
+msgid "Finds hidden files and directories."
+msgstr "Chercher les fichiers et les dossiers cachés"
+
+#. +> trunk5
+#: optiondialog.cpp:1179
+#, kde-format
+msgid "Follow file links"
+msgstr "Suivre les liens vers des fichiers"
+
+#. +> trunk5
+#: optiondialog.cpp:1183
+#, kde-format
+msgid ""
+"On: Compare the file the link points to.\n"
+"Off: Compare the links."
+msgstr ""
+"Activé : compare le fichier sur lequel pointe le lien.\n"
+"Désactivé : compare les liens."
+
+#. +> trunk5
+#: optiondialog.cpp:1187
+#, kde-format
+msgid "Follow directory links"
+msgstr "Suivre les liens vers un dossier"
+
+#. +> trunk5
+#: optiondialog.cpp:1191
+#, kde-format
+msgid ""
+"On: Compare the directory the link points to.\n"
+"Off: Compare the links."
+msgstr ""
+"Activé : compare le dossier sur lequel pointe le lien.\n"
+"Désactivé : compare les liens."
+
+#. +> trunk5
+#: optiondialog.cpp:1200
+#, kde-format
+msgid "Case sensitive filename comparison"
+msgstr "Tenir compte de la casse lors de la comparaison des noms de fichiers"
+
+#. +> trunk5
+#: optiondialog.cpp:1204
+#, kde-format
+msgid ""
+"The directory comparison will compare files or directories when their names match.\n"
+"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
+msgstr ""
+"La comparaison de dossiers compare les fichiers ou les dossiers lorsque leurs noms correspondent.\n"
+"Réglez cette option si la casse des noms doit correspondre. (Désactivée par défaut pour Windows, sinon Activée)"
+
+#. +> trunk5
+#: optiondialog.cpp:1208
+#, kde-format
+msgid "Unfold all subdirectories on load"
+msgstr "Déplier tous les sous-dossiers au chargement"
+
+#. +> trunk5
+#: optiondialog.cpp:1212
+#, kde-format
+msgid ""
+"On: Unfold all subdirectories when starting a directory diff.\n"
+"Off: Leave subdirectories folded."
+msgstr ""
+"Activé : déplier tous les sous-dossiers lors d'une comparaison de dossiers.\n"
+"Désactivé : conserver les sous-dossiers repliés."
+
+#. +> trunk5
+#: optiondialog.cpp:1216
+#, kde-format
+msgid "Skip directory status report"
+msgstr "Sauter le rapport d'état du dossier"
+
+#. +> trunk5
+#: optiondialog.cpp:1220
+#, kde-format
+msgid ""
+"On: Do not show the Directory Comparison Status.\n"
+"Off: Show the status dialog on start."
+msgstr ""
+"Activé : ne pas afficher l'État de la comparaison des dossiers.\n"
+"Désactivé : afficher la boîte de dialogue d'état au démarrage."
+
+#. +> trunk5
+#: optiondialog.cpp:1224
+#, kde-format
+msgid "File Comparison Mode"
+msgstr "Mode de comparaison de fichiers"
+
+#. +> trunk5
+#: optiondialog.cpp:1229
+#, kde-format
+msgid "Binary comparison"
+msgstr "Comparaison binaire"
+
+#. +> trunk5
+#: optiondialog.cpp:1231
+#, kde-format
+msgid "Binary comparison of each file. (Default)"
+msgstr "Comparaison binaire de chaque fichier. (Par défaut)"
+
+#. +> trunk5
+#: optiondialog.cpp:1234
+#, kde-format
+msgid "Full analysis"
+msgstr "Analyse complète"
+
+#. +> trunk5
+#: optiondialog.cpp:1236
+#, kde-format
+msgid ""
+"Do a full analysis and show statistics information in extra columns.\n"
+"(Slower than a binary comparison, much slower for binary files.)"
+msgstr ""
+"Effectue une analyse complète et affiche les informations statistiques dans des colonnes supplémentaires.\n"
+"(Plus lente qu'une comparaison binaire, beaucoup plus pour les fichiers binaires)"
+
+#. +> trunk5
+#: optiondialog.cpp:1240
+#, kde-format
+msgid "Trust the size and modification date (unsafe)"
+msgstr "Se fier à la taille et à la date de modification (peu sûr)"
+
+#. +> trunk5
+#: optiondialog.cpp:1242
+#, kde-format
+msgid ""
+"Assume that files are equal if the modification date and file length are equal.\n"
+"Files with equal contents but different modification dates will appear as different.\n"
+"Useful for big directories or slow networks."
+msgstr ""
+"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n"
+"Les fichiers ayant un contenu identique mais des dates de modification distinctes apparaîtront comme étant différents.\n"
+"Utile pour les dossiers volumineux ou les réseaux lents."
+
+#. +> trunk5
+#: optiondialog.cpp:1247
+#, kde-format
+msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)"
+msgstr "Se fier à la tailler et à la date, mais utiliser la comparaison binaire si la date ne correspond pas (peu sûr)"
+
+#. +> trunk5
+#: optiondialog.cpp:1249
+#, kde-format
+msgid ""
+"Assume that files are equal if the modification date and file length are equal.\n"
+"If the dates are not equal but the sizes are, use binary comparison.\n"
+"Useful for big directories or slow networks."
+msgstr ""
+"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n"
+"Si la date n'est pas identique mais que les tailles le sont, utilise la comparaison binaire.\n"
+"Utile pour les dossiers volumineux ou les réseaux lents."
+
+#. +> trunk5
+#: optiondialog.cpp:1254
+#, kde-format
+msgid "Trust the size (unsafe)"
+msgstr "Se fier à la taille (peu sûr)"
+
+#. +> trunk5
+#: optiondialog.cpp:1256
+#, kde-format
+msgid ""
+"Assume that files are equal if their file lengths are equal.\n"
+"Useful for big directories or slow networks when the date is modified during download."
+msgstr ""
+"Suppose que tous les fichiers sont identiques si leurs longueurs sont égales.\n"
+"Utile pour les dossiers volumineux ou les réseaux lents, quand la taille est modifiée durant le téléchargement."
+
+#. +> trunk5
+#: optiondialog.cpp:1263
+#, kde-format
+msgid "Synchronize directories"
+msgstr "Synchroniser les dossiers"
+
+#. +> trunk5
+#: optiondialog.cpp:1267
+#, kde-format
+msgid ""
+"Offers to store files in both directories so that\n"
+"both directories are the same afterwards.\n"
+"Works only when comparing two directories without specifying a destination."
+msgstr ""
+"Propose d'enregistrer les fichiers dans les deux dossiers pour que les deux dossiers soient identiques ensuite.\n"
+"Fonctionne seulement quand la comparaison de deux dossiers ne spécifie pas de destination."
+
+#. +> trunk5
+#: optiondialog.cpp:1273
+#, kde-format
+msgid "White space differences considered equal"
+msgstr "Différences d'espaces considérées comme égales"
+
+#. +> trunk5
+#: optiondialog.cpp:1277
+#, kde-format
+msgid ""
+"If files differ only by white space consider them equal.\n"
+"This is only active when full analysis is chosen."
+msgstr ""
+"Si les fichiers ne diffèrent que par des espaces, ils sont considérés comme identiques.\n"
+"Cette fonction n'est active que si vous choisissez l'analyse complète."
+
+#. +> trunk5
+#: optiondialog.cpp:1283
+#, kde-format
+msgid "Copy newer instead of merging (unsafe)"
+msgstr "Copier le plus récent au lieu de fusionner (peu sûr)"
+
+#. +> trunk5
+#: optiondialog.cpp:1287
+#, kde-format
+msgid ""
+"Do not look inside, just take the newer file.\n"
+"(Use this only if you know what you are doing!)\n"
+"Only effective when comparing two directories."
+msgstr ""
+"N'ouvre pas le fichier, se contente de prendre le plus récent.\n"
+"(À n'utilisez que si vous savez ce que vous faites !)\n"
+"Option effective seulement lors de la comparaison de dossiers."
+
+#. +> trunk5
+#: optiondialog.cpp:1292
+#, kde-format
+msgid "Backup files (.orig)"
+msgstr "Sauvegarder les fichiers (.orig)"
+
+#. +> trunk5
+#: optiondialog.cpp:1296
+#, kde-format
+msgid ""
+"If a file would be saved over an old file, then the old file\n"
+"will be renamed with a '.orig' extension instead of being deleted."
+msgstr ""
+"Quand il s'agira d'enregistrer un fichier sur un fichier plus ancien, alors l'ancien\n"
+"sera renommé avec une extension « .orig » au lieu d'être supprimé."
+
+#. +> trunk5
+#: optiondialog.cpp:1372 optiondialog.cpp:1373
+#, kde-format
+msgid "Regional Settings"
+msgstr "Paramètres régionaux"
+
+#. +> trunk5
+#: optiondialog.cpp:1387
+#, kde-format
+msgid "Use the same encoding for everything:"
+msgstr "Utiliser le même encodage pour tout :"
+
+#. +> trunk5
+#: optiondialog.cpp:1391
+#, kde-format
+msgid ""
+"Enable this allows to change all encodings by changing the first only.\n"
+"Disable this if different individual settings are needed."
+msgstr ""
+"Cocher cette option permet de changer tous les encodages en ne modifiant que le premier.\n"
+"Décochez-la si des paramètres individuels différents sont nécessaires."
+
+#. +> trunk5
+#: optiondialog.cpp:1395
+#, kde-format
+msgid "Note: Local Encoding is \"%1\""
+msgstr "Remarque : l'encodage local est « %1 »"
+
+#. +> trunk5
+#: optiondialog.cpp:1399
+#, kde-format
+msgid "File Encoding for A:"
+msgstr "Encodage du fichier pour A :"
+
+#. +> trunk5
+#: optiondialog.cpp:1406
+#, kde-format
+msgid ""
+"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
+"If the file is not Unicode then the selected encoding will be used as fallback.\n"
+"(Unicode detection depends on the first bytes of a file.)"
+msgstr ""
+"Si cette option est cochée, alors l'encodage Unicode (UTF-16 ou UTF-8) sera détecté.\n"
+"Si le fichier n'est pas en Unicode, alors l'encodage sélectionné sera utilisé comme solution de repli\n"
+"(la détection de l'Unicode repose sur les premiers octets d'un fichier)."
+"Module externe d'actions sur des éléments de fichiers pour KDiff3. Copyright (C) 2011 Joachim Eibl\n"
+"Page d'accueil de KDiff3 : http://kdiff3.sourceforge.net\n"
+"\n"
+
+#. +> trunk5
+#: kdiff3fileitemaction.cpp:289
+#, kde-format
+msgid ""
+"Using the context menu extension:\n"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
+"Utilisation de l'extension du menu contextuel :\n"
+"Pour une comparaison simple de deux fichiers sélectionnés, choisissez « Comparer ».\n"
+"Si l'autre fichier se trouve dans un autre endroit quelconque, « enregistrez » le premier fichier pour plus tard. Il apparaîtra dans le sous-menu « Comparer avec... ». Puis utilisez « Comparer avec » sur le second fichier.\n"
+"Pour une fusion de 3 fichiers, « enregistrez » d'abord le fichier base, puis la branche à fusionner et choisissez « Fusion de trois versions de fichiers avec la base » sur l'autre branche, qui sera utilisée comme destination.\n"
+"Le même principe s'applique à la comparaison et à la fusion de dossiers."
+
+#. +> trunk5
+#: kdiff3fileitemaction.cpp:297
+#, kde-format
+msgid "About KDiff3 File Item Action Plugin"
+msgstr "À propos du module externe d'actions sur des éléments de fichiers pour KDiff3"
Property changes on: trunk/l10n-support/fr/summit/messages/extragear-utils/kdiff3fileitemactionplugin.po
-msgstr "Impossible de trouver les fichiers pour la comparaison."
-
-#. i18n: ectx: Menu (movement)
-#. +> trunk5
-#: kdiff3_part.rc:4
-#, kde-format
-msgid "&KDiff3"
-msgstr "&KDiff3"
-
-#. i18n: ectx: Menu (movement)
-#. +> trunk5
-#: kdiff3_part.rc:13
-#, kde-format
-msgid "Configure KDiff3"
-msgstr "Configurer KDiff3"
-
-#. i18n: ectx: ToolBar (mainToolBar)
-#. +> trunk5
-#: kdiff3_part.rc:16 main.cpp:83
-#, kde-format
-msgid "KDiff3"
-msgstr "KDiff3"
-
-#. +> trunk5
-#: kdiff3_shell.cpp:74
-#, kde-format
-msgid ""
-"Could not initialize the KDiff3 part.\n"
-"This usually happens due to an installation problem. Please read the README-file in the source package for details."
-msgstr ""
-"Impossible d'initialiser le composant KDiff.\n"
-"Cet incident arrive d'ordinaire à cause d'un problème d'installation. Veuillez consulter le fichier README dans le paquetage source pour plus de détails."
-
-#. i18n: ectx: Menu (file)
-#. +> trunk5
-#: kdiff3_shell.rc:4
-#, kde-format
-msgid "&File"
-msgstr "&Fichier"
-
-#. i18n: ectx: Menu (directory)
-#. +> trunk5
-#: kdiff3_shell.rc:7
-#, kde-format
-msgid "&Directory"
-msgstr "&Dossier"
-
-#. i18n: ectx: Menu (dir_current_merge_menu)
-#. +> trunk5
-#: kdiff3_shell.rc:30
-#, kde-format
-msgid "Current Item Merge Operation"
-msgstr "Opération de fusion de l'élément actuel"
-
-#. i18n: ectx: Menu (dir_current_sync_menu)
-#. +> trunk5
-#: kdiff3_shell.rc:38
-#, kde-format
-msgid "Current Item Sync Operation"
-msgstr "Opération de synchronisation de l'élément actuel"
-
-#. i18n: ectx: Menu (movement)
-#. +> trunk5
-#: kdiff3_shell.rc:50
-#, kde-format
-msgid "M&ovement"
-msgstr "D&éplacement"
-
-#. i18n: ectx: Menu (diff)
-#. +> trunk5
-#: kdiff3_shell.rc:61
-#, kde-format
-msgid "D&iffview"
-msgstr "D&ifférences"
-
-#. i18n: ectx: Menu (merge)
-#. +> trunk5
-#: kdiff3_shell.rc:73
-#, kde-format
-msgid "M&erge"
-msgstr "F&usion"
-
-#. i18n: ectx: Menu (window)
-#. +> trunk5
-#: kdiff3_shell.rc:95
-#, kde-format
-msgid "&Window"
-msgstr "&Fenêtre"
-
-#. i18n: ectx: ToolBar (mainToolBar)
-#. +> trunk5
-#: kdiff3_shell.rc:106
-#, kde-format
-msgid "Main Toolbar"
-msgstr "Barre principale"
-
-#. +> trunk5
-#: main.cpp:63 main.cpp:67
-#, kde-format
-msgid "Ignored. (User defined.)"
-msgstr "Ignoré. (Défini par l'utilisateur)"
-
-#. +> trunk5
-#: main.cpp:87
-#, kde-format
-msgid " (64 bit)"
-msgstr "(64 bits)"
-
-#. +> trunk5
-#: main.cpp:89
-#, kde-format
-msgid " (32 bit)"
-msgstr "(32 bits)"
-
-#. +> trunk5
-#: main.cpp:90
-#, kde-format
-msgid "Tool for Comparison and Merge of Files and Directories"
-msgstr "Outil de comparaison et de fusion de fichiers et de dossiers"
-
-#. +> trunk5
-#: main.cpp:91
-#, kde-format
-msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port"
-msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves Portage vers KF5/Qt5"
-
-#. +> trunk5
-#: main.cpp:110
-#, kde-format
-msgid "Merge the input."
-msgstr "Fusionner les entrées."
-
-#. +> trunk5
-#: main.cpp:111
-#, kde-format
-msgid "Explicit base file. For compatibility with certain tools."
-msgstr "Fichier de base explicite. Pour la compatibilité avec certains outils."
-msgid "Cut off after specified number. Use -1 for infinite number of entries."
-msgstr "Couper après le nombre spécifié. Utiliser -1 pour un nombre illimité d'éléments."
-
-#. +> trunk5
-#: optiondialog.cpp:1084
-#, kde-format
-msgid "Test your regular expressions"
-msgstr "Testez vos expressions rationnelles"
-
-#. +> trunk5
-#: optiondialog.cpp:1089
-#, kde-format
-msgid "Irrelevant merge command:"
-msgstr "Commande de fusion non pertinente :"
-
-#. +> trunk5
-#: optiondialog.cpp:1094
-#, kde-format
-msgid ""
-"If specified this script is run after automerge\n"
-"when no other relevant changes were detected.\n"
-"Called with the parameters: filename1 filename2 filename3"
-msgstr ""
-"Si indiquée, ce script est lancé après une fusion automatique\n"
-"quand aucun autre changement pertinent n'a été détecté.\n"
-"Appelée avec les paramètres : nomfichier1 nomfichier2 nomfichier3"
-
-#. +> trunk5
-#: optiondialog.cpp:1099
-#, kde-format
-msgid "Auto save and quit on merge without conflicts"
-msgstr "Enregistrer automatiquement et quitter en cas de fusion sans conflits"
-
-#. +> trunk5
-#: optiondialog.cpp:1103
-#, kde-format
-msgid ""
-"If KDiff3 was started for a file-merge from the command line and all\n"
-"conflicts are solvable without user interaction then automatically save and quit.\n"
-"(Similar to command line option \"--auto\".)"
-msgstr ""
-"Lorsque KDiff3 a été lancé depuis la ligne de commande pour effectuer une fusion de fichiers et\n"
-"que tous les conflits peuvent être résolus sans interaction de l'utilisateur, alors cette commande enregistre automatiquement et ferme l'application.\n"
-"(Similaire à l'option en ligne de commande « --auto »)"
-
-#. +> trunk5
-#: optiondialog.cpp:1114 optiondialog.cpp:1115
-#, kde-format
-msgid "Directory"
-msgstr "Dossier"
-
-#. +> trunk5
-#: optiondialog.cpp:1127
-#, kde-format
-msgid "Recursive directories"
-msgstr "Dossiers récursifs"
-
-#. +> trunk5
-#: optiondialog.cpp:1130
-#, kde-format
-msgid "Whether to analyze subdirectories or not."
-msgstr "Si vous voulez ou non analyser les sous-dossiers."
-
-#. +> trunk5
-#: optiondialog.cpp:1132
-#, kde-format
-msgid "File pattern(s):"
-msgstr "Motif(s) de fichiers :"
-
-#. +> trunk5
-#: optiondialog.cpp:1138
-#, kde-format
-msgid ""
-"Pattern(s) of files to be analyzed. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Motif(s) de fichiers à analyser. \n"
-"Jokers : « * » et « ? » \n"
-"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
-
-#. +> trunk5
-#: optiondialog.cpp:1143
-#, kde-format
-msgid "File-anti-pattern(s):"
-msgstr "Motif(s) de fichiers refusé(s) :"
-
-#. +> trunk5
-#: optiondialog.cpp:1149
-#, kde-format
-msgid ""
-"Pattern(s) of files to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Motif(s) de fichiers à exclure de l'analyse.\n"
-"Jokers : « * » et « ? »\n"
-"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
-
-#. +> trunk5
-#: optiondialog.cpp:1154
-#, kde-format
-msgid "Dir-anti-pattern(s):"
-msgstr "Motif(s) de dossiers exclu(s) :"
-
-#. +> trunk5
-#: optiondialog.cpp:1160
-#, kde-format
-msgid ""
-"Pattern(s) of directories to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Motif(s) des dossiers à exclure de l'analyse. \n"
-"Jokers : « * » et « ? »\n"
-"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »"
-
-#. +> trunk5
-#: optiondialog.cpp:1165
-#, kde-format
-msgid "Use .cvsignore"
-msgstr "Utiliser .cvsignore"
-
-#. +> trunk5
-#: optiondialog.cpp:1169
-#, kde-format
-msgid ""
-"Extends the antipattern to anything that would be ignored by CVS.\n"
-"Via local \".cvsignore\" files this can be directory specific."
-msgstr ""
-"Étend l'exclusion de motif(s) à tout ce qui serait ignoré par CVS.\n"
-"Via les fichiers « .cvsignore » locaux, ce peut être spécifique à un dossier."
-
-#. +> trunk5
-#: optiondialog.cpp:1173
-#, kde-format
-msgid "Find hidden files and directories"
-msgstr "Chercher les fichiers et les dossiers cachés"
-
-#. +> trunk5
-#: optiondialog.cpp:1176
-#, fuzzy, kde-format
-#| msgid "Find hidden files and directories"
-msgid "Finds hidden files and directories."
-msgstr "Chercher les fichiers et les dossiers cachés"
-
-#. +> trunk5
-#: optiondialog.cpp:1179
-#, kde-format
-msgid "Follow file links"
-msgstr "Suivre les liens vers des fichiers"
-
-#. +> trunk5
-#: optiondialog.cpp:1183
-#, kde-format
-msgid ""
-"On: Compare the file the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"Activé : compare le fichier sur lequel pointe le lien.\n"
-"Désactivé : compare les liens."
-
-#. +> trunk5
-#: optiondialog.cpp:1187
-#, kde-format
-msgid "Follow directory links"
-msgstr "Suivre les liens vers un dossier"
-
-#. +> trunk5
-#: optiondialog.cpp:1191
-#, kde-format
-msgid ""
-"On: Compare the directory the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"Activé : compare le dossier sur lequel pointe le lien.\n"
-"Désactivé : compare les liens."
-
-#. +> trunk5
-#: optiondialog.cpp:1200
-#, kde-format
-msgid "Case sensitive filename comparison"
-msgstr "Tenir compte de la casse lors de la comparaison des noms de fichiers"
-
-#. +> trunk5
-#: optiondialog.cpp:1204
-#, kde-format
-msgid ""
-"The directory comparison will compare files or directories when their names match.\n"
-"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
-msgstr ""
-"La comparaison de dossiers compare les fichiers ou les dossiers lorsque leurs noms correspondent.\n"
-"Réglez cette option si la casse des noms doit correspondre. (Désactivée par défaut pour Windows, sinon Activée)"
-
-#. +> trunk5
-#: optiondialog.cpp:1208
-#, kde-format
-msgid "Unfold all subdirectories on load"
-msgstr "Déplier tous les sous-dossiers au chargement"
-
-#. +> trunk5
-#: optiondialog.cpp:1212
-#, kde-format
-msgid ""
-"On: Unfold all subdirectories when starting a directory diff.\n"
-"Off: Leave subdirectories folded."
-msgstr ""
-"Activé : déplier tous les sous-dossiers lors d'une comparaison de dossiers.\n"
-"Désactivé : conserver les sous-dossiers repliés."
-
-#. +> trunk5
-#: optiondialog.cpp:1216
-#, kde-format
-msgid "Skip directory status report"
-msgstr "Sauter le rapport d'état du dossier"
-
-#. +> trunk5
-#: optiondialog.cpp:1220
-#, kde-format
-msgid ""
-"On: Do not show the Directory Comparison Status.\n"
-"Off: Show the status dialog on start."
-msgstr ""
-"Activé : ne pas afficher l'État de la comparaison des dossiers.\n"
-"Désactivé : afficher la boîte de dialogue d'état au démarrage."
-
-#. +> trunk5
-#: optiondialog.cpp:1224
-#, kde-format
-msgid "File Comparison Mode"
-msgstr "Mode de comparaison de fichiers"
-
-#. +> trunk5
-#: optiondialog.cpp:1229
-#, kde-format
-msgid "Binary comparison"
-msgstr "Comparaison binaire"
-
-#. +> trunk5
-#: optiondialog.cpp:1231
-#, kde-format
-msgid "Binary comparison of each file. (Default)"
-msgstr "Comparaison binaire de chaque fichier. (Par défaut)"
-
-#. +> trunk5
-#: optiondialog.cpp:1234
-#, kde-format
-msgid "Full analysis"
-msgstr "Analyse complète"
-
-#. +> trunk5
-#: optiondialog.cpp:1236
-#, kde-format
-msgid ""
-"Do a full analysis and show statistics information in extra columns.\n"
-"(Slower than a binary comparison, much slower for binary files.)"
-msgstr ""
-"Effectue une analyse complète et affiche les informations statistiques dans des colonnes supplémentaires.\n"
-"(Plus lente qu'une comparaison binaire, beaucoup plus pour les fichiers binaires)"
-
-#. +> trunk5
-#: optiondialog.cpp:1240
-#, kde-format
-msgid "Trust the size and modification date (unsafe)"
-msgstr "Se fier à la taille et à la date de modification (peu sûr)"
-
-#. +> trunk5
-#: optiondialog.cpp:1242
-#, kde-format
-msgid ""
-"Assume that files are equal if the modification date and file length are equal.\n"
-"Files with equal contents but different modification dates will appear as different.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n"
-"Les fichiers ayant un contenu identique mais des dates de modification distinctes apparaîtront comme étant différents.\n"
-"Utile pour les dossiers volumineux ou les réseaux lents."
-
-#. +> trunk5
-#: optiondialog.cpp:1247
-#, kde-format
-msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)"
-msgstr "Se fier à la tailler et à la date, mais utiliser la comparaison binaire si la date ne correspond pas (peu sûr)"
-
-#. +> trunk5
-#: optiondialog.cpp:1249
-#, kde-format
-msgid ""
-"Assume that files are equal if the modification date and file length are equal.\n"
-"If the dates are not equal but the sizes are, use binary comparison.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n"
-"Si la date n'est pas identique mais que les tailles le sont, utilise la comparaison binaire.\n"
-"Utile pour les dossiers volumineux ou les réseaux lents."
-
-#. +> trunk5
-#: optiondialog.cpp:1254
-#, kde-format
-msgid "Trust the size (unsafe)"
-msgstr "Se fier à la taille (peu sûr)"
-
-#. +> trunk5
-#: optiondialog.cpp:1256
-#, kde-format
-msgid ""
-"Assume that files are equal if their file lengths are equal.\n"
-"Useful for big directories or slow networks when the date is modified during download."
-msgstr ""
-"Suppose que tous les fichiers sont identiques si leurs longueurs sont égales.\n"
-"Utile pour les dossiers volumineux ou les réseaux lents, quand la taille est modifiée durant le téléchargement."
-
-#. +> trunk5
-#: optiondialog.cpp:1263
-#, kde-format
-msgid "Synchronize directories"
-msgstr "Synchroniser les dossiers"
-
-#. +> trunk5
-#: optiondialog.cpp:1267
-#, kde-format
-msgid ""
-"Offers to store files in both directories so that\n"
-"both directories are the same afterwards.\n"
-"Works only when comparing two directories without specifying a destination."
-msgstr ""
-"Propose d'enregistrer les fichiers dans les deux dossiers pour que les deux dossiers soient identiques ensuite.\n"
-"Fonctionne seulement quand la comparaison de deux dossiers ne spécifie pas de destination."
-
-#. +> trunk5
-#: optiondialog.cpp:1273
-#, kde-format
-msgid "White space differences considered equal"
-msgstr "Différences d'espaces considérées comme égales"
-
-#. +> trunk5
-#: optiondialog.cpp:1277
-#, kde-format
-msgid ""
-"If files differ only by white space consider them equal.\n"
-"This is only active when full analysis is chosen."
-msgstr ""
-"Si les fichiers ne diffèrent que par des espaces, ils sont considérés comme identiques.\n"
-"Cette fonction n'est active que si vous choisissez l'analyse complète."
-
-#. +> trunk5
-#: optiondialog.cpp:1283
-#, kde-format
-msgid "Copy newer instead of merging (unsafe)"
-msgstr "Copier le plus récent au lieu de fusionner (peu sûr)"
-
-#. +> trunk5
-#: optiondialog.cpp:1287
-#, kde-format
-msgid ""
-"Do not look inside, just take the newer file.\n"
-"(Use this only if you know what you are doing!)\n"
-"Only effective when comparing two directories."
-msgstr ""
-"N'ouvre pas le fichier, se contente de prendre le plus récent.\n"
-"(À n'utilisez que si vous savez ce que vous faites !)\n"
-"Option effective seulement lors de la comparaison de dossiers."
-
-#. +> trunk5
-#: optiondialog.cpp:1292
-#, kde-format
-msgid "Backup files (.orig)"
-msgstr "Sauvegarder les fichiers (.orig)"
-
-#. +> trunk5
-#: optiondialog.cpp:1296
-#, kde-format
-msgid ""
-"If a file would be saved over an old file, then the old file\n"
-"will be renamed with a '.orig' extension instead of being deleted."
-msgstr ""
-"Quand il s'agira d'enregistrer un fichier sur un fichier plus ancien, alors l'ancien\n"
-"sera renommé avec une extension « .orig » au lieu d'être supprimé."
-
-#. +> trunk5
-#: optiondialog.cpp:1372 optiondialog.cpp:1373
-#, kde-format
-msgid "Regional Settings"
-msgstr "Paramètres régionaux"
-
-#. +> trunk5
-#: optiondialog.cpp:1387
-#, kde-format
-msgid "Use the same encoding for everything:"
-msgstr "Utiliser le même encodage pour tout :"
-
-#. +> trunk5
-#: optiondialog.cpp:1391
-#, kde-format
-msgid ""
-"Enable this allows to change all encodings by changing the first only.\n"
-"Disable this if different individual settings are needed."
-msgstr ""
-"Cocher cette option permet de changer tous les encodages en ne modifiant que le premier.\n"
-"Décochez-la si des paramètres individuels différents sont nécessaires."
-
-#. +> trunk5
-#: optiondialog.cpp:1395
-#, kde-format
-msgid "Note: Local Encoding is \"%1\""
-msgstr "Remarque : l'encodage local est « %1 »"
-
-#. +> trunk5
-#: optiondialog.cpp:1399
-#, kde-format
-msgid "File Encoding for A:"
-msgstr "Encodage du fichier pour A :"
-
-#. +> trunk5
-#: optiondialog.cpp:1406
-#, kde-format
-msgid ""
-"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
-"If the file is not Unicode then the selected encoding will be used as fallback.\n"
-"(Unicode detection depends on the first bytes of a file.)"
-msgstr ""
-"Si cette option est cochée, alors l'encodage Unicode (UTF-16 ou UTF-8) sera détecté.\n"
-"Si le fichier n'est pas en Unicode, alors l'encodage sélectionné sera utilisé comme solution de repli\n"
-"(la détection de l'Unicode repose sur les premiers octets d'un fichier)."
-"Module externe d'actions sur des éléments de fichiers pour KDiff3. Copyright (C) 2011 Joachim Eibl\n"
-"Page d'accueil de KDiff3 : http://kdiff3.sourceforge.net\n"
-"\n"
-
-#. +> trunk5
-#: kdiff3fileitemaction.cpp:289
-#, kde-format
-msgid ""
-"Using the context menu extension:\n"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-msgstr ""
-"Utilisation de l'extension du menu contextuel :\n"
-"Pour une comparaison simple de deux fichiers sélectionnés, choisissez « Comparer ».\n"
-"Si l'autre fichier se trouve dans un autre endroit quelconque, « enregistrez » le premier fichier pour plus tard. Il apparaîtra dans le sous-menu « Comparer avec... ». Puis utilisez « Comparer avec » sur le second fichier.\n"
-"Pour une fusion de 3 fichiers, « enregistrez » d'abord le fichier base, puis la branche à fusionner et choisissez « Fusion de trois versions de fichiers avec la base » sur l'autre branche, qui sera utilisée comme destination.\n"
-"Le même principe s'applique à la comparaison et à la fusion de dossiers."
-
-#. +> trunk5
-#: kdiff3fileitemaction.cpp:297
-#, kde-format
-msgid "About KDiff3 File Item Action Plugin"
-msgstr "À propos du module externe d'actions sur des éléments de fichiers pour KDiff3"
Property changes on: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3fileitemactionplugin.po
+#| "For simple comparison of two selected files choose \"Compare\".\n"
+#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#| "Same also applies to directory comparison and merge."
+msgid ""
+"Using the context menu extension:\n"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
+"Bruke utvidelsen av kontekstmenyen:\n"
+"For enkel sammenlikning av to markerte filer velg «Sammenlikne».\n"
+"Hvis den andre fila ligger et annet sted «Lagre» den første fila til senere. Den dukker opp i undermenyen «Sammenlikne med. Bruk deretter «Sammenlikne med» på den andre fila.\n"
+"En 3-veis fletting gjøres ved å «Lagre» basisfila, deretter grenen som skal flettes inn og velg «3-veis fletting med basis» på den andre grenen, som brukes som målfil.\n"
+"Det samme gjelder sammenlikning og fletting av mapper."
+
+#. +> trunk5
+#: kdiff3fileitemaction.cpp:297
+#, kde-format
+msgid "About KDiff3 File Item Action Plugin"
+msgstr "Om programtillegget for KDiff3 filhandling"
-#| "For simple comparison of two selected files choose \"Compare\".\n"
-#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#| "Same also applies to directory comparison and merge."
-msgid ""
-"Using the context menu extension:\n"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-msgstr ""
-"Bruke utvidelsen av kontekstmenyen:\n"
-"For enkel sammenlikning av to markerte filer velg «Sammenlikne».\n"
-"Hvis den andre fila ligger et annet sted «Lagre» den første fila til senere. Den dukker opp i undermenyen «Sammenlikne med. Bruk deretter «Sammenlikne med» på den andre fila.\n"
-"En 3-veis fletting gjøres ved å «Lagre» basisfila, deretter grenen som skal flettes inn og velg «3-veis fletting med basis» på den andre grenen, som brukes som målfil.\n"
-"Det samme gjelder sammenlikning og fletting av mapper."
-
-#. +> trunk5
-#: kdiff3fileitemaction.cpp:297
-#, kde-format
-msgid "About KDiff3 File Item Action Plugin"
-msgstr "Om programtillegget for KDiff3 filhandling"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
+"De Rechtsklickmenü-Verwiedern bruken:\n"
+"Twee utsöcht Dateien laat sik eenfach mit »Verglieken« verglieken.\n"
+"Is de anner Datei an en anner Steed, »Seker« de eerste Datei »för later«, se dukt denn in't Ünnermenü »Verglieken mit...« op, dat Du för de twete Datei opröppst.\n"
+"Wullt Du Dateien tosamenföhren, »seker« toeerst de Grunddatei, denn den Telg, den Du tosamenföhren wullt, un för de drüdde Datei bruukst Du »3-Weeg-Tosamenföhren mit Grundlaag«, se warrt denn dat Teel.\n"
+"Dat sülve gellt ok för't Verglieken un Tosamenföhren vun Ornern."
+
+#. +> trunk
+#: kdiff3fileitemaction.cpp:294
+msgid "About KDiff3 File Item Action Plugin"
+msgstr "Över dat KDiff3-Dateiindrag-Akschonenmoduul…"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-msgstr ""
-"De Rechtsklickmenü-Verwiedern bruken:\n"
-"Twee utsöcht Dateien laat sik eenfach mit »Verglieken« verglieken.\n"
-"Is de anner Datei an en anner Steed, »Seker« de eerste Datei »för later«, se dukt denn in't Ünnermenü »Verglieken mit...« op, dat Du för de twete Datei opröppst.\n"
-"Wullt Du Dateien tosamenföhren, »seker« toeerst de Grunddatei, denn den Telg, den Du tosamenföhren wullt, un för de drüdde Datei bruukst Du »3-Weeg-Tosamenföhren mit Grundlaag«, se warrt denn dat Teel.\n"
-"Dat sülve gellt ok för't Verglieken un Tosamenföhren vun Ornern."
-
-#. +> trunk
-#: kdiff3fileitemaction.cpp:294
-msgid "About KDiff3 File Item Action Plugin"
-msgstr "Över dat KDiff3-Dateiindrag-Akschonenmoduul…"
+msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:104
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:111
+#, 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
+#. +> trunk5
+#: index.docbook:115
+#, 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
+#. +> trunk5
+#: index.docbook:119
+#, 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
+#. +> trunk5
+#: index.docbook:122
+#, 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
+#. +> trunk5
+#: index.docbook:125
+#, 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
+#. +> trunk5
+#: index.docbook:128
+#, no-c-format
+msgid "I hope &kdiff3; works for you too. Have fun!"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:130
+#, no-c-format
+msgid "Joachim Eibl (2003)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:135
+#, no-c-format
+msgid "Screenshots and Features"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:136
+#, no-c-format
+msgid "This screenshot shows the difference between two text files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:137
+#, no-c-format
+msgid "(Using an early version of &kdiff3;):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:142
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:155
+#, no-c-format
+msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:164
+#, no-c-format
+msgid "More Features"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:165
+#, no-c-format
+msgid "Line-By-Line And Char-By-Char Diff-Viewer"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:166
+#, no-c-format
+msgid "By using the possibilities 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:174
+#, no-c-format
+msgid "See White-Space Differences At One Glance"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:175
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:184
+#, no-c-format
+msgid "Triple-Diff"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:185
+#, no-c-format
+msgid "Analyze three files and see where they differ."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:186
+#, 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
+#. +> trunk5
+#: index.docbook:189
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:199
+#, no-c-format
+msgid "Comfortable Merge Of Two Or Three Input Files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:200
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:210
+#, no-c-format
+msgid "And ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:212
+#, no-c-format
+msgid "Fast navigation via buttons."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:213
+#, no-c-format
+msgid "A mouse-click into a summary column sync's all windows to show the same position."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:214
+#, no-c-format
+msgid "Select and copy from any window and paste into the merge result window."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:215
+#, no-c-format
+msgid "Overview column that shows where the changes and conflicts are."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:216
+#, no-c-format
+msgid "The colors are adjustable to your specific preferences."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:217
+#, no-c-format
+msgid "Adjustable Tab size."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:218
+#, no-c-format
+msgid "Option to insert spaces instead of tabs."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:219
+#, no-c-format
+msgid "Open files comfortably via dialog or specify files on the command line."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:220
+#, no-c-format
+msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:221
+#, no-c-format
+msgid "Show the line numbers for each line."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:222
+#, no-c-format
+msgid "Paste clipboard or drag text into a diff input window."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:223
+#, no-c-format
+msgid "Networktransparency via KIO."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:224
+#, no-c-format
+msgid "Can be used as diff-viewer in KDevelop 3."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:225
+#, no-c-format
+msgid "Word-wrap for long lines."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:226
+#, no-c-format
+msgid "Support for Unicode, UTF-8 and other codecs."
+msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:259
+#, no-c-format
+msgid "Special case: Files with the same name"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:260
+#, 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.:"
+" --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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:278
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:281
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:284
+#, no-c-format
+msgid "Ignorable command line options"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:285
+#, 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:"
+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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:296
+#, 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
+#. +> trunk5
+#: index.docbook:301
+#, no-c-format
+msgid "Open-Dialog"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:302
+#, no-c-format
+msgid "Since many input files must be selectable, the program has a special open dialog:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:308
+#, no-c-format
+msgid "The open dialog allows you to edit the filenames by hand, selecting a file via the file-browser (\"File...\") or allows you 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
+#. +> trunk5
+#: index.docbook:315
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:320
+#, 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
+#. +> trunk5
+#: index.docbook:324
+#, 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
+#. +> trunk5
+#: index.docbook:330
+#, no-c-format
+msgid "Paste and Drop Input"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:331
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:336
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:339
+#, 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
+#. +> trunk5
+#: index.docbook:343
+#, no-c-format
+msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:346
+#, 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
+#. +> trunk5
+#: index.docbook:352
+#, no-c-format
+msgid "Comparing Files And Interpreting The Information In The Input Windows"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:356
+#, no-c-format
+msgid "Info Line"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:356
+#, 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
+#. +> trunk5
+#: index.docbook:361
+#, 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
+#. +> trunk5
+#: index.docbook:365
+#, no-c-format
+msgid "Coloring"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:365
+#, 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
+#. +> trunk5
+#: index.docbook:369
+#, 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
+#. +> trunk5
+#: index.docbook:375
+#, no-c-format
+msgid "Summary Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:375
+#, 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
+#. +> trunk5
+#: index.docbook:382
+#, 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
+#. +> trunk5
+#: index.docbook:386
+#, no-c-format
+msgid "Overview Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:386
+#, 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
+#. +> trunk5
+#: index.docbook:398
+#, no-c-format
+msgid "Manually Aligning Lines"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:398
+#, 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 <keycombo>&Ctrl;<keycap>Y</keycap></keycombo>). 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
+#. +> trunk5
+#: index.docbook:409
+#, no-c-format
+msgid "Currently merging doesn't support the use of manual diff help."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:411
+#, no-c-format
+msgid "Manually Joining and Splitting Diff Sections"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:411
+#, 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
+#. +> trunk5
+#: index.docbook:414
+#, 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
+#. +> trunk5
+#: index.docbook:419
+#, 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
+#. +> trunk5
+#: index.docbook:426
+#, no-c-format
+msgid "Merging And The Merge Output Editor Window"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:430
+#, 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
+#. +> trunk5
+#: index.docbook:435
+#, 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
+#. +> trunk5
+#: index.docbook:438
+#, no-c-format
+msgid "With only two input files every difference is also a conflict that must be solved manually."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:441
+#, 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
+#. +> trunk5
+#: index.docbook:448
+#, no-c-format
+msgid "The Summary Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:448
+#, 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 \"<Merge Conflict>\", 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
+#. +> trunk5
+#: index.docbook:458
+#, no-c-format
+msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:458
+#, 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
+#. +> trunk5
+#: index.docbook:464
+#, no-c-format
+msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:464
+#, 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
+#. +> trunk5
+#: index.docbook:471
+#, 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
+#. +> trunk5
+#: index.docbook:477
+#, 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
+#. +> trunk5
+#: index.docbook:483
+#, 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 <No src line> 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
+#. +> trunk5
+#: index.docbook:489
+#, no-c-format
+msgid "The text \"<Merge Conflict>\" 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
+#. +> trunk5
+#: index.docbook:493
+#, no-c-format
+msgid "Choosing Input A, B, or C for All Conflicts"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:493
+#, 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
+#. +> trunk5
+#: index.docbook:504
+#, 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
+#. +> trunk5
+#: index.docbook:509
+#, no-c-format
+msgid "Automatic Merge of Version Control Keywords and History (Log)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:509
+#, no-c-format
+msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:516
+#, 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
+#. +> trunk5
+#: index.docbook:524
+#, 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
+#. +> trunk5
+#: index.docbook:529
+#, no-c-format
+msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:535
+#, 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
+#. +> trunk5
+#: index.docbook:540
+#, 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
+#. +> trunk5
+#: index.docbook:546
+#, 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
+#. +> trunk5
+#: index.docbook:552
+#, no-c-format
+msgid "Note that &kdiff3; will remove duplicate history entries. 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
+#. +> trunk5
+#: index.docbook:555
+#, 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
+#. +> trunk5
+#: index.docbook:561
+#, 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
+#. +> trunk5
+#: index.docbook:565
+#, no-c-format
+msgid ""
+"Example: Assume a history that looks like this: <screen>\n"
+"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:569
+#, no-c-format
+msgid "The line with the \"$Log$\"-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
+#. +> trunk5
+#: index.docbook:575
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:583
+#, 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
+#. +> trunk5
+#: index.docbook:588
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:596
+#, 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:"
+msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:608
+#, no-c-format
+msgid "Navigation And Editing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:609
+#, 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
+#. +> trunk5
+#: index.docbook:616
+#, no-c-format
+msgid "You can also use the wheel mouse to scroll up and down."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:618
+#, 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
+#. +> trunk5
+#: index.docbook:622
+#, 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
+#. +> trunk5
+#: index.docbook:626
+#, 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
+#. +> trunk5
+#: index.docbook:634
+#, no-c-format
+msgid "Auto-Advance"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:635
+#, 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- & 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
+#. +> trunk5
+#: index.docbook:651
+#, no-c-format
+msgid "Select, Copy And Paste"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:652
+#, 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
+#. +> trunk5
+#: index.docbook:659
+#, 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
+#. +> trunk5
+#: index.docbook:662
+#, 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
+#. +> trunk5
+#: index.docbook:666
+#, no-c-format
+msgid "In order to select everything in the current window use menu \"Edit\"->\"Select All\" (Ctrl-A)."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:668
+#, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:674
+#, no-c-format
+msgid "\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the selected text."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:677
+#, 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
+#. +> trunk5
+#: index.docbook:687
+#, no-c-format
+msgid "Saving"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:688
+#, 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
+#. +> trunk5
+#: index.docbook:696
+#, 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
+#. +> trunk5
+#: index.docbook:705
+#, no-c-format
+msgid "Finding Strings"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:706
+#, 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
+#. +> trunk5
+#: index.docbook:717
+#, no-c-format
+msgid "Printing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:718
+#, 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
+#. +> trunk5
+#: index.docbook:722
+#, 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
+#. +> trunk5
+#: index.docbook:727
+#, no-c-format
+msgid "All:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:727
+#, no-c-format
+msgid "Print everything."
+msgstr ""
+
+#. Tag: term
+#. +> trunk5
+#: index.docbook:728
+#, no-c-format
+msgid "Current:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:728
+#, no-c-format
+msgid "Print a page starting at the first visible line in the window. (On systems without this option this can be achieved by specifying page number 10000 for printing.)"
+msgstr ""
+
+#. Tag: term
+#. +> trunk5
+#: index.docbook:730
+#, no-c-format
+msgid "Selection:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:730
+#, 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
+#. +> trunk5
+#: index.docbook:736
+#, no-c-format
+msgid "Range:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:736
+#, no-c-format
+msgid "Specify the first and last page."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:739
+#, no-c-format
+msgid "Other important options for printing will be taken from the normal options:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:742
+#, no-c-format
+msgid "Font, font size"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:743
+#, no-c-format
+msgid "Show line numbers"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:744
+#, no-c-format
+msgid "Word wrap"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:745
+#, no-c-format
+msgid "<para>Colors</para>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:746
+#, no-c-format
+msgid "etc."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:748
+#, no-c-format
+msgid "Landscape formatting is also recommended for printing."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:753
+#, no-c-format
+msgid "Options"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:754
+#, 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
+#. +> trunk5
+#: index.docbook:758
+#, no-c-format
+msgid "Font"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:759
+#, 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
+#. +> trunk5
+#: index.docbook:764
+#, no-c-format
+msgid "Italic Font for Deltas:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:764
+#, 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
+#. +> trunk5
+#: index.docbook:771
+#, no-c-format
+msgid "<title>Colors</title>"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:773
+#, no-c-format
+msgid "Foreground color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:773 index.docbook:786
+#, no-c-format
+msgid "Usually black."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:774
+#, no-c-format
+msgid "Background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:774
+#, no-c-format
+msgid "Usually white."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:775
+#, no-c-format
+msgid "Diff Background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:775
+#, no-c-format
+msgid "Usually light gray."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:776
+#, no-c-format
+msgid "Color A:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:776
+#, no-c-format
+msgid "Usually dark blue."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:777
+#, no-c-format
+msgid "Color B:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:777
+#, no-c-format
+msgid "Usually dark green."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:778
+#, no-c-format
+msgid "Color C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:778
+#, no-c-format
+msgid "Usually dark magenta."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:779
+#, no-c-format
+msgid "Conflict Color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:779 index.docbook:784
+#, no-c-format
+msgid "Usually red."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:780
+#, no-c-format
+msgid "Current range background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:780
+#, no-c-format
+msgid "Usually light yellow."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:781
+#, no-c-format
+msgid "Current range diff background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:781 index.docbook:785
+#, no-c-format
+msgid "Usually dark yellow."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:782
+#, no-c-format
+msgid "Color for manually selected diff ranges:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:782
+#, no-c-format
+msgid "Usually orange."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:783
+#, no-c-format
+msgid "Newest file color in directory comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:783
+#, no-c-format
+msgid "Usually green."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:784
+#, no-c-format
+msgid "Oldest file color in directory comparison:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:785
+#, no-c-format
+msgid "Middle age file color in directory comparison:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:786
+#, no-c-format
+msgid "Color for missing files in directory comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:788
+#, no-c-format
+msgid "Changing the colors for directory comparison will be effective only when starting the next directory comparison."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:791
+#, 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
+#. +> trunk5
+#: index.docbook:797
+#, no-c-format
+msgid "Editor Settings"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:799
+#, no-c-format
+msgid "Tab inserts spaces:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:799
+#, 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
+#. +> trunk5
+#: index.docbook:802
+#, no-c-format
+msgid "Tab size:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:802
+#, no-c-format
+msgid "Can be adjusted for your specific needs. Default is 8."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:803
+#, no-c-format
+msgid "Auto indentation:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:803
+#, no-c-format
+msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:805
+#, no-c-format
+msgid "Auto copy selection:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:805
+#, no-c-format
+msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:807
+#, no-c-format
+msgid "Line end style:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:807
+#, 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
+#. +> trunk5
+#: index.docbook:812
+#, no-c-format
+msgid "Diff Settings"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:813
+#, 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
+#. +> trunk5
+#: index.docbook:821
+#, no-c-format
+msgid "Ignore numbers:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:821
+#, 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
+#. +> trunk5
+#: index.docbook:826
+#, no-c-format
+msgid "Ignore C/C++ comments:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:826
+#, no-c-format
+msgid "Default is off. Changes in comments will be treated like changes in white space."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:829
+#, no-c-format
+msgid "Ignore case:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:829
+#, 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
+#. +> trunk5
+#: index.docbook:832 index.docbook:999
+#, no-c-format
+msgid "Preprocessor-Command:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:832 index.docbook:835
+#, no-c-format
+msgid "See <link linkend=\"preprocessors\">next section</link>."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:835 index.docbook:1006
+#, no-c-format
+msgid "Line-Matching Preprocessor-Command:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:838
+#, no-c-format
+msgid "Try Hard:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:838
+#, 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
+#. +> trunk5
+#: index.docbook:845
+#, no-c-format
+msgid "Merge Settings"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:847
+#, no-c-format
+msgid "Auto Advance Delay (ms):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:847
+#, 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
+#. +> trunk5
+#: index.docbook:851
+#, no-c-format
+msgid "White space 2/3-file merge default:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:851
+#, 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
+#. +> trunk5
+#: index.docbook:858
+#, no-c-format
+msgid "Auto merge regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:858
+#, 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
+#. +> trunk5
+#: index.docbook:861
+#, no-c-format
+msgid "Run regular expression auto merge on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:861
+#, 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
+#. +> trunk5
+#: index.docbook:864
+#, no-c-format
+msgid "History start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:864
+#, no-c-format
+msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:869
+#, no-c-format
+msgid "History entry start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:869
+#, 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
+#. +> trunk5
+#: index.docbook:876
+#, no-c-format
+msgid "History merge sorting:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:876
+#, no-c-format
+msgid "Enable version control history sorting."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:879
+#, no-c-format
+msgid "History entry start sort key order:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:879
+#, 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
+#. +> trunk5
+#: index.docbook:887
+#, no-c-format
+msgid "Merge version control history on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:887
+#, no-c-format
+msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:890
+#, no-c-format
+msgid "Max number of history entries:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:890
+#, 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
+#. +> trunk5
+#: index.docbook:893
+#, no-c-format
+msgid "Test your regular expressions"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:893
+#, 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
+#. +> trunk5
+#: index.docbook:899
+#, no-c-format
+msgid "Irrelevant merge command:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:899
+#, 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
+#. +> trunk5
+#: index.docbook:911
+#, no-c-format
+msgid "Directory Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:912
+#, 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
+#. +> trunk5
+#: index.docbook:916
+#, no-c-format
+msgid "Yet there is one option here that is also relevant for saving single files:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:920 index.docbook:1618
+#, no-c-format
+msgid "Backup files:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:920
+#, 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
+#. +> trunk5
+#: index.docbook:928
+#, no-c-format
+msgid "Regional and Language Options"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:930
+#, no-c-format
+msgid "Language:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:930
+#, 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 Frameworks version of &kdiff3;.)"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:932
+#, no-c-format
+msgid "Use the same encoding for everything:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:932
+#, 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
+#. +> trunk5
+#: index.docbook:934
+#, no-c-format
+msgid "Local Encoding:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:934
+#, 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
+#. +> trunk5
+#: index.docbook:936
+#, no-c-format
+msgid "File Encoding for A/B/C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:936
+#, 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
+#. +> trunk5
+#: index.docbook:938
+#, no-c-format
+msgid "File Encoding for Merge Output and Saving:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:938
+#, 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
+#. +> trunk5
+#: index.docbook:940
+#, no-c-format
+msgid "File Encoding for Preprocessor Files:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:940
+#, 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
+#. +> trunk5
+#: index.docbook:942
+#, no-c-format
+msgid "Right To Left Language:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:942
+#, 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
+#. +> trunk5
+#: index.docbook:948
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:949
+#, no-c-format
+msgid "(These options and actions are available in menus or the buttonbar.)"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:951
+#, no-c-format
+msgid "Show line numbers:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:951
+#, no-c-format
+msgid "You can select if line numbers should be shown for the input files."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:953
+#, no-c-format
+msgid "Show space and tabulator characters for differences:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:953
+#, no-c-format
+msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:955
+#, no-c-format
+msgid "Show white space:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:955
+#, 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
+#. +> trunk5
+#: index.docbook:959
+#, no-c-format
+msgid "Overview options:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:959
+#, 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
+#. +> trunk5
+#: index.docbook:966
+#, no-c-format
+msgid "Word wrap diff windows:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:966
+#, no-c-format
+msgid "Wrap lines when their length would exceed the width of a window."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:969
+#, no-c-format
+msgid "Show Window A/B/C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:969
+#, 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
+#. +> trunk5
+#: index.docbook:972
+#, no-c-format
+msgid "Toggle Split Orientation:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:972
+#, 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
+#. +> trunk5
+#: index.docbook:976
+#, no-c-format
+msgid "Start a merge quickly:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:976
+#, 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
+#. +> trunk5
+#: index.docbook:986
+#, no-c-format
+msgid "Configuring Keyboard-Shortcuts"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:987
+#, no-c-format
+msgid "Currently only the Frameworks-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:994
+#, no-c-format
+msgid "Preprocessor Commands"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:995
+#, no-c-format
+msgid "&kdiff3; supports two preprocessor options."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:999
+#, 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
+#. +> trunk5
+#: index.docbook:1006
+#, 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
+#. +> trunk5
+#: index.docbook:1016
+#, 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."
+"</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
+#. +> trunk5
+#: index.docbook:1039
+#, no-c-format
+msgid "<command>sed</command> Basics"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1040
+#, 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
+#. +> trunk5
+#: index.docbook:1051
+#, no-c-format
+msgid ""
+"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
+"</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"
+"</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."
+msgid "Examples For <command>sed</command>-Use In &kdiff3;"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1068
+#, no-c-format
+msgid "Ignoring Other Types Of Comments"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1069
+#, 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 (') are only important when testing on the command shell as it will otherwise attempt to process some characters. KDiff3 does not do this except for the escape sequences '\\\"' and '\\\\'."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1086
+#, no-c-format
+msgid "Caseinsensitive Diff"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1087
+#, 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
+#. +> trunk5
+#: index.docbook:1097
+#, no-c-format
+msgid "Ignoring Version Control Keywords"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1098
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:1108
+#, 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
+#. +> trunk5
+#: index.docbook:1115
+#, no-c-format
+msgid "Ignoring Numbers"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1116
+#, 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"
+"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1124
+#, no-c-format
+msgid "Ignoring Certain Columns"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1125
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:1135
+#, no-c-format
+msgid "Combining Several Substitutions"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1136
+#, 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:"
+"</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:"
+msgid "The data is piped through all internal and external preprocessors in the following order:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1162
+#, no-c-format
+msgid "Normal preprocessor,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1163
+#, no-c-format
+msgid "Line-Matching-Preprocessor,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1164
+#, no-c-format
+msgid "Ignore case (conversion to uppercase),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1165
+#, no-c-format
+msgid "Detection of C/C++ comments,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1166
+#, no-c-format
+msgid "Ignore numbers,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1167
+#, no-c-format
+msgid "Ignore white space"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1169
+#, 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
+#. +> trunk5
+#: index.docbook:1172
+#, 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
+#. +> trunk5
+#: index.docbook:1178
+#, no-c-format
+msgid "Warning"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1179
+#, 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
+#. +> trunk5
+#: index.docbook:1183
+#, 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 want 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
+#. +> trunk5
+#: index.docbook:1198
+#, no-c-format
+msgid "Directory Comparison and Merge with &kdiff3;"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1199
+#, no-c-format
+msgid "Introduction into Directory Comparison and Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1200
+#, 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
+#. +> trunk5
+#: index.docbook:1204
+#, 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
+#. +> trunk5
+#: index.docbook:1218
+#, no-c-format
+msgid "To err is human, but to really mess things up you need a computer."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1220
+#, no-c-format
+msgid "So this is what this program can do for you: &kdiff3; ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1224
+#, no-c-format
+msgid "... reads and compares two or three directories recursively,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1225
+#, no-c-format
+msgid "... takes special care of symbolic links,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1226
+#, no-c-format
+msgid "... lets you browse files on mouse double click,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1227
+#, no-c-format
+msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1229
+#, no-c-format
+msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1231
+#, no-c-format
+msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1233
+#, no-c-format
+msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1234
+#, no-c-format
+msgid "... lets you continue the merge after manual interaction with key F7,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1235
+#, no-c-format
+msgid "... optionally creates backups, with the \".orig\" extension,"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1240
+#, no-c-format
+msgid "Starting Directory Comparison Or Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1241
+#, 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."
+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
+#. +> trunk5
+#: index.docbook:1262
+#, 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
+#. +> trunk5
+#: index.docbook:1269
+#, no-c-format
+msgid "Directory Merge Visible Information"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1270
+#, 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
+#. +> trunk5
+#: index.docbook:1274
+#, no-c-format
+msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1281
+#, no-c-format
+msgid "... and details about the currently selected item on the right:"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1289
+#, no-c-format
+msgid "The Name Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1290
+#, 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
+#. +> trunk5
+#: index.docbook:1293
+#, 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
+#. +> trunk5
+#: index.docbook:1299
+#, 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
+#. +> trunk5
+#: index.docbook:1303
+#, 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
+#. +> trunk5
+#: index.docbook:1308
+#, no-c-format
+msgid "Normal file"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1309
+#, no-c-format
+msgid "Normal directory (directory-image)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1310
+#, no-c-format
+msgid "Link to a file (file-image with a link arrow)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1311
+#, no-c-format
+msgid "Link to a directory (directory-image with a link arrow)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1313
+#, 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
+#. +> trunk5
+#: index.docbook:1322
+#, no-c-format
+msgid "The Columns A/B/C and the Coloring Scheme"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1323
+#, 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
+#. +> trunk5
+#: index.docbook:1328
+#, no-c-format
+msgid "Black: This item doesn't exist in this directory."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1329
+#, no-c-format
+msgid "Green: Newest item."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1330
+#, no-c-format
+msgid "Yellow: Older than green, newer than red."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1331
+#, no-c-format
+msgid "Red: Oldest item."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1333
+#, 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
+#. +> trunk5
+#: index.docbook:1336
+#, 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
+#. +> trunk5
+#: index.docbook:1340
+#, 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
+#. +> trunk5
+#: index.docbook:1347
+#, no-c-format
+msgid "The Operation Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1348
+#, 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
+#. +> trunk5
+#: index.docbook:1359
+#, no-c-format
+msgid "Three directory-merge (\"A\" is treated as older base of both)."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1360
+#, no-c-format
+msgid "Two directory-merge."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1361
+#, no-c-format
+msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1363
+#, no-c-format
+msgid "In three directory merge the operation proposal will be: If for an item ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1367
+#, no-c-format
+msgid "... all three directories are equal: Copy from C"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1368
+#, 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
+#. +> trunk5
+#: index.docbook:1370
+#, 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
+#. +> trunk5
+#: index.docbook:1372
+#, 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
+#. +> trunk5
+#: index.docbook:1374
+#, no-c-format
+msgid "... only A exists: Delete the destination (if exists)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1375
+#, no-c-format
+msgid "... only B exists: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1376
+#, no-c-format
+msgid "... only C exists: Copy from C"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1377
+#, no-c-format
+msgid "... A, B and C are not equal: Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1378
+#, 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
+#. +> trunk5
+#: index.docbook:1382
+#, no-c-format
+msgid "In two directory merge the operation proposal will be: If for an item ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1386
+#, no-c-format
+msgid "... both directories are equal: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1387
+#, no-c-format
+msgid "... A exists, but not B: Copy from A"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1388
+#, no-c-format
+msgid "... B exists, but not A: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1389
+#, no-c-format
+msgid "... A and B exist but are not equal: Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1390 index.docbook:1407
+#, 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
+#. +> trunk5
+#: index.docbook:1394
+#, 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
+#. +> trunk5
+#: index.docbook:1401
+#, no-c-format
+msgid "... both directories are equal: Nothing will be done."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1402
+#, no-c-format
+msgid "... A exists, but not B: Copy A to B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1403
+#, no-c-format
+msgid "... B exists, but not A: Copy B to A"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1404
+#, 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
+#. +> trunk5
+#: index.docbook:1411
+#, 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
+#. +> trunk5
+#: index.docbook:1420
+#, no-c-format
+msgid "The Status Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1421
+#, 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
+#. +> trunk5
+#: index.docbook:1430
+#, no-c-format
+msgid "Statistics Columns"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1431
+#, 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
+#. +> trunk5
+#: index.docbook:1438
+#, no-c-format
+msgid "Selecting Listed Files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1439
+#, 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
+#. +> trunk5
+#: index.docbook:1443
+#, no-c-format
+msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1444
+#, no-c-format
+msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1445
+#, no-c-format
+msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1446
+#, no-c-format
+msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1447
+#, no-c-format
+msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1449
+#, 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
+#. +> trunk5
+#: index.docbook:1454
+#, 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
+#. +> trunk5
+#: index.docbook:1457
+#, 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
+#. +> trunk5
+#: index.docbook:1465
+#, no-c-format
+msgid "Doing A Directory Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1466
+#, 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
+#. +> trunk5
+#: index.docbook:1470
+#, no-c-format
+msgid "Be aware that if you didn't specify a destination directory explicitly, 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
+#. +> trunk5
+#: index.docbook:1474
+#, 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
+#. +> trunk5
+#: index.docbook:1481
+#, no-c-format
+msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1483
+#, no-c-format
+msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1484
+#, no-c-format
+msgid "\"Exclude Hidden Files\""
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1485
+#, no-c-format
+msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1487
+#, 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
+#. +> trunk5
+#: index.docbook:1492
+#, 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
+#. +> trunk5
+#: index.docbook:1496
+#, no-c-format
+msgid "If you are satisfied so far, the rest is easy."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1498
+#, 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
+#. +> trunk5
+#: index.docbook:1503
+#, 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
+#. +> trunk5
+#: index.docbook:1507
+#, 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
+#. +> trunk5
+#: index.docbook:1512
+#, 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
+#. +> trunk5
+#: index.docbook:1514
+#, no-c-format
+msgid "Otherwise select \"Do it\" to really start merging."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1516
+#, 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
+#. +> trunk5
+#: index.docbook:1520
+#, 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
+#. +> trunk5
+#: index.docbook:1524
+#, 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
+#. +> trunk5
+#: index.docbook:1531
+#, no-c-format
+msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1534
+#, 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
+#. +> trunk5
+#: index.docbook:1544
+#, no-c-format
+msgid "Options for Comparing and Merging Directories"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1545
+#, no-c-format
+msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1551
+#, no-c-format
+msgid "Recursive Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1551
+#, no-c-format
+msgid "Select whether to search directories recursively."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1553
+#, no-c-format
+msgid "File Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1553
+#, 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
+#. +> trunk5
+#: index.docbook:1557
+#, no-c-format
+msgid "File Anti-Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1557
+#, 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
+#. +> trunk5
+#: index.docbook:1561
+#, no-c-format
+msgid "Directory Anti-Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1561
+#, 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
+#. +> trunk5
+#: index.docbook:1565
+#, no-c-format
+msgid "Use CVS-Ignore:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1565
+#, 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
+#. +> trunk5
+#: index.docbook:1570
+#, no-c-format
+msgid "Find Hidden Files and Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1570
+#, 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
+#. +> trunk5
+#: index.docbook:1574
+#, no-c-format
+msgid "Follow File Links:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1574
+#, 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
+#. +> trunk5
+#: index.docbook:1577
+#, no-c-format
+msgid "Follow Directory Links:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1577
+#, 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
+#. +> trunk5
+#: index.docbook:1584
+#, no-c-format
+msgid "Case Sensitive Filename Comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1584
+#, no-c-format
+msgid "Default is false on Windows, true for other operating systems."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1586
+#, no-c-format
+msgid "File Comparison Mode:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1588
+#, no-c-format
+msgid "Binary Comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1588
+#, no-c-format
+msgid "This is the default file comparison mode."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1591
+#, no-c-format
+msgid "Full Analysis:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1591
+#, 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
+#. +> trunk5
+#: index.docbook:1598
+#, no-c-format
+msgid "Trust the modification date:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1598
+#, 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
+#. +> trunk5
+#: index.docbook:1602
+#, no-c-format
+msgid "Trust the size:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1602
+#, 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
+#. +> trunk5
+#: index.docbook:1609
+#, no-c-format
+msgid "Synchronize Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1609
+#, 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
+#. +> trunk5
+#: index.docbook:1614
+#, no-c-format
+msgid "Copy newer instead of merging:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1614
+#, 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
+#. +> trunk5
+#: index.docbook:1618
+#, 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
+#. +> trunk5
+#: index.docbook:1626
+#, no-c-format
+msgid "Other Functions in Directory Merge Window"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1627
+#, no-c-format
+msgid "Split/Full Screen Mode"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1628
+#, 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 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
+#. +> trunk5
+#: index.docbook:1637
+#, no-c-format
+msgid "Comparing or Merging a Single File"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1638
+#, 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
+#. +> trunk5
+#: index.docbook:1645
+#, 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
+#. +> trunk5
+#: index.docbook:1650
+#, no-c-format
+msgid "Comparing or Merging Files with Different Names"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1651
+#, 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
+#. +> trunk5
+#: index.docbook:1654
+#, 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
+#. +> trunk5
+#: index.docbook:1658
+#, no-c-format
+msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
+#. +> trunk5
+#: index.docbook:1662
+#, 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
+#. +> trunk5
+#: index.docbook:1670
+#, no-c-format
+msgid "Miscellaneous Topics"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1672
+#, no-c-format
+msgid "Networktransparency via KIO"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1673
+#, no-c-format
+msgid "KIO-Slaves"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1674
+#, no-c-format
+msgid "The KIO library from Frameworks 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."
+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
+#. +> trunk5
+#: index.docbook:1686
+#, no-c-format
+msgid "Other KIO-slaves that are interesting are:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1690
+#, no-c-format
+msgid "Files from the WWW (http:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1691
+#, no-c-format
+msgid "Files from the FTP (ftp:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1692
+#, no-c-format
+msgid "Encrypted file transfer (fish:, sftp:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1693
+#, no-c-format
+msgid "Windows-resources (smb:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1694
+#, no-c-format
+msgid "Local files (file:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1696
+#, no-c-format
+msgid "Other things that are possible, but probably less useful are:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1700
+#, no-c-format
+msgid "Man-pages (man:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1701
+#, no-c-format
+msgid "Info-pages (info:),"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1705
+#, no-c-format
+msgid "How To Write URLs"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1706
+#, 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
+#. +> trunk5
+#: index.docbook:1711
+#, 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
+#. +> trunk5
+#: index.docbook:1714
+#, 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
+#. +> trunk5
+#: index.docbook:1717
+#, no-c-format
+msgid "When URLs don't work as expected, try to open them in Konqueror first."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1724
+#, no-c-format
+msgid "Capabilities of KIO-Slaves"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1725
+#, no-c-format
+msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1727
+#, 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
+#. +> trunk5
+#: index.docbook:1732
+#, no-c-format
+msgid "Sometimes there is no support for links."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1734
+#, 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
+#. +> trunk5
+#: index.docbook:1737
+#, no-c-format
+msgid "Can't always determine the filesize."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1739
+#, no-c-format
+msgid "Limited support for permissions."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1741
+#, 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
+#. +> trunk5
+#: index.docbook:1751
+#, no-c-format
+msgid "Using &kdiff3; as a KPart"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1752
+#, no-c-format
+msgid "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1754
+#, 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 context menu."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1758
+#, no-c-format
+msgid "&kdiff3; normally requires two complete files as input. When used as part &kdiff3; will assume that the input file 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
+#. +> trunk5
+#: index.docbook:1764
+#, no-c-format
+msgid "In &dolphin; you can select a patch-file and select \"Preview in\"-\"KDiff3Part\" from the context menu. 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
+#. +> trunk5
+#: index.docbook:1769
+#, 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
+#. +> trunk5
+#: index.docbook:1776
+#, no-c-format
+msgid "Using &kdiff3; as a Git Diff and Merging Tool"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1777
+#, no-c-format
+msgid "&kdiff3; can be used as a <ulink url=\"https://git-scm.com/\">Git</ulink> diff and merge tool."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1780
+#, no-c-format
+msgid "Just add the following lines into your <filename>gitconfig</filename> file."
+msgstr ""
+
+#. Tag: programlisting
+#. +> trunk5
+#: index.docbook:1783
+#, no-c-format
+msgid ""
+"[diff]\n"
+" tool = kdiff3\n"
+"[difftool \"kdiff3\"]\n"
+" path = <path to kdiff3 binary in your system>\n"
+"[difftool]\n"
+" prompt = false\n"
+" keepBackup = false\n"
+" trustExitCode = false\n"
+"[merge]\n"
+" tool = kdiff3\n"
+"[mergetool]\n"
+" prompt = false\n"
+" keepBackup = false\n"
+" keepTemporaries = false\n"
+"[mergetool \"kdiff3\"]\n"
+" path = <path to kdiff3 binary in your system>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1784
+#, no-c-format
+msgid "Then to see the difference between two commits use <userinput>git difftool <replaceable>first_hash</replaceable> <replaceable>second_hash</replaceable> --tool=kdiff3 --cc <replaceable>some_file_in_the_git_tree</replaceable></userinput>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1787
+#, no-c-format
+msgid "To merge a branch with &kdiff3; use <userinput>git merge <replaceable>branch_name</replaceable> && git mergetool --tool=kdiff3</userinput>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1790
+#, no-c-format
+msgid "After resolving merging conflicts in the <link linkend=\"synchronise_views\">usual way</link> it is enough to commit the changes to do the job."
+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
+#. +> trunk5
+#: index.docbook:1811
+#, no-c-format
+msgid "Why did I release it under GPL?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1813
+#, 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
+#. +> trunk5
+#: index.docbook:1819
+#, no-c-format
+msgid "Some buttons and functions are missing. What's wrong?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1821
+#, no-c-format
+msgid "You compiled from source but you probably didn't specify the correct prefix for the installation. By default cmake wants to install in /usr/local but then the user-interface resource file (i.e. kdiff3ui.rc) can't be found. The README-file contains more information about the correct prefix."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1828
+#, no-c-format
+msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1831
+#, 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
+#. +> trunk5
+#: index.docbook:1839
+#, no-c-format
+msgid "Why must all conflicts be solved before the merge result can be saved?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1841
+#, 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
+#. +> trunk5
+#: index.docbook:1850
+#, 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
+#. +> trunk5
+#: index.docbook:1852
+#, no-c-format
+msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1856
+#, no-c-format
+msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1858
+#, 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
+#. +> trunk5
+#: index.docbook:1864
+#, no-c-format
+msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1867
+#, no-c-format
+msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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
+#. +> trunk5
+#: index.docbook:1878
+#, no-c-format
+msgid "Why doesn't &kdiff3; support syntax-highlighting?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1880
+#, 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
+#. +> trunk5
+#: index.docbook:1885
+#, no-c-format
+msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1887
+#, 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
+#. +> trunk5
+#: index.docbook:1890
+#, 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
+#. +> trunk5
+#: index.docbook:1896
+#, 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
+#. +> trunk5
+#: index.docbook:1900
+#, 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 clipboard 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
+#. +> trunk5
+#: index.docbook:1908
+#, no-c-format
+msgid "Where has the directory option \"List only deltas\" gone?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1910
+#, 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
+#. +> trunk5
+#: index.docbook:1915
+#, no-c-format
+msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1918
+#, 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
+#. +> trunk5
+#: index.docbook:1924
+#, no-c-format
+msgid "There is so much information here, but your question is still not answered?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1926
+#, no-c-format
+msgid "Please send me your question. I appreciate every comment."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1935
+#, no-c-format
+msgid "Credits and License"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1937
+#, no-c-format
+msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1940
+#, no-c-format
+msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1943
+#, no-c-format
+msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
+msgid "More detailed user documentation is available from <ulink url=\"help:/kdiff3\">help:/kdiff3</ulink> (either enter this &URL; into &konqueror;, or run <userinput><command>khelpcenter</command> <parameter>help:/kdiff3</parameter></userinput>)."
+msgstr ""
+
+#. Tag: member
+#. +> trunk5
+#: man-kdiff3.1.docbook:196
+#, no-c-format
+msgid "kf5options(7)"
+msgstr ""
+
+#. Tag: member
+#. +> trunk5
+#: man-kdiff3.1.docbook:197
+#, no-c-format
+msgid "qt5options(7)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: man-kdiff3.1.docbook:202
+#, no-c-format
+msgid "Authors"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: man-kdiff3.1.docbook:203
+#, no-c-format
+msgid "This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;."
-msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:104
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:111
-#, 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
-#. +> trunk5
-#: index.docbook:115
-#, 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
-#. +> trunk5
-#: index.docbook:119
-#, 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
-#. +> trunk5
-#: index.docbook:122
-#, 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
-#. +> trunk5
-#: index.docbook:125
-#, 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
-#. +> trunk5
-#: index.docbook:128
-#, no-c-format
-msgid "I hope &kdiff3; works for you too. Have fun!"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:130
-#, no-c-format
-msgid "Joachim Eibl (2003)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:135
-#, no-c-format
-msgid "Screenshots and Features"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:136
-#, no-c-format
-msgid "This screenshot shows the difference between two text files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:137
-#, no-c-format
-msgid "(Using an early version of &kdiff3;):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:142
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:155
-#, no-c-format
-msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:164
-#, no-c-format
-msgid "More Features"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:165
-#, no-c-format
-msgid "Line-By-Line And Char-By-Char Diff-Viewer"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:166
-#, no-c-format
-msgid "By using the possibilities 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:174
-#, no-c-format
-msgid "See White-Space Differences At One Glance"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:175
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:184
-#, no-c-format
-msgid "Triple-Diff"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:185
-#, no-c-format
-msgid "Analyze three files and see where they differ."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:186
-#, 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
-#. +> trunk5
-#: index.docbook:189
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:199
-#, no-c-format
-msgid "Comfortable Merge Of Two Or Three Input Files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:200
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:210
-#, no-c-format
-msgid "And ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:212
-#, no-c-format
-msgid "Fast navigation via buttons."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:213
-#, no-c-format
-msgid "A mouse-click into a summary column sync's all windows to show the same position."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:214
-#, no-c-format
-msgid "Select and copy from any window and paste into the merge result window."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:215
-#, no-c-format
-msgid "Overview column that shows where the changes and conflicts are."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:216
-#, no-c-format
-msgid "The colors are adjustable to your specific preferences."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:217
-#, no-c-format
-msgid "Adjustable Tab size."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:218
-#, no-c-format
-msgid "Option to insert spaces instead of tabs."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:219
-#, no-c-format
-msgid "Open files comfortably via dialog or specify files on the command line."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:220
-#, no-c-format
-msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:221
-#, no-c-format
-msgid "Show the line numbers for each line."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:222
-#, no-c-format
-msgid "Paste clipboard or drag text into a diff input window."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:223
-#, no-c-format
-msgid "Networktransparency via KIO."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:224
-#, no-c-format
-msgid "Can be used as diff-viewer in KDevelop 3."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:225
-#, no-c-format
-msgid "Word-wrap for long lines."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:226
-#, no-c-format
-msgid "Support for Unicode, UTF-8 and other codecs."
-msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:259
-#, no-c-format
-msgid "Special case: Files with the same name"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:260
-#, 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.:"
-" --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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:278
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:281
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:284
-#, no-c-format
-msgid "Ignorable command line options"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:285
-#, 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:"
-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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:296
-#, 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
-#. +> trunk5
-#: index.docbook:301
-#, no-c-format
-msgid "Open-Dialog"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:302
-#, no-c-format
-msgid "Since many input files must be selectable, the program has a special open dialog:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:308
-#, no-c-format
-msgid "The open dialog allows you to edit the filenames by hand, selecting a file via the file-browser (\"File...\") or allows you 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
-#. +> trunk5
-#: index.docbook:315
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:320
-#, 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
-#. +> trunk5
-#: index.docbook:324
-#, 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
-#. +> trunk5
-#: index.docbook:330
-#, no-c-format
-msgid "Paste and Drop Input"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:331
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:336
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:339
-#, 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
-#. +> trunk5
-#: index.docbook:343
-#, no-c-format
-msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:346
-#, 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
-#. +> trunk5
-#: index.docbook:352
-#, no-c-format
-msgid "Comparing Files And Interpreting The Information In The Input Windows"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:356
-#, no-c-format
-msgid "Info Line"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:356
-#, 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
-#. +> trunk5
-#: index.docbook:361
-#, 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
-#. +> trunk5
-#: index.docbook:365
-#, no-c-format
-msgid "Coloring"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:365
-#, 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
-#. +> trunk5
-#: index.docbook:369
-#, 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
-#. +> trunk5
-#: index.docbook:375
-#, no-c-format
-msgid "Summary Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:375
-#, 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
-#. +> trunk5
-#: index.docbook:382
-#, 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
-#. +> trunk5
-#: index.docbook:386
-#, no-c-format
-msgid "Overview Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:386
-#, 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
-#. +> trunk5
-#: index.docbook:398
-#, no-c-format
-msgid "Manually Aligning Lines"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:398
-#, 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 <keycombo>&Ctrl;<keycap>Y</keycap></keycombo>). 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
-#. +> trunk5
-#: index.docbook:409
-#, no-c-format
-msgid "Currently merging doesn't support the use of manual diff help."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:411
-#, no-c-format
-msgid "Manually Joining and Splitting Diff Sections"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:411
-#, 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
-#. +> trunk5
-#: index.docbook:414
-#, 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
-#. +> trunk5
-#: index.docbook:419
-#, 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
-#. +> trunk5
-#: index.docbook:426
-#, no-c-format
-msgid "Merging And The Merge Output Editor Window"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:430
-#, 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
-#. +> trunk5
-#: index.docbook:435
-#, 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
-#. +> trunk5
-#: index.docbook:438
-#, no-c-format
-msgid "With only two input files every difference is also a conflict that must be solved manually."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:441
-#, 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
-#. +> trunk5
-#: index.docbook:448
-#, no-c-format
-msgid "The Summary Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:448
-#, 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 \"<Merge Conflict>\", 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
-#. +> trunk5
-#: index.docbook:458
-#, no-c-format
-msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:458
-#, 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
-#. +> trunk5
-#: index.docbook:464
-#, no-c-format
-msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:464
-#, 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
-#. +> trunk5
-#: index.docbook:471
-#, 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
-#. +> trunk5
-#: index.docbook:477
-#, 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
-#. +> trunk5
-#: index.docbook:483
-#, 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 <No src line> 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
-#. +> trunk5
-#: index.docbook:489
-#, no-c-format
-msgid "The text \"<Merge Conflict>\" 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
-#. +> trunk5
-#: index.docbook:493
-#, no-c-format
-msgid "Choosing Input A, B, or C for All Conflicts"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:493
-#, 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
-#. +> trunk5
-#: index.docbook:504
-#, 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
-#. +> trunk5
-#: index.docbook:509
-#, no-c-format
-msgid "Automatic Merge of Version Control Keywords and History (Log)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:509
-#, no-c-format
-msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:516
-#, 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
-#. +> trunk5
-#: index.docbook:524
-#, 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
-#. +> trunk5
-#: index.docbook:529
-#, no-c-format
-msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:535
-#, 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
-#. +> trunk5
-#: index.docbook:540
-#, 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
-#. +> trunk5
-#: index.docbook:546
-#, 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
-#. +> trunk5
-#: index.docbook:552
-#, no-c-format
-msgid "Note that &kdiff3; will remove duplicate history entries. 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
-#. +> trunk5
-#: index.docbook:555
-#, 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
-#. +> trunk5
-#: index.docbook:561
-#, 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
-#. +> trunk5
-#: index.docbook:565
-#, no-c-format
-msgid ""
-"Example: Assume a history that looks like this: <screen>\n"
-"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:569
-#, no-c-format
-msgid "The line with the \"$Log$\"-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
-#. +> trunk5
-#: index.docbook:575
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:583
-#, 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
-#. +> trunk5
-#: index.docbook:588
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:596
-#, 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:"
-msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:608
-#, no-c-format
-msgid "Navigation And Editing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:609
-#, 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
-#. +> trunk5
-#: index.docbook:616
-#, no-c-format
-msgid "You can also use the wheel mouse to scroll up and down."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:618
-#, 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
-#. +> trunk5
-#: index.docbook:622
-#, 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
-#. +> trunk5
-#: index.docbook:626
-#, 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
-#. +> trunk5
-#: index.docbook:634
-#, no-c-format
-msgid "Auto-Advance"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:635
-#, 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- & 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
-#. +> trunk5
-#: index.docbook:651
-#, no-c-format
-msgid "Select, Copy And Paste"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:652
-#, 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
-#. +> trunk5
-#: index.docbook:659
-#, 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
-#. +> trunk5
-#: index.docbook:662
-#, 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
-#. +> trunk5
-#: index.docbook:666
-#, no-c-format
-msgid "In order to select everything in the current window use menu \"Edit\"->\"Select All\" (Ctrl-A)."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:668
-#, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:674
-#, no-c-format
-msgid "\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the selected text."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:677
-#, 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
-#. +> trunk5
-#: index.docbook:687
-#, no-c-format
-msgid "Saving"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:688
-#, 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
-#. +> trunk5
-#: index.docbook:696
-#, 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
-#. +> trunk5
-#: index.docbook:705
-#, no-c-format
-msgid "Finding Strings"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:706
-#, 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
-#. +> trunk5
-#: index.docbook:717
-#, no-c-format
-msgid "Printing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:718
-#, 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
-#. +> trunk5
-#: index.docbook:722
-#, 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
-#. +> trunk5
-#: index.docbook:727
-#, no-c-format
-msgid "All:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:727
-#, no-c-format
-msgid "Print everything."
-msgstr ""
-
-#. Tag: term
-#. +> trunk5
-#: index.docbook:728
-#, no-c-format
-msgid "Current:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:728
-#, no-c-format
-msgid "Print a page starting at the first visible line in the window. (On systems without this option this can be achieved by specifying page number 10000 for printing.)"
-msgstr ""
-
-#. Tag: term
-#. +> trunk5
-#: index.docbook:730
-#, no-c-format
-msgid "Selection:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:730
-#, 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
-#. +> trunk5
-#: index.docbook:736
-#, no-c-format
-msgid "Range:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:736
-#, no-c-format
-msgid "Specify the first and last page."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:739
-#, no-c-format
-msgid "Other important options for printing will be taken from the normal options:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:742
-#, no-c-format
-msgid "Font, font size"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:743
-#, no-c-format
-msgid "Show line numbers"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:744
-#, no-c-format
-msgid "Word wrap"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:745
-#, no-c-format
-msgid "<para>Colors</para>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:746
-#, no-c-format
-msgid "etc."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:748
-#, no-c-format
-msgid "Landscape formatting is also recommended for printing."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:753
-#, no-c-format
-msgid "Options"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:754
-#, 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
-#. +> trunk5
-#: index.docbook:758
-#, no-c-format
-msgid "Font"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:759
-#, 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
-#. +> trunk5
-#: index.docbook:764
-#, no-c-format
-msgid "Italic Font for Deltas:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:764
-#, 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
-#. +> trunk5
-#: index.docbook:771
-#, no-c-format
-msgid "<title>Colors</title>"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:773
-#, no-c-format
-msgid "Foreground color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:773 index.docbook:786
-#, no-c-format
-msgid "Usually black."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:774
-#, no-c-format
-msgid "Background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:774
-#, no-c-format
-msgid "Usually white."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:775
-#, no-c-format
-msgid "Diff Background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:775
-#, no-c-format
-msgid "Usually light gray."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:776
-#, no-c-format
-msgid "Color A:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:776
-#, no-c-format
-msgid "Usually dark blue."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:777
-#, no-c-format
-msgid "Color B:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:777
-#, no-c-format
-msgid "Usually dark green."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:778
-#, no-c-format
-msgid "Color C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:778
-#, no-c-format
-msgid "Usually dark magenta."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:779
-#, no-c-format
-msgid "Conflict Color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:779 index.docbook:784
-#, no-c-format
-msgid "Usually red."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:780
-#, no-c-format
-msgid "Current range background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:780
-#, no-c-format
-msgid "Usually light yellow."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:781
-#, no-c-format
-msgid "Current range diff background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:781 index.docbook:785
-#, no-c-format
-msgid "Usually dark yellow."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:782
-#, no-c-format
-msgid "Color for manually selected diff ranges:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:782
-#, no-c-format
-msgid "Usually orange."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:783
-#, no-c-format
-msgid "Newest file color in directory comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:783
-#, no-c-format
-msgid "Usually green."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:784
-#, no-c-format
-msgid "Oldest file color in directory comparison:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:785
-#, no-c-format
-msgid "Middle age file color in directory comparison:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:786
-#, no-c-format
-msgid "Color for missing files in directory comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:788
-#, no-c-format
-msgid "Changing the colors for directory comparison will be effective only when starting the next directory comparison."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:791
-#, 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
-#. +> trunk5
-#: index.docbook:797
-#, no-c-format
-msgid "Editor Settings"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:799
-#, no-c-format
-msgid "Tab inserts spaces:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:799
-#, 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
-#. +> trunk5
-#: index.docbook:802
-#, no-c-format
-msgid "Tab size:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:802
-#, no-c-format
-msgid "Can be adjusted for your specific needs. Default is 8."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:803
-#, no-c-format
-msgid "Auto indentation:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:803
-#, no-c-format
-msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:805
-#, no-c-format
-msgid "Auto copy selection:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:805
-#, no-c-format
-msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:807
-#, no-c-format
-msgid "Line end style:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:807
-#, 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
-#. +> trunk5
-#: index.docbook:812
-#, no-c-format
-msgid "Diff Settings"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:813
-#, 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
-#. +> trunk5
-#: index.docbook:821
-#, no-c-format
-msgid "Ignore numbers:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:821
-#, 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
-#. +> trunk5
-#: index.docbook:826
-#, no-c-format
-msgid "Ignore C/C++ comments:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:826
-#, no-c-format
-msgid "Default is off. Changes in comments will be treated like changes in white space."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:829
-#, no-c-format
-msgid "Ignore case:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:829
-#, 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
-#. +> trunk5
-#: index.docbook:832 index.docbook:999
-#, no-c-format
-msgid "Preprocessor-Command:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:832 index.docbook:835
-#, no-c-format
-msgid "See <link linkend=\"preprocessors\">next section</link>."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:835 index.docbook:1006
-#, no-c-format
-msgid "Line-Matching Preprocessor-Command:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:838
-#, no-c-format
-msgid "Try Hard:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:838
-#, 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
-#. +> trunk5
-#: index.docbook:845
-#, no-c-format
-msgid "Merge Settings"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:847
-#, no-c-format
-msgid "Auto Advance Delay (ms):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:847
-#, 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
-#. +> trunk5
-#: index.docbook:851
-#, no-c-format
-msgid "White space 2/3-file merge default:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:851
-#, 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
-#. +> trunk5
-#: index.docbook:858
-#, no-c-format
-msgid "Auto merge regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:858
-#, 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
-#. +> trunk5
-#: index.docbook:861
-#, no-c-format
-msgid "Run regular expression auto merge on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:861
-#, 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
-#. +> trunk5
-#: index.docbook:864
-#, no-c-format
-msgid "History start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:864
-#, no-c-format
-msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:869
-#, no-c-format
-msgid "History entry start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:869
-#, 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
-#. +> trunk5
-#: index.docbook:876
-#, no-c-format
-msgid "History merge sorting:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:876
-#, no-c-format
-msgid "Enable version control history sorting."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:879
-#, no-c-format
-msgid "History entry start sort key order:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:879
-#, 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
-#. +> trunk5
-#: index.docbook:887
-#, no-c-format
-msgid "Merge version control history on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:887
-#, no-c-format
-msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:890
-#, no-c-format
-msgid "Max number of history entries:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:890
-#, 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
-#. +> trunk5
-#: index.docbook:893
-#, no-c-format
-msgid "Test your regular expressions"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:893
-#, 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
-#. +> trunk5
-#: index.docbook:899
-#, no-c-format
-msgid "Irrelevant merge command:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:899
-#, 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
-#. +> trunk5
-#: index.docbook:911
-#, no-c-format
-msgid "Directory Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:912
-#, 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
-#. +> trunk5
-#: index.docbook:916
-#, no-c-format
-msgid "Yet there is one option here that is also relevant for saving single files:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:920 index.docbook:1618
-#, no-c-format
-msgid "Backup files:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:920
-#, 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
-#. +> trunk5
-#: index.docbook:928
-#, no-c-format
-msgid "Regional and Language Options"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:930
-#, no-c-format
-msgid "Language:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:930
-#, 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 Frameworks version of &kdiff3;.)"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:932
-#, no-c-format
-msgid "Use the same encoding for everything:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:932
-#, 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
-#. +> trunk5
-#: index.docbook:934
-#, no-c-format
-msgid "Local Encoding:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:934
-#, 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
-#. +> trunk5
-#: index.docbook:936
-#, no-c-format
-msgid "File Encoding for A/B/C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:936
-#, 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
-#. +> trunk5
-#: index.docbook:938
-#, no-c-format
-msgid "File Encoding for Merge Output and Saving:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:938
-#, 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
-#. +> trunk5
-#: index.docbook:940
-#, no-c-format
-msgid "File Encoding for Preprocessor Files:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:940
-#, 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
-#. +> trunk5
-#: index.docbook:942
-#, no-c-format
-msgid "Right To Left Language:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:942
-#, 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
-#. +> trunk5
-#: index.docbook:948
-#, no-c-format
-msgid "Miscellaneous"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:949
-#, no-c-format
-msgid "(These options and actions are available in menus or the buttonbar.)"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:951
-#, no-c-format
-msgid "Show line numbers:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:951
-#, no-c-format
-msgid "You can select if line numbers should be shown for the input files."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:953
-#, no-c-format
-msgid "Show space and tabulator characters for differences:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:953
-#, no-c-format
-msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:955
-#, no-c-format
-msgid "Show white space:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:955
-#, 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
-#. +> trunk5
-#: index.docbook:959
-#, no-c-format
-msgid "Overview options:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:959
-#, 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
-#. +> trunk5
-#: index.docbook:966
-#, no-c-format
-msgid "Word wrap diff windows:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:966
-#, no-c-format
-msgid "Wrap lines when their length would exceed the width of a window."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:969
-#, no-c-format
-msgid "Show Window A/B/C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:969
-#, 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
-#. +> trunk5
-#: index.docbook:972
-#, no-c-format
-msgid "Toggle Split Orientation:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:972
-#, 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
-#. +> trunk5
-#: index.docbook:976
-#, no-c-format
-msgid "Start a merge quickly:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:976
-#, 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
-#. +> trunk5
-#: index.docbook:986
-#, no-c-format
-msgid "Configuring Keyboard-Shortcuts"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:987
-#, no-c-format
-msgid "Currently only the Frameworks-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:994
-#, no-c-format
-msgid "Preprocessor Commands"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:995
-#, no-c-format
-msgid "&kdiff3; supports two preprocessor options."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:999
-#, 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
-#. +> trunk5
-#: index.docbook:1006
-#, 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
-#. +> trunk5
-#: index.docbook:1016
-#, 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."
-"</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
-#. +> trunk5
-#: index.docbook:1039
-#, no-c-format
-msgid "<command>sed</command> Basics"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1040
-#, 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
-#. +> trunk5
-#: index.docbook:1051
-#, no-c-format
-msgid ""
-"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
-"</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"
-"</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."
-msgid "Examples For <command>sed</command>-Use In &kdiff3;"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1068
-#, no-c-format
-msgid "Ignoring Other Types Of Comments"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1069
-#, 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 (') are only important when testing on the command shell as it will otherwise attempt to process some characters. KDiff3 does not do this except for the escape sequences '\\\"' and '\\\\'."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1086
-#, no-c-format
-msgid "Caseinsensitive Diff"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1087
-#, 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
-#. +> trunk5
-#: index.docbook:1097
-#, no-c-format
-msgid "Ignoring Version Control Keywords"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1098
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:1108
-#, 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
-#. +> trunk5
-#: index.docbook:1115
-#, no-c-format
-msgid "Ignoring Numbers"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1116
-#, 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"
-"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1124
-#, no-c-format
-msgid "Ignoring Certain Columns"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1125
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:1135
-#, no-c-format
-msgid "Combining Several Substitutions"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1136
-#, 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:"
-"</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:"
-msgid "The data is piped through all internal and external preprocessors in the following order:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1162
-#, no-c-format
-msgid "Normal preprocessor,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1163
-#, no-c-format
-msgid "Line-Matching-Preprocessor,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1164
-#, no-c-format
-msgid "Ignore case (conversion to uppercase),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1165
-#, no-c-format
-msgid "Detection of C/C++ comments,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1166
-#, no-c-format
-msgid "Ignore numbers,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1167
-#, no-c-format
-msgid "Ignore white space"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1169
-#, 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
-#. +> trunk5
-#: index.docbook:1172
-#, 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
-#. +> trunk5
-#: index.docbook:1178
-#, no-c-format
-msgid "Warning"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1179
-#, 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
-#. +> trunk5
-#: index.docbook:1183
-#, 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 want 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
-#. +> trunk5
-#: index.docbook:1198
-#, no-c-format
-msgid "Directory Comparison and Merge with &kdiff3;"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1199
-#, no-c-format
-msgid "Introduction into Directory Comparison and Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1200
-#, 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
-#. +> trunk5
-#: index.docbook:1204
-#, 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
-#. +> trunk5
-#: index.docbook:1218
-#, no-c-format
-msgid "To err is human, but to really mess things up you need a computer."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1220
-#, no-c-format
-msgid "So this is what this program can do for you: &kdiff3; ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1224
-#, no-c-format
-msgid "... reads and compares two or three directories recursively,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1225
-#, no-c-format
-msgid "... takes special care of symbolic links,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1226
-#, no-c-format
-msgid "... lets you browse files on mouse double click,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1227
-#, no-c-format
-msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1229
-#, no-c-format
-msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1231
-#, no-c-format
-msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1233
-#, no-c-format
-msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1234
-#, no-c-format
-msgid "... lets you continue the merge after manual interaction with key F7,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1235
-#, no-c-format
-msgid "... optionally creates backups, with the \".orig\" extension,"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1240
-#, no-c-format
-msgid "Starting Directory Comparison Or Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1241
-#, 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."
-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
-#. +> trunk5
-#: index.docbook:1262
-#, 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
-#. +> trunk5
-#: index.docbook:1269
-#, no-c-format
-msgid "Directory Merge Visible Information"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1270
-#, 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
-#. +> trunk5
-#: index.docbook:1274
-#, no-c-format
-msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1281
-#, no-c-format
-msgid "... and details about the currently selected item on the right:"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1289
-#, no-c-format
-msgid "The Name Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1290
-#, 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
-#. +> trunk5
-#: index.docbook:1293
-#, 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
-#. +> trunk5
-#: index.docbook:1299
-#, 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
-#. +> trunk5
-#: index.docbook:1303
-#, 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
-#. +> trunk5
-#: index.docbook:1308
-#, no-c-format
-msgid "Normal file"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1309
-#, no-c-format
-msgid "Normal directory (directory-image)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1310
-#, no-c-format
-msgid "Link to a file (file-image with a link arrow)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1311
-#, no-c-format
-msgid "Link to a directory (directory-image with a link arrow)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1313
-#, 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
-#. +> trunk5
-#: index.docbook:1322
-#, no-c-format
-msgid "The Columns A/B/C and the Coloring Scheme"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1323
-#, 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
-#. +> trunk5
-#: index.docbook:1328
-#, no-c-format
-msgid "Black: This item doesn't exist in this directory."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1329
-#, no-c-format
-msgid "Green: Newest item."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1330
-#, no-c-format
-msgid "Yellow: Older than green, newer than red."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1331
-#, no-c-format
-msgid "Red: Oldest item."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1333
-#, 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
-#. +> trunk5
-#: index.docbook:1336
-#, 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
-#. +> trunk5
-#: index.docbook:1340
-#, 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
-#. +> trunk5
-#: index.docbook:1347
-#, no-c-format
-msgid "The Operation Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1348
-#, 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
-#. +> trunk5
-#: index.docbook:1359
-#, no-c-format
-msgid "Three directory-merge (\"A\" is treated as older base of both)."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1360
-#, no-c-format
-msgid "Two directory-merge."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1361
-#, no-c-format
-msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1363
-#, no-c-format
-msgid "In three directory merge the operation proposal will be: If for an item ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1367
-#, no-c-format
-msgid "... all three directories are equal: Copy from C"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1368
-#, 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
-#. +> trunk5
-#: index.docbook:1370
-#, 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
-#. +> trunk5
-#: index.docbook:1372
-#, 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
-#. +> trunk5
-#: index.docbook:1374
-#, no-c-format
-msgid "... only A exists: Delete the destination (if exists)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1375
-#, no-c-format
-msgid "... only B exists: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1376
-#, no-c-format
-msgid "... only C exists: Copy from C"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1377
-#, no-c-format
-msgid "... A, B and C are not equal: Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1378
-#, 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
-#. +> trunk5
-#: index.docbook:1382
-#, no-c-format
-msgid "In two directory merge the operation proposal will be: If for an item ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1386
-#, no-c-format
-msgid "... both directories are equal: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1387
-#, no-c-format
-msgid "... A exists, but not B: Copy from A"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1388
-#, no-c-format
-msgid "... B exists, but not A: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1389
-#, no-c-format
-msgid "... A and B exist but are not equal: Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1390 index.docbook:1407
-#, 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
-#. +> trunk5
-#: index.docbook:1394
-#, 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
-#. +> trunk5
-#: index.docbook:1401
-#, no-c-format
-msgid "... both directories are equal: Nothing will be done."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1402
-#, no-c-format
-msgid "... A exists, but not B: Copy A to B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1403
-#, no-c-format
-msgid "... B exists, but not A: Copy B to A"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1404
-#, 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
-#. +> trunk5
-#: index.docbook:1411
-#, 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
-#. +> trunk5
-#: index.docbook:1420
-#, no-c-format
-msgid "The Status Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1421
-#, 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
-#. +> trunk5
-#: index.docbook:1430
-#, no-c-format
-msgid "Statistics Columns"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1431
-#, 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
-#. +> trunk5
-#: index.docbook:1438
-#, no-c-format
-msgid "Selecting Listed Files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1439
-#, 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
-#. +> trunk5
-#: index.docbook:1443
-#, no-c-format
-msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1444
-#, no-c-format
-msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1445
-#, no-c-format
-msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1446
-#, no-c-format
-msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1447
-#, no-c-format
-msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1449
-#, 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
-#. +> trunk5
-#: index.docbook:1454
-#, 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
-#. +> trunk5
-#: index.docbook:1457
-#, 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
-#. +> trunk5
-#: index.docbook:1465
-#, no-c-format
-msgid "Doing A Directory Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1466
-#, 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
-#. +> trunk5
-#: index.docbook:1470
-#, no-c-format
-msgid "Be aware that if you didn't specify a destination directory explicitly, 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
-#. +> trunk5
-#: index.docbook:1474
-#, 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
-#. +> trunk5
-#: index.docbook:1481
-#, no-c-format
-msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1483
-#, no-c-format
-msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1484
-#, no-c-format
-msgid "\"Exclude Hidden Files\""
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1485
-#, no-c-format
-msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1487
-#, 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
-#. +> trunk5
-#: index.docbook:1492
-#, 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
-#. +> trunk5
-#: index.docbook:1496
-#, no-c-format
-msgid "If you are satisfied so far, the rest is easy."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1498
-#, 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
-#. +> trunk5
-#: index.docbook:1503
-#, 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
-#. +> trunk5
-#: index.docbook:1507
-#, 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
-#. +> trunk5
-#: index.docbook:1512
-#, 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
-#. +> trunk5
-#: index.docbook:1514
-#, no-c-format
-msgid "Otherwise select \"Do it\" to really start merging."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1516
-#, 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
-#. +> trunk5
-#: index.docbook:1520
-#, 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
-#. +> trunk5
-#: index.docbook:1524
-#, 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
-#. +> trunk5
-#: index.docbook:1531
-#, no-c-format
-msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1534
-#, 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
-#. +> trunk5
-#: index.docbook:1544
-#, no-c-format
-msgid "Options for Comparing and Merging Directories"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1545
-#, no-c-format
-msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1551
-#, no-c-format
-msgid "Recursive Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1551
-#, no-c-format
-msgid "Select whether to search directories recursively."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1553
-#, no-c-format
-msgid "File Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1553
-#, 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
-#. +> trunk5
-#: index.docbook:1557
-#, no-c-format
-msgid "File Anti-Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1557
-#, 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
-#. +> trunk5
-#: index.docbook:1561
-#, no-c-format
-msgid "Directory Anti-Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1561
-#, 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
-#. +> trunk5
-#: index.docbook:1565
-#, no-c-format
-msgid "Use CVS-Ignore:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1565
-#, 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
-#. +> trunk5
-#: index.docbook:1570
-#, no-c-format
-msgid "Find Hidden Files and Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1570
-#, 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
-#. +> trunk5
-#: index.docbook:1574
-#, no-c-format
-msgid "Follow File Links:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1574
-#, 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
-#. +> trunk5
-#: index.docbook:1577
-#, no-c-format
-msgid "Follow Directory Links:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1577
-#, 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
-#. +> trunk5
-#: index.docbook:1584
-#, no-c-format
-msgid "Case Sensitive Filename Comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1584
-#, no-c-format
-msgid "Default is false on Windows, true for other operating systems."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1586
-#, no-c-format
-msgid "File Comparison Mode:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1588
-#, no-c-format
-msgid "Binary Comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1588
-#, no-c-format
-msgid "This is the default file comparison mode."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1591
-#, no-c-format
-msgid "Full Analysis:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1591
-#, 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
-#. +> trunk5
-#: index.docbook:1598
-#, no-c-format
-msgid "Trust the modification date:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1598
-#, 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
-#. +> trunk5
-#: index.docbook:1602
-#, no-c-format
-msgid "Trust the size:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1602
-#, 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
-#. +> trunk5
-#: index.docbook:1609
-#, no-c-format
-msgid "Synchronize Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1609
-#, 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
-#. +> trunk5
-#: index.docbook:1614
-#, no-c-format
-msgid "Copy newer instead of merging:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1614
-#, 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
-#. +> trunk5
-#: index.docbook:1618
-#, 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
-#. +> trunk5
-#: index.docbook:1626
-#, no-c-format
-msgid "Other Functions in Directory Merge Window"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1627
-#, no-c-format
-msgid "Split/Full Screen Mode"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1628
-#, 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 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
-#. +> trunk5
-#: index.docbook:1637
-#, no-c-format
-msgid "Comparing or Merging a Single File"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1638
-#, 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
-#. +> trunk5
-#: index.docbook:1645
-#, 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
-#. +> trunk5
-#: index.docbook:1650
-#, no-c-format
-msgid "Comparing or Merging Files with Different Names"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1651
-#, 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
-#. +> trunk5
-#: index.docbook:1654
-#, 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
-#. +> trunk5
-#: index.docbook:1658
-#, no-c-format
-msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
-#. +> trunk5
-#: index.docbook:1662
-#, 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
-#. +> trunk5
-#: index.docbook:1670
-#, no-c-format
-msgid "Miscellaneous Topics"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1672
-#, no-c-format
-msgid "Networktransparency via KIO"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1673
-#, no-c-format
-msgid "KIO-Slaves"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1674
-#, no-c-format
-msgid "The KIO library from Frameworks 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."
-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
-#. +> trunk5
-#: index.docbook:1686
-#, no-c-format
-msgid "Other KIO-slaves that are interesting are:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1690
-#, no-c-format
-msgid "Files from the WWW (http:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1691
-#, no-c-format
-msgid "Files from the FTP (ftp:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1692
-#, no-c-format
-msgid "Encrypted file transfer (fish:, sftp:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1693
-#, no-c-format
-msgid "Windows-resources (smb:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1694
-#, no-c-format
-msgid "Local files (file:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1696
-#, no-c-format
-msgid "Other things that are possible, but probably less useful are:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1700
-#, no-c-format
-msgid "Man-pages (man:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1701
-#, no-c-format
-msgid "Info-pages (info:),"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1705
-#, no-c-format
-msgid "How To Write URLs"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1706
-#, 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
-#. +> trunk5
-#: index.docbook:1711
-#, 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
-#. +> trunk5
-#: index.docbook:1714
-#, 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
-#. +> trunk5
-#: index.docbook:1717
-#, no-c-format
-msgid "When URLs don't work as expected, try to open them in Konqueror first."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1724
-#, no-c-format
-msgid "Capabilities of KIO-Slaves"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1725
-#, no-c-format
-msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1727
-#, 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
-#. +> trunk5
-#: index.docbook:1732
-#, no-c-format
-msgid "Sometimes there is no support for links."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1734
-#, 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
-#. +> trunk5
-#: index.docbook:1737
-#, no-c-format
-msgid "Can't always determine the filesize."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1739
-#, no-c-format
-msgid "Limited support for permissions."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1741
-#, 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
-#. +> trunk5
-#: index.docbook:1751
-#, no-c-format
-msgid "Using &kdiff3; as a KPart"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1752
-#, no-c-format
-msgid "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1754
-#, 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 context menu."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1758
-#, no-c-format
-msgid "&kdiff3; normally requires two complete files as input. When used as part &kdiff3; will assume that the input file 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
-#. +> trunk5
-#: index.docbook:1764
-#, no-c-format
-msgid "In &dolphin; you can select a patch-file and select \"Preview in\"-\"KDiff3Part\" from the context menu. 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
-#. +> trunk5
-#: index.docbook:1769
-#, 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
-#. +> trunk5
-#: index.docbook:1776
-#, no-c-format
-msgid "Using &kdiff3; as a Git Diff and Merging Tool"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1777
-#, no-c-format
-msgid "&kdiff3; can be used as a <ulink url=\"https://git-scm.com/\">Git</ulink> diff and merge tool."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1780
-#, no-c-format
-msgid "Just add the following lines into your <filename>gitconfig</filename> file."
-msgstr ""
-
-#. Tag: programlisting
-#. +> trunk5
-#: index.docbook:1783
-#, no-c-format
-msgid ""
-"[diff]\n"
-" tool = kdiff3\n"
-"[difftool \"kdiff3\"]\n"
-" path = <path to kdiff3 binary in your system>\n"
-"[difftool]\n"
-" prompt = false\n"
-" keepBackup = false\n"
-" trustExitCode = false\n"
-"[merge]\n"
-" tool = kdiff3\n"
-"[mergetool]\n"
-" prompt = false\n"
-" keepBackup = false\n"
-" keepTemporaries = false\n"
-"[mergetool \"kdiff3\"]\n"
-" path = <path to kdiff3 binary in your system>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1784
-#, no-c-format
-msgid "Then to see the difference between two commits use <userinput>git difftool <replaceable>first_hash</replaceable> <replaceable>second_hash</replaceable> --tool=kdiff3 --cc <replaceable>some_file_in_the_git_tree</replaceable></userinput>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1787
-#, no-c-format
-msgid "To merge a branch with &kdiff3; use <userinput>git merge <replaceable>branch_name</replaceable> && git mergetool --tool=kdiff3</userinput>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1790
-#, no-c-format
-msgid "After resolving merging conflicts in the <link linkend=\"synchronise_views\">usual way</link> it is enough to commit the changes to do the job."
-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
-#. +> trunk5
-#: index.docbook:1811
-#, no-c-format
-msgid "Why did I release it under GPL?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1813
-#, 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
-#. +> trunk5
-#: index.docbook:1819
-#, no-c-format
-msgid "Some buttons and functions are missing. What's wrong?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1821
-#, no-c-format
-msgid "You compiled from source but you probably didn't specify the correct prefix for the installation. By default cmake wants to install in /usr/local but then the user-interface resource file (i.e. kdiff3ui.rc) can't be found. The README-file contains more information about the correct prefix."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1828
-#, no-c-format
-msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1831
-#, 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
-#. +> trunk5
-#: index.docbook:1839
-#, no-c-format
-msgid "Why must all conflicts be solved before the merge result can be saved?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1841
-#, 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
-#. +> trunk5
-#: index.docbook:1850
-#, 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
-#. +> trunk5
-#: index.docbook:1852
-#, no-c-format
-msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1856
-#, no-c-format
-msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1858
-#, 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
-#. +> trunk5
-#: index.docbook:1864
-#, no-c-format
-msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1867
-#, no-c-format
-msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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
-#. +> trunk5
-#: index.docbook:1878
-#, no-c-format
-msgid "Why doesn't &kdiff3; support syntax-highlighting?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1880
-#, 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
-#. +> trunk5
-#: index.docbook:1885
-#, no-c-format
-msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1887
-#, 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
-#. +> trunk5
-#: index.docbook:1890
-#, 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
-#. +> trunk5
-#: index.docbook:1896
-#, 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
-#. +> trunk5
-#: index.docbook:1900
-#, 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 clipboard 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
-#. +> trunk5
-#: index.docbook:1908
-#, no-c-format
-msgid "Where has the directory option \"List only deltas\" gone?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1910
-#, 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
-#. +> trunk5
-#: index.docbook:1915
-#, no-c-format
-msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1918
-#, 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
-#. +> trunk5
-#: index.docbook:1924
-#, no-c-format
-msgid "There is so much information here, but your question is still not answered?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1926
-#, no-c-format
-msgid "Please send me your question. I appreciate every comment."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1935
-#, no-c-format
-msgid "Credits and License"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1937
-#, no-c-format
-msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1940
-#, no-c-format
-msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1943
-#, no-c-format
-msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
-msgid "More detailed user documentation is available from <ulink url=\"help:/kdiff3\">help:/kdiff3</ulink> (either enter this &URL; into &konqueror;, or run <userinput><command>khelpcenter</command> <parameter>help:/kdiff3</parameter></userinput>)."
-msgstr ""
-
-#. Tag: member
-#. +> trunk5
-#: man-kdiff3.1.docbook:196
-#, no-c-format
-msgid "kf5options(7)"
-msgstr ""
-
-#. Tag: member
-#. +> trunk5
-#: man-kdiff3.1.docbook:197
-#, no-c-format
-msgid "qt5options(7)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: man-kdiff3.1.docbook:202
-#, no-c-format
-msgid "Authors"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: man-kdiff3.1.docbook:203
-#, no-c-format
-msgid "This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;."
+"When in Auto-Advance mode the result of the current selection is shown \n"
+"for the specified time, before jumping to the next conflict. Range: 0-2000 ms"
+msgstr ""
+"У режиму аутоматског напредовања резултат текућег избора приказује се \n"
+"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/."
+
+#. +> trunk5
+#: optiondialog.cpp:1068
+#, kde-format
+msgid "Show info dialogs"
+msgstr "Приказуј информативне дијалоге"
+
+#. +> trunk5
+#: optiondialog.cpp:1071
+#, kde-format
+msgid "Show a dialog with information about the number of conflicts."
+msgstr "Приказује дијалог са информацијом о броју сукоба."
+
+#. +> trunk5
+#: optiondialog.cpp:1074
+#, kde-format
+msgid "White space 2-file merge default:"
+msgstr "Подразумевано стапање празнина два фајла:"
+
+#. +> trunk5
+#: optiondialog.cpp:1079 optiondialog.cpp:1092
+#, kde-format
+msgid "Manual Choice"
+msgstr "Ручни избор"
+
+#. +> trunk5
+#: optiondialog.cpp:1083 optiondialog.cpp:1097
+#, kde-format
+msgid "Allow the merge algorithm to automatically select an input for white-space-only changes."
+msgstr "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама."
+
+#. +> trunk5
+#: optiondialog.cpp:1087
+#, kde-format
+msgid "White space 3-file merge default:"
+msgstr "Подразумевано стапање празнина три фајла:"
+
+#. +> trunk5
+#: optiondialog.cpp:1101
+#, kde-format
+msgid "Automatic Merge Regular Expression"
+msgstr "Регуларни израз за аутоматско стапање"
+
+#. +> trunk5
+#: optiondialog.cpp:1109 smalldialogs.cpp:449
+#, kde-format
+msgid "Auto merge regular expression:"
+msgstr "Регуларни израз за аутоматско стапање:"
+
+#. +> trunk5
+#: optiondialog.cpp:1114
+#, kde-format
+msgid ""
+"Regular expression for lines where KDiff3 should automatically choose one source.\n"
+"When a line with a conflict matches the regular expression then\n"
+"- if available - C, otherwise B will be chosen."
+msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б."
+
+#. +> trunk5
+#: optiondialog.cpp:1120
+#, kde-format
+msgid "Run regular expression auto merge on merge start"
+msgstr "Аутоматски стопи по регуларном изразу на почетку стапања"
+
+#. +> trunk5
+#: optiondialog.cpp:1123
+#, kde-format
+msgid ""
+"Run the merge for auto merge regular expressions\n"
+"immediately when a merge starts.\n"
+msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n"
+
+#. +> trunk5
+#: optiondialog.cpp:1128
+#, kde-format
+msgid "Version Control History Merging"
+msgstr "Стапање историјата управљања верзијама"
+
+#. +> trunk5
+#: optiondialog.cpp:1136 smalldialogs.cpp:476
+#, kde-format
+msgid "History start regular expression:"
+msgstr "Регуларни израз за почетак историјата:"
+
+# literal-segment: Log
+#. +> trunk5
+#: optiondialog.cpp:1141
+#, kde-format
+msgid ""
+"Regular expression for the start of the version control history entry.\n"
+"Usually this line contains the \"$Log$\" keyword.\n"
+"Default value: \".*\\$Log.*\\$.*\""
+msgstr ""
+"Регуларни израз за почетак уноса у историјату управљања верзијама.\n"
+"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n"
+"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/."
+
+#. +> trunk5
+#: optiondialog.cpp:1147 smalldialogs.cpp:504
+#, kde-format
+msgid "History entry start regular expression:"
+msgstr "Регуларни израз за почетак уноса историјата:"
+
+#. +> trunk5
+#: optiondialog.cpp:1160
+#, kde-format
+msgid ""
+"A version control history entry consists of several lines.\n"
+"Specify the regular expression to detect the first line (without the leading comment).\n"
+"Use parentheses to group the keys you want to use for sorting.\n"
+"If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
+"See the documentation for details."
+msgstr ""
+"Унос у историјату управљања верзијама чини неколико редова.\n"
+"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n"
+"Користите заграде да групишете кључеве по којима ће се ређати.\n"
+"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n"
+"Детаље потражите у документацији."
+
+#. +> trunk5
+#: optiondialog.cpp:1168
+#, kde-format
+msgid "History merge sorting"
+msgstr "Ређање у стапању историјата"
+
+#. +> trunk5
+#: optiondialog.cpp:1171
+#, kde-format
+msgid "Sort version control history by a key."
+msgstr "Ређа историјат управљања верзијама по кључу."
+
+#. +> trunk5
+#: optiondialog.cpp:1181
+#, kde-format
+msgid "History entry start sort key order:"
+msgstr "Редослед ређања за кључеве уноса историјата:"
+
+#. +> trunk5
+#: optiondialog.cpp:1186
+#, kde-format
+msgid ""
+"Each pair of parentheses used in the regular expression for the history start entry\n"
+"groups a key that can be used for sorting.\n"
+"Specify the list of keys (that are numbered in order of occurrence\n"
+"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
+"If left empty, then no sorting will be done.\n"
+"See the documentation for details."
+msgstr ""
+"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n"
+"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n"
+"Ако се остави празно, ређање се не спроводи.\n"
+"Детаље потражите у документацији."
+
+#. +> trunk5
+#: optiondialog.cpp:1197
+#, kde-format
+msgid "Merge version control history on merge start"
+msgstr "Стопи историјат управљања верзијама на почетку стапања"
+
+#. +> trunk5
+#: optiondialog.cpp:1200
+#, kde-format
+msgid "Run version control history automerge on merge start."
+msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања."
+
+#. +> trunk5
+#: optiondialog.cpp:1204
+#, kde-format
+msgid "Max number of history entries:"
+msgstr "Највећи број уноса историјата:"
+
+# skip-rule: t-cut
+#. +> trunk5
+#: optiondialog.cpp:1208
+#, kde-format
+msgid "Cut off after specified number. Use -1 for infinite number of entries."
+msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса."
+
+# >> @action:button
+#. +> trunk5
+#: optiondialog.cpp:1212
+#, kde-format
+msgid "Test your regular expressions"
+msgstr "Испробај регуларне изразе"
+
+#. +> trunk5
+#: optiondialog.cpp:1217
+#, kde-format
+msgid "Irrelevant merge command:"
+msgstr "Наредба при безначајном стапању:"
+
+#. +> trunk5
+#: optiondialog.cpp:1222
+#, kde-format
+msgid ""
+"If specified this script is run after automerge\n"
+"when no other relevant changes were detected.\n"
+"Called with the parameters: filename1 filename2 filename3"
+msgstr ""
+"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n"
+"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3"
+
+#. +> trunk5
+#: optiondialog.cpp:1227
+#, kde-format
+msgid "Auto save and quit on merge without conflicts"
+msgstr "Аутоматски сачувај и напусти при стапању без сукоба"
+
+#. +> trunk5
+#: optiondialog.cpp:1231
+#, kde-format
+msgid ""
+"If KDiff3 was started for a file-merge from the command line and all\n"
+"conflicts are solvable without user interaction then automatically save and quit.\n"
+"(Similar to command line option \"--auto\".)"
+msgstr ""
+"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n"
+"Слично опцији командне линије --auto."
+
+#. +> trunk5
+#: optiondialog.cpp:1242 optiondialog.cpp:1243
+#, kde-format
+msgid "Directory"
+msgstr "Фасцикла"
+
+#. +> trunk5
+#: optiondialog.cpp:1255
+#, kde-format
+msgid "Recursive directories"
+msgstr "Рекурзивно кроз фасцикле"
+
+#. +> trunk5
+#: optiondialog.cpp:1258
+#, kde-format
+msgid "Whether to analyze subdirectories or not."
+msgstr "Да ли анализирати потфасцикле."
+
+#. +> trunk5
+#: optiondialog.cpp:1260
+#, kde-format
+msgid "File pattern(s):"
+msgstr "Обрасци фајлова:"
+
+#. +> trunk5
+#: optiondialog.cpp:1266
+#, kde-format
+msgid ""
+"Pattern(s) of files to be analyzed. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Обрасци за фајлове које треба анализирати.\n"
+"Џокери: ‘*’ и ‘?’\n"
+"Више образаца наводите са тачка-запетом као раздвајачем."
+
+#. +> trunk5
+#: optiondialog.cpp:1271
+#, kde-format
+msgid "File-anti-pattern(s):"
+msgstr "Противобрасци фајлова:"
+
+#. +> trunk5
+#: optiondialog.cpp:1277
+#, kde-format
+msgid ""
+"Pattern(s) of files to be excluded from analysis. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Обрасци за фајлове које треба искључити из анализе.\n"
+"Џокери: ‘*’ и ‘?’\n"
+"Више образаца наводите са тачка-запетом као раздвајачем."
+
+#. +> trunk5
+#: optiondialog.cpp:1282
+#, kde-format
+msgid "Dir-anti-pattern(s):"
+msgstr "Противобрасци фасцикли:"
+
+#. +> trunk5
+#: optiondialog.cpp:1288
+#, kde-format
+msgid ""
+"Pattern(s) of directories to be excluded from analysis. \n"
+"Wildcards: '*' and '?'\n"
+"Several Patterns can be specified by using the separator: ';'"
+msgstr ""
+"Обрасци за фасцикле које треба искључити из анализе.\n"
+"Џокери: ‘*’ и ‘?’\n"
+"Више образаца наводите са тачка-запетом као раздвајачем."
+
+#. +> trunk5
+#: optiondialog.cpp:1293
+#, kde-format
+msgid "Use .cvsignore"
+msgstr "Користи ~!/.cvsignore/"
+
+#. +> trunk5
+#: optiondialog.cpp:1297
+#, kde-format
+msgid ""
+"Extends the antipattern to anything that would be ignored by CVS.\n"
+"Via local \".cvsignore\" files this can be directory specific."
+msgstr ""
+"Проширује противобрасце на све што би игнорисао &cvs-n;.\n"
+"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли."
+
+#. +> trunk5
+#: optiondialog.cpp:1301
+#, kde-format
+msgid "Find hidden files and directories"
+msgstr "Пронађи скривене фајлове и фасцикле"
+
+#. +> trunk5
+#: optiondialog.cpp:1305
+#, kde-format
+msgid "Finds files and directories with the hidden attribute."
+msgstr "Налази фајлове и фасцикле са атрибутом скривености."
+
+#. +> trunk5
+#: optiondialog.cpp:1307
+#, kde-format
+msgid "Finds files and directories starting with '.'."
+msgstr "Налази фајлове и фасцикле које почињу са ‘.’."
+
+#. +> trunk5
+#: optiondialog.cpp:1311
+#, kde-format
+msgid "Follow file links"
+msgstr "Прати везе фајлова"
+
+#. +> trunk5
+#: optiondialog.cpp:1315
+#, kde-format
+msgid ""
+"On: Compare the file the link points to.\n"
+"Off: Compare the links."
+msgstr ""
+"Укључено: пореди фајлове на које показују везе.\n"
+"Искључено: пореди везе."
+
+#. +> trunk5
+#: optiondialog.cpp:1319
+#, kde-format
+msgid "Follow directory links"
+msgstr "Прати везе фасцикли"
+
+#. +> trunk5
+#: optiondialog.cpp:1323
+#, kde-format
+msgid ""
+"On: Compare the directory the link points to.\n"
+"Off: Compare the links."
+msgstr ""
+"Укључено: пореди фасцикле на које показују везе.\n"
+"Искључено: пореди везе."
+
+#. +> trunk5
+#: optiondialog.cpp:1332
+#, kde-format
+msgid "Case sensitive filename comparison"
+msgstr "Поређење имена фајлова разликује величину слова"
+
+#. +> trunk5
+#: optiondialog.cpp:1336
+#, kde-format
+msgid ""
+"The directory comparison will compare files or directories when their names match.\n"
+"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
+msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено."
+
+#. +> trunk5
+#: optiondialog.cpp:1340
+#, fuzzy, kde-format
+#| msgid "Unfold {-All Subdirs-}{+all subdirectories on load+}"
+msgid "Unfold all subdirectories on load"
+msgstr "Рашири све потфасцикле"
+
+#. +> trunk5
+#: optiondialog.cpp:1344
+#, kde-format
+msgid ""
+"On: Unfold all subdirectories when starting a directory diff.\n"
+"Off: Leave subdirectories folded."
+msgstr ""
+
+#. +> trunk5
+#: optiondialog.cpp:1348
+#, kde-format
+msgid "Skip directory status report"
+msgstr ""
+
+#. +> trunk5
+#: optiondialog.cpp:1352
+#, kde-format
+msgid ""
+"On: Do not show the Directory Comparison Status.\n"
+"Off: Show the status dialog on start."
+msgstr ""
+
+#. +> trunk5
+#: optiondialog.cpp:1356
+#, kde-format
+msgid "File Comparison Mode"
+msgstr "Режим поређења фајлова"
+
+#. +> trunk5
+#: optiondialog.cpp:1361
+#, kde-format
+msgid "Binary comparison"
+msgstr "Бинарно поређење"
+
+#. +> trunk5
+#: optiondialog.cpp:1363
+#, kde-format
+msgid "Binary comparison of each file. (Default)"
+msgstr "Бинарно поређење за сваки фајл (подразумевано)."
+
+#. +> trunk5
+#: optiondialog.cpp:1366
+#, kde-format
+msgid "Full analysis"
+msgstr "Пуна анализа"
+
+#. +> trunk5
+#: optiondialog.cpp:1368
+#, kde-format
+msgid ""
+"Do a full analysis and show statistics information in extra columns.\n"
+"(Slower than a binary comparison, much slower for binary files.)"
+msgstr ""
+"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n"
+"Спорије него бинарно поређење, много спорије за бинарне фајлове."
+
+#. +> trunk5
+#: optiondialog.cpp:1372
+#, kde-format
+msgid "Trust the size and modification date (unsafe)"
+msgstr "Веруј величини и датуму измене (несигурно)"
+
+#. +> trunk5
+#: optiondialog.cpp:1374
+#, kde-format
+msgid ""
+"Assume that files are equal if the modification date and file length are equal.\n"
+"Files with equal contents but different modification dates will appear as different.\n"
+"Useful for big directories or slow networks."
+msgstr ""
+"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n"
+"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n"
+"Корисно за велике фасцикле или споре мреже."
+
+#. +> trunk5
+#: optiondialog.cpp:1379
+#, kde-format
+msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)"
+msgstr "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)"
+
+#. +> trunk5
+#: optiondialog.cpp:1381
+#, kde-format
+msgid ""
+"Assume that files are equal if the modification date and file length are equal.\n"
+"If the dates are not equal but the sizes are, use binary comparison.\n"
+"Useful for big directories or slow networks."
+msgstr ""
+"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n"
+"Ако датуми нису исти али величина јесте, бинарно упоређује.\n"
+"Корисно за велике фасцикле или споре мреже."
+
+#. +> trunk5
+#: optiondialog.cpp:1386
+#, kde-format
+msgid "Trust the size (unsafe)"
+msgstr "Веруј величини (несигурно)"
+
+#. +> trunk5
+#: optiondialog.cpp:1388
+#, kde-format
+msgid ""
+"Assume that files are equal if their file lengths are equal.\n"
+"Useful for big directories or slow networks when the date is modified during download."
+msgstr ""
+"Претпоставља да су фајлови једнаки ако им једнаке величине.\n"
+"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања."
+
+#. +> trunk5
+#: optiondialog.cpp:1395
+#, kde-format
+msgid "Synchronize directories"
+msgstr "Синхронизуј фасцикле"
+
+#. +> trunk5
+#: optiondialog.cpp:1399
+#, kde-format
+msgid ""
+"Offers to store files in both directories so that\n"
+"both directories are the same afterwards.\n"
+"Works only when comparing two directories without specifying a destination."
+msgstr ""
+"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n"
+"Ради само када се пореде две фасцикле без задавања одредишта."
+
+#. +> trunk5
+#: optiondialog.cpp:1405
+#, kde-format
+msgid "White space differences considered equal"
+msgstr "Разлике у празнинама сматрају се једнаким"
+
+#. +> trunk5
+#: optiondialog.cpp:1409
+#, kde-format
+msgid ""
+"If files differ only by white space consider them equal.\n"
+"This is only active when full analysis is chosen."
+msgstr ""
+"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n"
+"Ово је активно само када се изабере пуна анализа."
+
+# >> copy newer file
+#. +> trunk5
+#: optiondialog.cpp:1415
+#, kde-format
+msgid "Copy newer instead of merging (unsafe)"
+msgstr "Копирај новији уместо стапања (несигурно)"
+
+#. +> trunk5
+#: optiondialog.cpp:1419
+#, fuzzy, kde-format
+#| msgid ""
+#| "Don't look inside, just take the newer file.\n"
+#| "(Use this only if you know what you are doing!)\n"
+#| "Only effective when comparing two directories."
+msgid ""
+"Do not look inside, just take the newer file.\n"
+"(Use this only if you know what you are doing!)\n"
+"Only effective when comparing two directories."
+msgstr ""
+"Не гледа садржај, само узима новији фајл.\n"
+"Користите ово само ако знате шта радите!\n"
+"Има ефекта само при поређењу две фасцикле."
+
+#. +> trunk5
+#: optiondialog.cpp:1424
+#, kde-format
+msgid "Backup files (.orig)"
+msgstr "Прави резерве фајлова (~!/.orig/)"
+
+#. +> trunk5
+#: optiondialog.cpp:1428
+#, kde-format
+msgid ""
+"If a file would be saved over an old file, then the old file\n"
+"will be renamed with a '.orig' extension instead of being deleted."
+msgstr "Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан."
+
+# rewrite-msgid: /Regional/Locale/
+#. +> trunk5
+#: optiondialog.cpp:1504 optiondialog.cpp:1505
+#, kde-format
+msgid "Regional Settings"
+msgstr "Поставке локалитета"
+
+#. +> trunk5
+#: optiondialog.cpp:1519
+#, kde-format
+msgid "Use the same encoding for everything:"
+msgstr "Исто кодирање за све:"
+
+#. +> trunk5
+#: optiondialog.cpp:1523
+#, kde-format
+msgid ""
+"Enable this allows to change all encodings by changing the first only.\n"
+"Disable this if different individual settings are needed."
+msgstr ""
+"Укључивањем овог можете променити сва кодирања променом само првог.\n"
+"Искључите ово ако поједине поставке треба да буду различите."
+
+# >! Merge sentence.
+#. +> trunk5
+#: optiondialog.cpp:1527
+#, fuzzy, kde-format
+#| msgid "Note: Local Encoding is "
+msgid "Note: Local Encoding is \"%1\""
+msgstr "Напомена: локално кодирање је "
+
+#. +> trunk5
+#: optiondialog.cpp:1531
+#, kde-format
+msgid "File Encoding for A:"
+msgstr "Кодирање фајла за А:"
+
+#. +> trunk5
+#: optiondialog.cpp:1538
+#, kde-format
+msgid ""
+"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
+"If the file is not Unicode then the selected encoding will be used as fallback.\n"
+"(Unicode detection depends on the first bytes of a file.)"
+msgstr ""
+"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n"
+"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n"
+"Откривање &unicode-g; зависи од првих бајтова у фајлу."
+#| "For simple comparison of two selected files choose \"Compare\".\n"
+#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on {+the +}second file.\n"
+#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#| "Same also applies to directory comparison and merge."
+msgid ""
+"Using the context menu extension:\n"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
+"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
+"Исто важи за поређење и стапање фасцикли."
+
+#. +> trunk5
+#: kdiff3fileitemaction.cpp:297
+#, kde-format
+msgid "About KDiff3 File Item Action Plugin"
+msgstr "О прикључку за радње над фајловима &kdiff3-g;"
-"When in Auto-Advance mode the result of the current selection is shown \n"
-"for the specified time, before jumping to the next conflict. Range: 0-2000 ms"
-msgstr ""
-"У режиму аутоматског напредовања резултат текућег избора приказује се \n"
-"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/."
-
-#. +> trunk5
-#: optiondialog.cpp:1068
-#, kde-format
-msgid "Show info dialogs"
-msgstr "Приказуј информативне дијалоге"
-
-#. +> trunk5
-#: optiondialog.cpp:1071
-#, kde-format
-msgid "Show a dialog with information about the number of conflicts."
-msgstr "Приказује дијалог са информацијом о броју сукоба."
-
-#. +> trunk5
-#: optiondialog.cpp:1074
-#, kde-format
-msgid "White space 2-file merge default:"
-msgstr "Подразумевано стапање празнина два фајла:"
-
-#. +> trunk5
-#: optiondialog.cpp:1079 optiondialog.cpp:1092
-#, kde-format
-msgid "Manual Choice"
-msgstr "Ручни избор"
-
-#. +> trunk5
-#: optiondialog.cpp:1083 optiondialog.cpp:1097
-#, kde-format
-msgid "Allow the merge algorithm to automatically select an input for white-space-only changes."
-msgstr "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама."
-
-#. +> trunk5
-#: optiondialog.cpp:1087
-#, kde-format
-msgid "White space 3-file merge default:"
-msgstr "Подразумевано стапање празнина три фајла:"
-
-#. +> trunk5
-#: optiondialog.cpp:1101
-#, kde-format
-msgid "Automatic Merge Regular Expression"
-msgstr "Регуларни израз за аутоматско стапање"
-
-#. +> trunk5
-#: optiondialog.cpp:1109 smalldialogs.cpp:449
-#, kde-format
-msgid "Auto merge regular expression:"
-msgstr "Регуларни израз за аутоматско стапање:"
-
-#. +> trunk5
-#: optiondialog.cpp:1114
-#, kde-format
-msgid ""
-"Regular expression for lines where KDiff3 should automatically choose one source.\n"
-"When a line with a conflict matches the regular expression then\n"
-"- if available - C, otherwise B will be chosen."
-msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б."
-
-#. +> trunk5
-#: optiondialog.cpp:1120
-#, kde-format
-msgid "Run regular expression auto merge on merge start"
-msgstr "Аутоматски стопи по регуларном изразу на почетку стапања"
-
-#. +> trunk5
-#: optiondialog.cpp:1123
-#, kde-format
-msgid ""
-"Run the merge for auto merge regular expressions\n"
-"immediately when a merge starts.\n"
-msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n"
-
-#. +> trunk5
-#: optiondialog.cpp:1128
-#, kde-format
-msgid "Version Control History Merging"
-msgstr "Стапање историјата управљања верзијама"
-
-#. +> trunk5
-#: optiondialog.cpp:1136 smalldialogs.cpp:476
-#, kde-format
-msgid "History start regular expression:"
-msgstr "Регуларни израз за почетак историјата:"
-
-# literal-segment: Log
-#. +> trunk5
-#: optiondialog.cpp:1141
-#, kde-format
-msgid ""
-"Regular expression for the start of the version control history entry.\n"
-"Usually this line contains the \"$Log$\" keyword.\n"
-"Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-"Регуларни израз за почетак уноса у историјату управљања верзијама.\n"
-"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n"
-"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/."
-
-#. +> trunk5
-#: optiondialog.cpp:1147 smalldialogs.cpp:504
-#, kde-format
-msgid "History entry start regular expression:"
-msgstr "Регуларни израз за почетак уноса историјата:"
-
-#. +> trunk5
-#: optiondialog.cpp:1160
-#, kde-format
-msgid ""
-"A version control history entry consists of several lines.\n"
-"Specify the regular expression to detect the first line (without the leading comment).\n"
-"Use parentheses to group the keys you want to use for sorting.\n"
-"If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
-"See the documentation for details."
-msgstr ""
-"Унос у историјату управљања верзијама чини неколико редова.\n"
-"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n"
-"Користите заграде да групишете кључеве по којима ће се ређати.\n"
-"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n"
-"Детаље потражите у документацији."
-
-#. +> trunk5
-#: optiondialog.cpp:1168
-#, kde-format
-msgid "History merge sorting"
-msgstr "Ређање у стапању историјата"
-
-#. +> trunk5
-#: optiondialog.cpp:1171
-#, kde-format
-msgid "Sort version control history by a key."
-msgstr "Ређа историјат управљања верзијама по кључу."
-
-#. +> trunk5
-#: optiondialog.cpp:1181
-#, kde-format
-msgid "History entry start sort key order:"
-msgstr "Редослед ређања за кључеве уноса историјата:"
-
-#. +> trunk5
-#: optiondialog.cpp:1186
-#, kde-format
-msgid ""
-"Each pair of parentheses used in the regular expression for the history start entry\n"
-"groups a key that can be used for sorting.\n"
-"Specify the list of keys (that are numbered in order of occurrence\n"
-"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
-"If left empty, then no sorting will be done.\n"
-"See the documentation for details."
-msgstr ""
-"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n"
-"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n"
-"Ако се остави празно, ређање се не спроводи.\n"
-"Детаље потражите у документацији."
-
-#. +> trunk5
-#: optiondialog.cpp:1197
-#, kde-format
-msgid "Merge version control history on merge start"
-msgstr "Стопи историјат управљања верзијама на почетку стапања"
-
-#. +> trunk5
-#: optiondialog.cpp:1200
-#, kde-format
-msgid "Run version control history automerge on merge start."
-msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања."
-
-#. +> trunk5
-#: optiondialog.cpp:1204
-#, kde-format
-msgid "Max number of history entries:"
-msgstr "Највећи број уноса историјата:"
-
-# skip-rule: t-cut
-#. +> trunk5
-#: optiondialog.cpp:1208
-#, kde-format
-msgid "Cut off after specified number. Use -1 for infinite number of entries."
-msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса."
-
-# >> @action:button
-#. +> trunk5
-#: optiondialog.cpp:1212
-#, kde-format
-msgid "Test your regular expressions"
-msgstr "Испробај регуларне изразе"
-
-#. +> trunk5
-#: optiondialog.cpp:1217
-#, kde-format
-msgid "Irrelevant merge command:"
-msgstr "Наредба при безначајном стапању:"
-
-#. +> trunk5
-#: optiondialog.cpp:1222
-#, kde-format
-msgid ""
-"If specified this script is run after automerge\n"
-"when no other relevant changes were detected.\n"
-"Called with the parameters: filename1 filename2 filename3"
-msgstr ""
-"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n"
-"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3"
-
-#. +> trunk5
-#: optiondialog.cpp:1227
-#, kde-format
-msgid "Auto save and quit on merge without conflicts"
-msgstr "Аутоматски сачувај и напусти при стапању без сукоба"
-
-#. +> trunk5
-#: optiondialog.cpp:1231
-#, kde-format
-msgid ""
-"If KDiff3 was started for a file-merge from the command line and all\n"
-"conflicts are solvable without user interaction then automatically save and quit.\n"
-"(Similar to command line option \"--auto\".)"
-msgstr ""
-"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n"
-"Слично опцији командне линије --auto."
-
-#. +> trunk5
-#: optiondialog.cpp:1242 optiondialog.cpp:1243
-#, kde-format
-msgid "Directory"
-msgstr "Фасцикла"
-
-#. +> trunk5
-#: optiondialog.cpp:1255
-#, kde-format
-msgid "Recursive directories"
-msgstr "Рекурзивно кроз фасцикле"
-
-#. +> trunk5
-#: optiondialog.cpp:1258
-#, kde-format
-msgid "Whether to analyze subdirectories or not."
-msgstr "Да ли анализирати потфасцикле."
-
-#. +> trunk5
-#: optiondialog.cpp:1260
-#, kde-format
-msgid "File pattern(s):"
-msgstr "Обрасци фајлова:"
-
-#. +> trunk5
-#: optiondialog.cpp:1266
-#, kde-format
-msgid ""
-"Pattern(s) of files to be analyzed. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Обрасци за фајлове које треба анализирати.\n"
-"Џокери: ‘*’ и ‘?’\n"
-"Више образаца наводите са тачка-запетом као раздвајачем."
-
-#. +> trunk5
-#: optiondialog.cpp:1271
-#, kde-format
-msgid "File-anti-pattern(s):"
-msgstr "Противобрасци фајлова:"
-
-#. +> trunk5
-#: optiondialog.cpp:1277
-#, kde-format
-msgid ""
-"Pattern(s) of files to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Обрасци за фајлове које треба искључити из анализе.\n"
-"Џокери: ‘*’ и ‘?’\n"
-"Више образаца наводите са тачка-запетом као раздвајачем."
-
-#. +> trunk5
-#: optiondialog.cpp:1282
-#, kde-format
-msgid "Dir-anti-pattern(s):"
-msgstr "Противобрасци фасцикли:"
-
-#. +> trunk5
-#: optiondialog.cpp:1288
-#, kde-format
-msgid ""
-"Pattern(s) of directories to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"Обрасци за фасцикле које треба искључити из анализе.\n"
-"Џокери: ‘*’ и ‘?’\n"
-"Више образаца наводите са тачка-запетом као раздвајачем."
-
-#. +> trunk5
-#: optiondialog.cpp:1293
-#, kde-format
-msgid "Use .cvsignore"
-msgstr "Користи ~!/.cvsignore/"
-
-#. +> trunk5
-#: optiondialog.cpp:1297
-#, kde-format
-msgid ""
-"Extends the antipattern to anything that would be ignored by CVS.\n"
-"Via local \".cvsignore\" files this can be directory specific."
-msgstr ""
-"Проширује противобрасце на све што би игнорисао &cvs-n;.\n"
-"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли."
-
-#. +> trunk5
-#: optiondialog.cpp:1301
-#, kde-format
-msgid "Find hidden files and directories"
-msgstr "Пронађи скривене фајлове и фасцикле"
-
-#. +> trunk5
-#: optiondialog.cpp:1305
-#, kde-format
-msgid "Finds files and directories with the hidden attribute."
-msgstr "Налази фајлове и фасцикле са атрибутом скривености."
-
-#. +> trunk5
-#: optiondialog.cpp:1307
-#, kde-format
-msgid "Finds files and directories starting with '.'."
-msgstr "Налази фајлове и фасцикле које почињу са ‘.’."
-
-#. +> trunk5
-#: optiondialog.cpp:1311
-#, kde-format
-msgid "Follow file links"
-msgstr "Прати везе фајлова"
-
-#. +> trunk5
-#: optiondialog.cpp:1315
-#, kde-format
-msgid ""
-"On: Compare the file the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"Укључено: пореди фајлове на које показују везе.\n"
-"Искључено: пореди везе."
-
-#. +> trunk5
-#: optiondialog.cpp:1319
-#, kde-format
-msgid "Follow directory links"
-msgstr "Прати везе фасцикли"
-
-#. +> trunk5
-#: optiondialog.cpp:1323
-#, kde-format
-msgid ""
-"On: Compare the directory the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"Укључено: пореди фасцикле на које показују везе.\n"
-"Искључено: пореди везе."
-
-#. +> trunk5
-#: optiondialog.cpp:1332
-#, kde-format
-msgid "Case sensitive filename comparison"
-msgstr "Поређење имена фајлова разликује величину слова"
-
-#. +> trunk5
-#: optiondialog.cpp:1336
-#, kde-format
-msgid ""
-"The directory comparison will compare files or directories when their names match.\n"
-"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
-msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено."
-
-#. +> trunk5
-#: optiondialog.cpp:1340
-#, fuzzy, kde-format
-#| msgid "Unfold {-All Subdirs-}{+all subdirectories on load+}"
-msgid "Unfold all subdirectories on load"
-msgstr "Рашири све потфасцикле"
-
-#. +> trunk5
-#: optiondialog.cpp:1344
-#, kde-format
-msgid ""
-"On: Unfold all subdirectories when starting a directory diff.\n"
-"Off: Leave subdirectories folded."
-msgstr ""
-
-#. +> trunk5
-#: optiondialog.cpp:1348
-#, kde-format
-msgid "Skip directory status report"
-msgstr ""
-
-#. +> trunk5
-#: optiondialog.cpp:1352
-#, kde-format
-msgid ""
-"On: Do not show the Directory Comparison Status.\n"
-"Off: Show the status dialog on start."
-msgstr ""
-
-#. +> trunk5
-#: optiondialog.cpp:1356
-#, kde-format
-msgid "File Comparison Mode"
-msgstr "Режим поређења фајлова"
-
-#. +> trunk5
-#: optiondialog.cpp:1361
-#, kde-format
-msgid "Binary comparison"
-msgstr "Бинарно поређење"
-
-#. +> trunk5
-#: optiondialog.cpp:1363
-#, kde-format
-msgid "Binary comparison of each file. (Default)"
-msgstr "Бинарно поређење за сваки фајл (подразумевано)."
-
-#. +> trunk5
-#: optiondialog.cpp:1366
-#, kde-format
-msgid "Full analysis"
-msgstr "Пуна анализа"
-
-#. +> trunk5
-#: optiondialog.cpp:1368
-#, kde-format
-msgid ""
-"Do a full analysis and show statistics information in extra columns.\n"
-"(Slower than a binary comparison, much slower for binary files.)"
-msgstr ""
-"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n"
-"Спорије него бинарно поређење, много спорије за бинарне фајлове."
-
-#. +> trunk5
-#: optiondialog.cpp:1372
-#, kde-format
-msgid "Trust the size and modification date (unsafe)"
-msgstr "Веруј величини и датуму измене (несигурно)"
-
-#. +> trunk5
-#: optiondialog.cpp:1374
-#, kde-format
-msgid ""
-"Assume that files are equal if the modification date and file length are equal.\n"
-"Files with equal contents but different modification dates will appear as different.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n"
-"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n"
-"Корисно за велике фасцикле или споре мреже."
-
-#. +> trunk5
-#: optiondialog.cpp:1379
-#, kde-format
-msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)"
-msgstr "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)"
-
-#. +> trunk5
-#: optiondialog.cpp:1381
-#, kde-format
-msgid ""
-"Assume that files are equal if the modification date and file length are equal.\n"
-"If the dates are not equal but the sizes are, use binary comparison.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n"
-"Ако датуми нису исти али величина јесте, бинарно упоређује.\n"
-"Корисно за велике фасцикле или споре мреже."
-
-#. +> trunk5
-#: optiondialog.cpp:1386
-#, kde-format
-msgid "Trust the size (unsafe)"
-msgstr "Веруј величини (несигурно)"
-
-#. +> trunk5
-#: optiondialog.cpp:1388
-#, kde-format
-msgid ""
-"Assume that files are equal if their file lengths are equal.\n"
-"Useful for big directories or slow networks when the date is modified during download."
-msgstr ""
-"Претпоставља да су фајлови једнаки ако им једнаке величине.\n"
-"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања."
-
-#. +> trunk5
-#: optiondialog.cpp:1395
-#, kde-format
-msgid "Synchronize directories"
-msgstr "Синхронизуј фасцикле"
-
-#. +> trunk5
-#: optiondialog.cpp:1399
-#, kde-format
-msgid ""
-"Offers to store files in both directories so that\n"
-"both directories are the same afterwards.\n"
-"Works only when comparing two directories without specifying a destination."
-msgstr ""
-"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n"
-"Ради само када се пореде две фасцикле без задавања одредишта."
-
-#. +> trunk5
-#: optiondialog.cpp:1405
-#, kde-format
-msgid "White space differences considered equal"
-msgstr "Разлике у празнинама сматрају се једнаким"
-
-#. +> trunk5
-#: optiondialog.cpp:1409
-#, kde-format
-msgid ""
-"If files differ only by white space consider them equal.\n"
-"This is only active when full analysis is chosen."
-msgstr ""
-"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n"
-"Ово је активно само када се изабере пуна анализа."
-
-# >> copy newer file
-#. +> trunk5
-#: optiondialog.cpp:1415
-#, kde-format
-msgid "Copy newer instead of merging (unsafe)"
-msgstr "Копирај новији уместо стапања (несигурно)"
-
-#. +> trunk5
-#: optiondialog.cpp:1419
-#, fuzzy, kde-format
-#| msgid ""
-#| "Don't look inside, just take the newer file.\n"
-#| "(Use this only if you know what you are doing!)\n"
-#| "Only effective when comparing two directories."
-msgid ""
-"Do not look inside, just take the newer file.\n"
-"(Use this only if you know what you are doing!)\n"
-"Only effective when comparing two directories."
-msgstr ""
-"Не гледа садржај, само узима новији фајл.\n"
-"Користите ово само ако знате шта радите!\n"
-"Има ефекта само при поређењу две фасцикле."
-
-#. +> trunk5
-#: optiondialog.cpp:1424
-#, kde-format
-msgid "Backup files (.orig)"
-msgstr "Прави резерве фајлова (~!/.orig/)"
-
-#. +> trunk5
-#: optiondialog.cpp:1428
-#, kde-format
-msgid ""
-"If a file would be saved over an old file, then the old file\n"
-"will be renamed with a '.orig' extension instead of being deleted."
-msgstr "Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан."
-
-# rewrite-msgid: /Regional/Locale/
-#. +> trunk5
-#: optiondialog.cpp:1504 optiondialog.cpp:1505
-#, kde-format
-msgid "Regional Settings"
-msgstr "Поставке локалитета"
-
-#. +> trunk5
-#: optiondialog.cpp:1519
-#, kde-format
-msgid "Use the same encoding for everything:"
-msgstr "Исто кодирање за све:"
-
-#. +> trunk5
-#: optiondialog.cpp:1523
-#, kde-format
-msgid ""
-"Enable this allows to change all encodings by changing the first only.\n"
-"Disable this if different individual settings are needed."
-msgstr ""
-"Укључивањем овог можете променити сва кодирања променом само првог.\n"
-"Искључите ово ако поједине поставке треба да буду различите."
-
-# >! Merge sentence.
-#. +> trunk5
-#: optiondialog.cpp:1527
-#, fuzzy, kde-format
-#| msgid "Note: Local Encoding is "
-msgid "Note: Local Encoding is \"%1\""
-msgstr "Напомена: локално кодирање је "
-
-#. +> trunk5
-#: optiondialog.cpp:1531
-#, kde-format
-msgid "File Encoding for A:"
-msgstr "Кодирање фајла за А:"
-
-#. +> trunk5
-#: optiondialog.cpp:1538
-#, kde-format
-msgid ""
-"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
-"If the file is not Unicode then the selected encoding will be used as fallback.\n"
-"(Unicode detection depends on the first bytes of a file.)"
-msgstr ""
-"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n"
-"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n"
-"Откривање &unicode-g; зависи од првих бајтова у фајлу."
-#| "For simple comparison of two selected files choose \"Compare\".\n"
-#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on {+the +}second file.\n"
-#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#| "Same also applies to directory comparison and merge."
-msgid ""
-"Using the context menu extension:\n"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
-"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
-"Исто важи за поређење и стапање фасцикли."
-
-#. +> trunk5
-#: kdiff3fileitemaction.cpp:297
-#, kde-format
-msgid "About KDiff3 File Item Action Plugin"
-msgstr "О прикључку за радње над фајловима &kdiff3-g;"
+msgstr "Аутоматски стопи по регуларним изразима|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Split Diff At Selection"
+msgstr "Подели разлику на избору|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Joachim Eibl"
+msgstr "&joachimeibl-n;|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+#. modified: ilic | 2017-09-28 17:56:11+0200 | 1
+msgid ""
+"Could not initialize the KDiff3 part.\n"
+"This usually happens due to an installation problem. Please read the README-file in the source package for details."
+msgstr ""
+"Не могу да припремим &kdiff3-a; део.\n"
+"Ово је обично проблем у инсталацији. Прочитајте фајл <filename>README</filename> из изворног пакета за више детаља.|~\n"
+"Не могу да припремим &kdiff3-a; део.\n"
+"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Ignored. (User defined.)"
+msgstr "Игнорисано (кориснички дефинисано).|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""
+msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"||~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Show list of config settings and current values."
+msgstr "Наброји поставке и тренутне вредности из поставе.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Color for manually aligned difference ranges:"
+msgstr "Боја ручно поравнатих опсега разлика:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Align B and C for 3 input files"
+msgstr "Поравнај Б и Ц за три улазна фајла|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Try to align B and C when comparing or merging three input files.\n"
+"Not recommended for merging because merge might get more complicated.\n"
+"(Default is off.)"
+msgstr ""
+"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n"
+"Није препоручљиво за стапање зато што га може учинити сложенијим.\n"
+"Подразумевано је искључено.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Show a dialog with information about the number of conflicts."
+msgstr "Приказује дијалог са информацијом о броју сукоба.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Automatic Merge Regular Expression"
+msgstr "Регуларни израз за аутоматско стапање|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Auto merge regular expression:"
+msgstr "Регуларни израз за аутоматско стапање:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Regular expression for lines where KDiff3 should automatically choose one source.\n"
+"When a line with a conflict matches the regular expression then\n"
+"- if available - C, otherwise B will be chosen."
+msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Run regular expression auto merge on merge start"
+msgstr "Аутоматски стопи по регуларном изразу на почетку стапања|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Run the merge for auto merge regular expressions\n"
+"immediately when a merge starts.\n"
+msgstr ""
+"Спроводи стапање регуларним изразом чим стапање почне.\n"
+"|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Version Control History Merging"
+msgstr "Стапање историјата управљања верзијама|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "History start regular expression:"
+msgstr "Регуларни израз за почетак историјата:|~"
+
+# literal-segment: Log|~
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Regular expression for the start of the version control history entry.\n"
+"Usually this line contains the \"$Log$\" keyword.\n"
+"Default value: \".*\\$Log.*\\$.*\""
+msgstr ""
+"Регуларни израз за почетак уноса у историјату управљања верзијама.\n"
+"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n"
+"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "History entry start regular expression:"
+msgstr "Регуларни израз за почетак уноса историјата:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"A version control history entry consists of several lines.\n"
+"Specify the regular expression to detect the first line (without the leading comment).\n"
+"Use parentheses to group the keys you want to use for sorting.\n"
+"If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
+"See the documentation for details."
+msgstr ""
+"Унос у историјату управљања верзијама чини неколико редова.\n"
+"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n"
+"Користите заграде да групишете кључеве по којима ће се ређати.\n"
+"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n"
+"Детаље потражите у документацији.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "History merge sorting"
+msgstr "Ређање у стапању историјата|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Sort version control history by a key."
+msgstr "Ређа историјат управљања верзијама по кључу.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "History entry start sort key order:"
+msgstr "Редослед ређања за кључеве уноса историјата:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Each pair of parentheses used in the regular expression for the history start entry\n"
+"groups a key that can be used for sorting.\n"
+"Specify the list of keys (that are numbered in order of occurrence\n"
+"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
+"If left empty, then no sorting will be done.\n"
+"See the documentation for details."
+msgstr ""
+"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n"
+"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n"
+"Ако се остави празно, ређање се не спроводи.\n"
+"Детаље потражите у документацији.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Merge version control history on merge start"
+msgstr "Стопи историјат управљања верзијама на почетку стапања|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Run version control history automerge on merge start."
+msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања.|~"
+
+# skip-rule: t-cut|~
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Cut off after specified number. Use -1 for infinite number of entries."
+msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса.|~"
+
+# >> @action:button|~
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Test your regular expressions"
+msgstr "Испробај регуларне изразе|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Irrelevant merge command:"
+msgstr "Наредба при безначајном стапању:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"If specified this script is run after automerge\n"
+"when no other relevant changes were detected.\n"
+"Called with the parameters: filename1 filename2 filename3"
+msgstr ""
+"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n"
+"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"If KDiff3 was started for a file-merge from the command line and all\n"
+"conflicts are solvable without user interaction then automatically save and quit.\n"
+"(Similar to command line option \"--auto\".)"
+msgstr ""
+"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n"
+"Слично опцији командне линије --auto.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
+"If the file is not Unicode then the selected encoding will be used as fallback.\n"
+"(Unicode detection depends on the first bytes of a file.)"
+msgstr ""
+"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n"
+"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n"
+"Откривање &unicode-g; зависи од првих бајтова у фајлу.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"If enabled then the encoding from the input files is used.\n"
+"In ambiguous cases a dialog will ask the user to choose the encoding for saving."
+msgstr ""
+"Ако је укључено, узима се кодирање према улазним фајловима.\n"
+"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"List of command line options that should be ignored when KDiff3 is used by other tools.\n"
+"Several values can be specified if separated via ';'\n"
+"This will suppress the \"Unknown option\" error."
+msgstr ""
+"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n"
+"Више вредности можете задати раздвојене тачка-запетом.\n"
+"Овим се сузбија грешка „непозната опција“.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Quit also via Escape key"
+msgstr "Напуштање и преко тастера &esc-n;|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Fast method to exit.\n"
+"For those who are used to using the Escape key."
+msgstr ""
+"Брз начин напуштања.\n"
+"За оне навикнуте на тастер &esc-n; у ову сврху.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Nothing is selected in either diff input window."
+msgstr "Ништа није изабрано ни у једном прозору улаза разлике.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Regular Expression Tester"
+msgstr "Проба регуларних израза|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Example auto merge line:"
+msgstr "Пример реда за аутоматско стапање:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "To test auto merge, copy a line as used in your files."
+msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Match result:"
+msgstr "Резултат поклапања:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Example history start line (with leading comment):"
+msgstr "Пример почетног реда историјата (са водећим коментаром):|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Copy a history start line as used in your files,\n"
+"including the leading comment."
+msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "History sort key order:"
+msgstr "Редослед ређања кључева историјата:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Example history entry start line (without leading comment):"
+msgstr "Пример почетног реда ставке историјата (без водећег коментара):|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid ""
+"Copy a history entry start line as used in your files,\n"
+"but omit the leading comment."
+msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар.|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Sort key result:"
+msgstr "Резултат ређања кључева:|~"
+
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+msgid "Opening and closing parentheses do not match in regular expression."
+msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу.|~"
+
+#. modified: ilic | 2012-06-24 18:06:20+0200 | 1
+msgid "Case sensitive filename comparison"
+msgstr "Поређење имена фајлова разликује величину слова|~"
+
+#. modified: ilic | 2012-06-24 18:06:20+0200 | 1
+msgid ""
+"The directory comparison will compare files or directories when their names match.\n"
+"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
+msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено.|~"
+#| "For simple comparison of two selected files choose \"Compare\".\n"
+#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#| "Same also applies to directory comparison and merge.|~\n"
+#| "Using the contextmenu extension:\n"
+#| "For simple comparison of two selected files choose \"Compare\".\n"
+#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on {+the +}second file.\n"
+#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#| "Same also applies to directory comparison and merge.|~"
+msgid ""
+"Using the context menu extension:\n"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
+"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
+"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
+#. modified: ilic | 2018-09-01 10:09:45+0200 | of
+#, fuzzy
+#~| msgid ""
+#~| "Using the contextmenu extension:\n"
+#~| "For simple comparison of two selected files choose \"Compare\".\n"
+#~| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+#~| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#~| "Same also applies to directory comparison and merge.|~"
+#~ msgid ""
+#~ "Using the contextmenu extension:\n"
+#~ "For simple comparison of two selected files choose \"Compare\".\n"
+#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n"
+#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#~ "Same also applies to directory comparison and merge."
+#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
+#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
+#~ "Исто важи за поређење и стапање фасцикли.|~"
+
+# >! Wtf: ...then the branch to merge...|~
+# |~e0
+#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
+#. modified: ilic | 2017-09-28 17:56:11+0200 | 1
+#. modified: ilic | 2018-02-16 11:13:31+0100 | o
+#~ msgid ""
+#~ "Using the contextmenu extension:\n"
+#~ "For simple comparison of two selected files choose \"Compare\".\n"
+#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
+#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+#~ "Same also applies to directory comparison and merge."
+#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију <interface>Compare with ...</interface>. Затим употребите <interface>Compare with ...</interface> над другим фајлом.\n"
+#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па <interface>3-way merge with base</interface> на другој грани која ће бити одредиште.\n"
+#~ "Исто важи за поређење и стапање фасцикли.|~\n"
+#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
+#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
-#| "For simple comparison of two selected files choose \"Compare\".\n"
-#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#| "Same also applies to directory comparison and merge.|~\n"
-#| "Using the contextmenu extension:\n"
-#| "For simple comparison of two selected files choose \"Compare\".\n"
-#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on {+the +}second file.\n"
-#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#| "Same also applies to directory comparison and merge.|~"
-msgid ""
-"Using the context menu extension:\n"
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."
-"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
-"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
-#. modified: ilic | 2018-09-01 10:09:45+0200 | of
-#, fuzzy
-#~| msgid ""
-#~| "Using the contextmenu extension:\n"
-#~| "For simple comparison of two selected files choose \"Compare\".\n"
-#~| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-#~| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#~| "Same also applies to directory comparison and merge.|~"
-#~ msgid ""
-#~ "Using the contextmenu extension:\n"
-#~ "For simple comparison of two selected files choose \"Compare\".\n"
-#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n"
-#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#~ "Same also applies to directory comparison and merge."
-#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
-#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
-#~ "Исто важи за поређење и стапање фасцикли.|~"
-
-# >! Wtf: ...then the branch to merge...|~
-# |~e0
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-#. modified: ilic | 2017-09-28 17:56:11+0200 | 1
-#. modified: ilic | 2018-02-16 11:13:31+0100 | o
-#~ msgid ""
-#~ "Using the contextmenu extension:\n"
-#~ "For simple comparison of two selected files choose \"Compare\".\n"
-#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n"
-#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-#~ "Same also applies to directory comparison and merge."
-#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију <interface>Compare with ...</interface>. Затим употребите <interface>Compare with ...</interface> над другим фајлом.\n"
-#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па <interface>3-way merge with base</interface> на другој грани која ће бити одредиште.\n"
-#~ "Исто важи за поређење и стапање фасцикли.|~\n"
-#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n"
-#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n"
-msgstr "Аутоматски стопи по регуларним изразима|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Split Diff At Selection"
-msgstr "Подели разлику на избору|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Joachim Eibl"
-msgstr "&joachimeibl-n;|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-#. modified: ilic | 2017-09-28 17:56:11+0200 | 1
-msgid ""
-"Could not initialize the KDiff3 part.\n"
-"This usually happens due to an installation problem. Please read the README-file in the source package for details."
-msgstr ""
-"Не могу да припремим &kdiff3-a; део.\n"
-"Ово је обично проблем у инсталацији. Прочитајте фајл <filename>README</filename> из изворног пакета за више детаља.|~\n"
-"Не могу да припремим &kdiff3-a; део.\n"
-"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Ignored. (User defined.)"
-msgstr "Игнорисано (кориснички дефинисано).|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""
-msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"||~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Show list of config settings and current values."
-msgstr "Наброји поставке и тренутне вредности из поставе.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Color for manually aligned difference ranges:"
-msgstr "Боја ручно поравнатих опсега разлика:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Align B and C for 3 input files"
-msgstr "Поравнај Б и Ц за три улазна фајла|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Try to align B and C when comparing or merging three input files.\n"
-"Not recommended for merging because merge might get more complicated.\n"
-"(Default is off.)"
-msgstr ""
-"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n"
-"Није препоручљиво за стапање зато што га може учинити сложенијим.\n"
-"Подразумевано је искључено.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Show a dialog with information about the number of conflicts."
-msgstr "Приказује дијалог са информацијом о броју сукоба.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Automatic Merge Regular Expression"
-msgstr "Регуларни израз за аутоматско стапање|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Auto merge regular expression:"
-msgstr "Регуларни израз за аутоматско стапање:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Regular expression for lines where KDiff3 should automatically choose one source.\n"
-"When a line with a conflict matches the regular expression then\n"
-"- if available - C, otherwise B will be chosen."
-msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Run regular expression auto merge on merge start"
-msgstr "Аутоматски стопи по регуларном изразу на почетку стапања|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Run the merge for auto merge regular expressions\n"
-"immediately when a merge starts.\n"
-msgstr ""
-"Спроводи стапање регуларним изразом чим стапање почне.\n"
-"|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Version Control History Merging"
-msgstr "Стапање историјата управљања верзијама|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "History start regular expression:"
-msgstr "Регуларни израз за почетак историјата:|~"
-
-# literal-segment: Log|~
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Regular expression for the start of the version control history entry.\n"
-"Usually this line contains the \"$Log$\" keyword.\n"
-"Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-"Регуларни израз за почетак уноса у историјату управљања верзијама.\n"
-"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n"
-"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "History entry start regular expression:"
-msgstr "Регуларни израз за почетак уноса историјата:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"A version control history entry consists of several lines.\n"
-"Specify the regular expression to detect the first line (without the leading comment).\n"
-"Use parentheses to group the keys you want to use for sorting.\n"
-"If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
-"See the documentation for details."
-msgstr ""
-"Унос у историјату управљања верзијама чини неколико редова.\n"
-"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n"
-"Користите заграде да групишете кључеве по којима ће се ређати.\n"
-"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n"
-"Детаље потражите у документацији.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "History merge sorting"
-msgstr "Ређање у стапању историјата|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Sort version control history by a key."
-msgstr "Ређа историјат управљања верзијама по кључу.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "History entry start sort key order:"
-msgstr "Редослед ређања за кључеве уноса историјата:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Each pair of parentheses used in the regular expression for the history start entry\n"
-"groups a key that can be used for sorting.\n"
-"Specify the list of keys (that are numbered in order of occurrence\n"
-"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
-"If left empty, then no sorting will be done.\n"
-"See the documentation for details."
-msgstr ""
-"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n"
-"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n"
-"Ако се остави празно, ређање се не спроводи.\n"
-"Детаље потражите у документацији.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Merge version control history on merge start"
-msgstr "Стопи историјат управљања верзијама на почетку стапања|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Run version control history automerge on merge start."
-msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања.|~"
-
-# skip-rule: t-cut|~
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Cut off after specified number. Use -1 for infinite number of entries."
-msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса.|~"
-
-# >> @action:button|~
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Test your regular expressions"
-msgstr "Испробај регуларне изразе|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Irrelevant merge command:"
-msgstr "Наредба при безначајном стапању:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"If specified this script is run after automerge\n"
-"when no other relevant changes were detected.\n"
-"Called with the parameters: filename1 filename2 filename3"
-msgstr ""
-"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n"
-"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"If KDiff3 was started for a file-merge from the command line and all\n"
-"conflicts are solvable without user interaction then automatically save and quit.\n"
-"(Similar to command line option \"--auto\".)"
-msgstr ""
-"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n"
-"Слично опцији командне линије --auto.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
-"If the file is not Unicode then the selected encoding will be used as fallback.\n"
-"(Unicode detection depends on the first bytes of a file.)"
-msgstr ""
-"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n"
-"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n"
-"Откривање &unicode-g; зависи од првих бајтова у фајлу.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"If enabled then the encoding from the input files is used.\n"
-"In ambiguous cases a dialog will ask the user to choose the encoding for saving."
-msgstr ""
-"Ако је укључено, узима се кодирање према улазним фајловима.\n"
-"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"List of command line options that should be ignored when KDiff3 is used by other tools.\n"
-"Several values can be specified if separated via ';'\n"
-"This will suppress the \"Unknown option\" error."
-msgstr ""
-"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n"
-"Више вредности можете задати раздвојене тачка-запетом.\n"
-"Овим се сузбија грешка „непозната опција“.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Quit also via Escape key"
-msgstr "Напуштање и преко тастера &esc-n;|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Fast method to exit.\n"
-"For those who are used to using the Escape key."
-msgstr ""
-"Брз начин напуштања.\n"
-"За оне навикнуте на тастер &esc-n; у ову сврху.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Nothing is selected in either diff input window."
-msgstr "Ништа није изабрано ни у једном прозору улаза разлике.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Regular Expression Tester"
-msgstr "Проба регуларних израза|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Example auto merge line:"
-msgstr "Пример реда за аутоматско стапање:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "To test auto merge, copy a line as used in your files."
-msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Match result:"
-msgstr "Резултат поклапања:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Example history start line (with leading comment):"
-msgstr "Пример почетног реда историјата (са водећим коментаром):|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Copy a history start line as used in your files,\n"
-"including the leading comment."
-msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "History sort key order:"
-msgstr "Редослед ређања кључева историјата:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Example history entry start line (without leading comment):"
-msgstr "Пример почетног реда ставке историјата (без водећег коментара):|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid ""
-"Copy a history entry start line as used in your files,\n"
-"but omit the leading comment."
-msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар.|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Sort key result:"
-msgstr "Резултат ређања кључева:|~"
-
-#. modified: ilic | 2012-06-24 18:03:04+0200 | 1
-msgid "Opening and closing parentheses do not match in regular expression."
-msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу.|~"
-
-#. modified: ilic | 2012-06-24 18:06:20+0200 | 1
-msgid "Case sensitive filename comparison"
-msgstr "Поређење имена фајлова разликује величину слова|~"
-
-#. modified: ilic | 2012-06-24 18:06:20+0200 | 1
-msgid ""
-"The directory comparison will compare files or directories when their names match.\n"
-"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)"
-msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено.|~"
+msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:104
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:111
+#, 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
+#. +> trunk5
+#: index.docbook:115
+#, 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
+#. +> trunk5
+#: index.docbook:119
+#, 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
+#. +> trunk5
+#: index.docbook:122
+#, 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
+#. +> trunk5
+#: index.docbook:125
+#, 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
+#. +> trunk5
+#: index.docbook:128
+#, no-c-format
+msgid "I hope &kdiff3; works for you too. Have fun!"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:130
+#, no-c-format
+msgid "Joachim Eibl (2003)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:135
+#, no-c-format
+msgid "Screenshots and Features"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:136
+#, no-c-format
+msgid "This screenshot shows the difference between two text files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:137
+#, no-c-format
+msgid "(Using an early version of &kdiff3;):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:142
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:155
+#, no-c-format
+msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:164
+#, no-c-format
+msgid "More Features"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:165
+#, no-c-format
+msgid "Line-By-Line And Char-By-Char Diff-Viewer"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:166
+#, no-c-format
+msgid "By using the possibilities 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:174
+#, no-c-format
+msgid "See White-Space Differences At One Glance"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:175
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:184
+#, no-c-format
+msgid "Triple-Diff"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:185
+#, no-c-format
+msgid "Analyze three files and see where they differ."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:186
+#, 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
+#. +> trunk5
+#: index.docbook:189
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:199
+#, no-c-format
+msgid "Comfortable Merge Of Two Or Three Input Files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:200
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:210
+#, no-c-format
+msgid "And ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:212
+#, no-c-format
+msgid "Fast navigation via buttons."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:213
+#, no-c-format
+msgid "A mouse-click into a summary column sync's all windows to show the same position."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:214
+#, no-c-format
+msgid "Select and copy from any window and paste into the merge result window."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:215
+#, no-c-format
+msgid "Overview column that shows where the changes and conflicts are."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:216
+#, no-c-format
+msgid "The colors are adjustable to your specific preferences."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:217
+#, no-c-format
+msgid "Adjustable Tab size."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:218
+#, no-c-format
+msgid "Option to insert spaces instead of tabs."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:219
+#, no-c-format
+msgid "Open files comfortably via dialog or specify files on the command line."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:220
+#, no-c-format
+msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:221
+#, no-c-format
+msgid "Show the line numbers for each line."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:222
+#, no-c-format
+msgid "Paste clipboard or drag text into a diff input window."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:223
+#, no-c-format
+msgid "Networktransparency via KIO."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:224
+#, no-c-format
+msgid "Can be used as diff-viewer in KDevelop 3."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:225
+#, no-c-format
+msgid "Word-wrap for long lines."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:226
+#, no-c-format
+msgid "Support for Unicode, UTF-8 and other codecs."
+msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:259
+#, no-c-format
+msgid "Special case: Files with the same name"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:260
+#, 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.:"
+" --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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:278
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:281
+#, 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 ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:284
+#, no-c-format
+msgid "Ignorable command line options"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:285
+#, 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:"
+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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:296
+#, 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
+#. +> trunk5
+#: index.docbook:301
+#, no-c-format
+msgid "Open-Dialog"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:302
+#, no-c-format
+msgid "Since many input files must be selectable, the program has a special open dialog:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:308
+#, no-c-format
+msgid "The open dialog allows you to edit the filenames by hand, selecting a file via the file-browser (\"File...\") or allows you 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
+#. +> trunk5
+#: index.docbook:315
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:320
+#, 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
+#. +> trunk5
+#: index.docbook:324
+#, 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
+#. +> trunk5
+#: index.docbook:330
+#, no-c-format
+msgid "Paste and Drop Input"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:331
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:336
+#, 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 ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:339
+#, 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
+#. +> trunk5
+#: index.docbook:343
+#, no-c-format
+msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:346
+#, 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
+#. +> trunk5
+#: index.docbook:352
+#, no-c-format
+msgid "Comparing Files And Interpreting The Information In The Input Windows"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:356
+#, no-c-format
+msgid "Info Line"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:356
+#, 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
+#. +> trunk5
+#: index.docbook:361
+#, 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
+#. +> trunk5
+#: index.docbook:365
+#, no-c-format
+msgid "Coloring"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:365
+#, 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
+#. +> trunk5
+#: index.docbook:369
+#, 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
+#. +> trunk5
+#: index.docbook:375
+#, no-c-format
+msgid "Summary Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:375
+#, 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
+#. +> trunk5
+#: index.docbook:382
+#, 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
+#. +> trunk5
+#: index.docbook:386
+#, no-c-format
+msgid "Overview Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:386
+#, 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
+#. +> trunk5
+#: index.docbook:398
+#, no-c-format
+msgid "Manually Aligning Lines"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:398
+#, 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 <keycombo>&Ctrl;<keycap>Y</keycap></keycombo>). 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
+#. +> trunk5
+#: index.docbook:409
+#, no-c-format
+msgid "Currently merging doesn't support the use of manual diff help."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:411
+#, no-c-format
+msgid "Manually Joining and Splitting Diff Sections"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:411
+#, 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
+#. +> trunk5
+#: index.docbook:414
+#, 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
+#. +> trunk5
+#: index.docbook:419
+#, 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
+#. +> trunk5
+#: index.docbook:426
+#, no-c-format
+msgid "Merging And The Merge Output Editor Window"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:430
+#, 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
+#. +> trunk5
+#: index.docbook:435
+#, 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
+#. +> trunk5
+#: index.docbook:438
+#, no-c-format
+msgid "With only two input files every difference is also a conflict that must be solved manually."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:441
+#, 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
+#. +> trunk5
+#: index.docbook:448
+#, no-c-format
+msgid "The Summary Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:448
+#, 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 \"<Merge Conflict>\", 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
+#. +> trunk5
+#: index.docbook:458
+#, no-c-format
+msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:458
+#, 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
+#. +> trunk5
+#: index.docbook:464
+#, no-c-format
+msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:464
+#, 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
+#. +> trunk5
+#: index.docbook:471
+#, 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
+#. +> trunk5
+#: index.docbook:477
+#, 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
+#. +> trunk5
+#: index.docbook:483
+#, 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 <No src line> 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
+#. +> trunk5
+#: index.docbook:489
+#, no-c-format
+msgid "The text \"<Merge Conflict>\" 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
+#. +> trunk5
+#: index.docbook:493
+#, no-c-format
+msgid "Choosing Input A, B, or C for All Conflicts"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:493
+#, 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
+#. +> trunk5
+#: index.docbook:504
+#, 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
+#. +> trunk5
+#: index.docbook:509
+#, no-c-format
+msgid "Automatic Merge of Version Control Keywords and History (Log)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:509
+#, no-c-format
+msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:516
+#, 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
+#. +> trunk5
+#: index.docbook:524
+#, 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
+#. +> trunk5
+#: index.docbook:529
+#, no-c-format
+msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:535
+#, 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
+#. +> trunk5
+#: index.docbook:540
+#, 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
+#. +> trunk5
+#: index.docbook:546
+#, 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
+#. +> trunk5
+#: index.docbook:552
+#, no-c-format
+msgid "Note that &kdiff3; will remove duplicate history entries. 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
+#. +> trunk5
+#: index.docbook:555
+#, 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
+#. +> trunk5
+#: index.docbook:561
+#, 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
+#. +> trunk5
+#: index.docbook:565
+#, no-c-format
+msgid ""
+"Example: Assume a history that looks like this: <screen>\n"
+"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:569
+#, no-c-format
+msgid "The line with the \"$Log$\"-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
+#. +> trunk5
+#: index.docbook:575
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:583
+#, 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
+#. +> trunk5
+#: index.docbook:588
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:596
+#, 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:"
+msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:608
+#, no-c-format
+msgid "Navigation And Editing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:609
+#, 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
+#. +> trunk5
+#: index.docbook:616
+#, no-c-format
+msgid "You can also use the wheel mouse to scroll up and down."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:618
+#, 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
+#. +> trunk5
+#: index.docbook:622
+#, 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
+#. +> trunk5
+#: index.docbook:626
+#, 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
+#. +> trunk5
+#: index.docbook:634
+#, no-c-format
+msgid "Auto-Advance"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:635
+#, 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- & 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
+#. +> trunk5
+#: index.docbook:651
+#, no-c-format
+msgid "Select, Copy And Paste"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:652
+#, 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
+#. +> trunk5
+#: index.docbook:659
+#, 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
+#. +> trunk5
+#: index.docbook:662
+#, 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
+#. +> trunk5
+#: index.docbook:666
+#, no-c-format
+msgid "In order to select everything in the current window use menu \"Edit\"->\"Select All\" (Ctrl-A)."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:668
+#, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:674
+#, no-c-format
+msgid "\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the selected text."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:677
+#, 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
+#. +> trunk5
+#: index.docbook:687
+#, no-c-format
+msgid "Saving"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:688
+#, 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
+#. +> trunk5
+#: index.docbook:696
+#, 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
+#. +> trunk5
+#: index.docbook:705
+#, no-c-format
+msgid "Finding Strings"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:706
+#, 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
+#. +> trunk5
+#: index.docbook:717
+#, no-c-format
+msgid "Printing"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:718
+#, 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
+#. +> trunk5
+#: index.docbook:722
+#, 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
+#. +> trunk5
+#: index.docbook:727
+#, no-c-format
+msgid "All:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:727
+#, no-c-format
+msgid "Print everything."
+msgstr ""
+
+#. Tag: term
+#. +> trunk5
+#: index.docbook:728
+#, no-c-format
+msgid "Current:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:728
+#, no-c-format
+msgid "Print a page starting at the first visible line in the window. (On systems without this option this can be achieved by specifying page number 10000 for printing.)"
+msgstr ""
+
+#. Tag: term
+#. +> trunk5
+#: index.docbook:730
+#, no-c-format
+msgid "Selection:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:730
+#, 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
+#. +> trunk5
+#: index.docbook:736
+#, no-c-format
+msgid "Range:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:736
+#, no-c-format
+msgid "Specify the first and last page."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:739
+#, no-c-format
+msgid "Other important options for printing will be taken from the normal options:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:742
+#, no-c-format
+msgid "Font, font size"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:743
+#, no-c-format
+msgid "Show line numbers"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:744
+#, no-c-format
+msgid "Word wrap"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:745
+#, no-c-format
+msgid "<para>Colors</para>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:746
+#, no-c-format
+msgid "etc."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:748
+#, no-c-format
+msgid "Landscape formatting is also recommended for printing."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:753
+#, no-c-format
+msgid "Options"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:754
+#, 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
+#. +> trunk5
+#: index.docbook:758
+#, no-c-format
+msgid "Font"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:759
+#, 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
+#. +> trunk5
+#: index.docbook:764
+#, no-c-format
+msgid "Italic Font for Deltas:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:764
+#, 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
+#. +> trunk5
+#: index.docbook:771
+#, no-c-format
+msgid "<title>Colors</title>"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:773
+#, no-c-format
+msgid "Foreground color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:773 index.docbook:786
+#, no-c-format
+msgid "Usually black."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:774
+#, no-c-format
+msgid "Background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:774
+#, no-c-format
+msgid "Usually white."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:775
+#, no-c-format
+msgid "Diff Background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:775
+#, no-c-format
+msgid "Usually light gray."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:776
+#, no-c-format
+msgid "Color A:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:776
+#, no-c-format
+msgid "Usually dark blue."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:777
+#, no-c-format
+msgid "Color B:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:777
+#, no-c-format
+msgid "Usually dark green."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:778
+#, no-c-format
+msgid "Color C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:778
+#, no-c-format
+msgid "Usually dark magenta."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:779
+#, no-c-format
+msgid "Conflict Color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:779 index.docbook:784
+#, no-c-format
+msgid "Usually red."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:780
+#, no-c-format
+msgid "Current range background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:780
+#, no-c-format
+msgid "Usually light yellow."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:781
+#, no-c-format
+msgid "Current range diff background color:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:781 index.docbook:785
+#, no-c-format
+msgid "Usually dark yellow."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:782
+#, no-c-format
+msgid "Color for manually selected diff ranges:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:782
+#, no-c-format
+msgid "Usually orange."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:783
+#, no-c-format
+msgid "Newest file color in directory comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:783
+#, no-c-format
+msgid "Usually green."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:784
+#, no-c-format
+msgid "Oldest file color in directory comparison:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:785
+#, no-c-format
+msgid "Middle age file color in directory comparison:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:786
+#, no-c-format
+msgid "Color for missing files in directory comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:788
+#, no-c-format
+msgid "Changing the colors for directory comparison will be effective only when starting the next directory comparison."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:791
+#, 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
+#. +> trunk5
+#: index.docbook:797
+#, no-c-format
+msgid "Editor Settings"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:799
+#, no-c-format
+msgid "Tab inserts spaces:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:799
+#, 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
+#. +> trunk5
+#: index.docbook:802
+#, no-c-format
+msgid "Tab size:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:802
+#, no-c-format
+msgid "Can be adjusted for your specific needs. Default is 8."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:803
+#, no-c-format
+msgid "Auto indentation:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:803
+#, no-c-format
+msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:805
+#, no-c-format
+msgid "Auto copy selection:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:805
+#, no-c-format
+msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:807
+#, no-c-format
+msgid "Line end style:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:807
+#, 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
+#. +> trunk5
+#: index.docbook:812
+#, no-c-format
+msgid "Diff Settings"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:813
+#, 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
+#. +> trunk5
+#: index.docbook:821
+#, no-c-format
+msgid "Ignore numbers:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:821
+#, 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
+#. +> trunk5
+#: index.docbook:826
+#, no-c-format
+msgid "Ignore C/C++ comments:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:826
+#, no-c-format
+msgid "Default is off. Changes in comments will be treated like changes in white space."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:829
+#, no-c-format
+msgid "Ignore case:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:829
+#, 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
+#. +> trunk5
+#: index.docbook:832 index.docbook:999
+#, no-c-format
+msgid "Preprocessor-Command:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:832 index.docbook:835
+#, no-c-format
+msgid "See <link linkend=\"preprocessors\">next section</link>."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:835 index.docbook:1006
+#, no-c-format
+msgid "Line-Matching Preprocessor-Command:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:838
+#, no-c-format
+msgid "Try Hard:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:838
+#, 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
+#. +> trunk5
+#: index.docbook:845
+#, no-c-format
+msgid "Merge Settings"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:847
+#, no-c-format
+msgid "Auto Advance Delay (ms):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:847
+#, 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
+#. +> trunk5
+#: index.docbook:851
+#, no-c-format
+msgid "White space 2/3-file merge default:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:851
+#, 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
+#. +> trunk5
+#: index.docbook:858
+#, no-c-format
+msgid "Auto merge regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:858
+#, 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
+#. +> trunk5
+#: index.docbook:861
+#, no-c-format
+msgid "Run regular expression auto merge on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:861
+#, 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
+#. +> trunk5
+#: index.docbook:864
+#, no-c-format
+msgid "History start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:864
+#, no-c-format
+msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:869
+#, no-c-format
+msgid "History entry start regular expression:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:869
+#, 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
+#. +> trunk5
+#: index.docbook:876
+#, no-c-format
+msgid "History merge sorting:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:876
+#, no-c-format
+msgid "Enable version control history sorting."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:879
+#, no-c-format
+msgid "History entry start sort key order:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:879
+#, 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
+#. +> trunk5
+#: index.docbook:887
+#, no-c-format
+msgid "Merge version control history on merge start:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:887
+#, no-c-format
+msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:890
+#, no-c-format
+msgid "Max number of history entries:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:890
+#, 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
+#. +> trunk5
+#: index.docbook:893
+#, no-c-format
+msgid "Test your regular expressions"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:893
+#, 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
+#. +> trunk5
+#: index.docbook:899
+#, no-c-format
+msgid "Irrelevant merge command:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:899
+#, 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
+#. +> trunk5
+#: index.docbook:911
+#, no-c-format
+msgid "Directory Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:912
+#, 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
+#. +> trunk5
+#: index.docbook:916
+#, no-c-format
+msgid "Yet there is one option here that is also relevant for saving single files:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:920 index.docbook:1618
+#, no-c-format
+msgid "Backup files:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:920
+#, 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
+#. +> trunk5
+#: index.docbook:928
+#, no-c-format
+msgid "Regional and Language Options"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:930
+#, no-c-format
+msgid "Language:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:930
+#, 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 Frameworks version of &kdiff3;.)"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:932
+#, no-c-format
+msgid "Use the same encoding for everything:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:932
+#, 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
+#. +> trunk5
+#: index.docbook:934
+#, no-c-format
+msgid "Local Encoding:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:934
+#, 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
+#. +> trunk5
+#: index.docbook:936
+#, no-c-format
+msgid "File Encoding for A/B/C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:936
+#, 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
+#. +> trunk5
+#: index.docbook:938
+#, no-c-format
+msgid "File Encoding for Merge Output and Saving:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:938
+#, 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
+#. +> trunk5
+#: index.docbook:940
+#, no-c-format
+msgid "File Encoding for Preprocessor Files:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:940
+#, 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
+#. +> trunk5
+#: index.docbook:942
+#, no-c-format
+msgid "Right To Left Language:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:942
+#, 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
+#. +> trunk5
+#: index.docbook:948
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:949
+#, no-c-format
+msgid "(These options and actions are available in menus or the buttonbar.)"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:951
+#, no-c-format
+msgid "Show line numbers:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:951
+#, no-c-format
+msgid "You can select if line numbers should be shown for the input files."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:953
+#, no-c-format
+msgid "Show space and tabulator characters for differences:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:953
+#, no-c-format
+msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:955
+#, no-c-format
+msgid "Show white space:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:955
+#, 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
+#. +> trunk5
+#: index.docbook:959
+#, no-c-format
+msgid "Overview options:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:959
+#, 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
+#. +> trunk5
+#: index.docbook:966
+#, no-c-format
+msgid "Word wrap diff windows:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:966
+#, no-c-format
+msgid "Wrap lines when their length would exceed the width of a window."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:969
+#, no-c-format
+msgid "Show Window A/B/C:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:969
+#, 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
+#. +> trunk5
+#: index.docbook:972
+#, no-c-format
+msgid "Toggle Split Orientation:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:972
+#, 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
+#. +> trunk5
+#: index.docbook:976
+#, no-c-format
+msgid "Start a merge quickly:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:976
+#, 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
+#. +> trunk5
+#: index.docbook:986
+#, no-c-format
+msgid "Configuring Keyboard-Shortcuts"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:987
+#, no-c-format
+msgid "Currently only the Frameworks-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:994
+#, no-c-format
+msgid "Preprocessor Commands"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:995
+#, no-c-format
+msgid "&kdiff3; supports two preprocessor options."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:999
+#, 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
+#. +> trunk5
+#: index.docbook:1006
+#, 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
+#. +> trunk5
+#: index.docbook:1016
+#, 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."
+"</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
+#. +> trunk5
+#: index.docbook:1039
+#, no-c-format
+msgid "<command>sed</command> Basics"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1040
+#, 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
+#. +> trunk5
+#: index.docbook:1051
+#, no-c-format
+msgid ""
+"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
+"</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"
+"</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."
+msgid "Examples For <command>sed</command>-Use In &kdiff3;"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1068
+#, no-c-format
+msgid "Ignoring Other Types Of Comments"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1069
+#, 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 (') are only important when testing on the command shell as it will otherwise attempt to process some characters. KDiff3 does not do this except for the escape sequences '\\\"' and '\\\\'."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1086
+#, no-c-format
+msgid "Caseinsensitive Diff"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1087
+#, 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
+#. +> trunk5
+#: index.docbook:1097
+#, no-c-format
+msgid "Ignoring Version Control Keywords"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1098
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:1108
+#, 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
+#. +> trunk5
+#: index.docbook:1115
+#, no-c-format
+msgid "Ignoring Numbers"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1116
+#, 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"
+"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1124
+#, no-c-format
+msgid "Ignoring Certain Columns"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1125
+#, 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"
+"</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
+#. +> trunk5
+#: index.docbook:1135
+#, no-c-format
+msgid "Combining Several Substitutions"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1136
+#, 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:"
+"</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:"
+msgid "The data is piped through all internal and external preprocessors in the following order:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1162
+#, no-c-format
+msgid "Normal preprocessor,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1163
+#, no-c-format
+msgid "Line-Matching-Preprocessor,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1164
+#, no-c-format
+msgid "Ignore case (conversion to uppercase),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1165
+#, no-c-format
+msgid "Detection of C/C++ comments,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1166
+#, no-c-format
+msgid "Ignore numbers,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1167
+#, no-c-format
+msgid "Ignore white space"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1169
+#, 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
+#. +> trunk5
+#: index.docbook:1172
+#, 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
+#. +> trunk5
+#: index.docbook:1178
+#, no-c-format
+msgid "Warning"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1179
+#, 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
+#. +> trunk5
+#: index.docbook:1183
+#, 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 want 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
+#. +> trunk5
+#: index.docbook:1198
+#, no-c-format
+msgid "Directory Comparison and Merge with &kdiff3;"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1199
+#, no-c-format
+msgid "Introduction into Directory Comparison and Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1200
+#, 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
+#. +> trunk5
+#: index.docbook:1204
+#, 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
+#. +> trunk5
+#: index.docbook:1218
+#, no-c-format
+msgid "To err is human, but to really mess things up you need a computer."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1220
+#, no-c-format
+msgid "So this is what this program can do for you: &kdiff3; ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1224
+#, no-c-format
+msgid "... reads and compares two or three directories recursively,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1225
+#, no-c-format
+msgid "... takes special care of symbolic links,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1226
+#, no-c-format
+msgid "... lets you browse files on mouse double click,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1227
+#, no-c-format
+msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1229
+#, no-c-format
+msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1231
+#, no-c-format
+msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1233
+#, no-c-format
+msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1234
+#, no-c-format
+msgid "... lets you continue the merge after manual interaction with key F7,"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1235
+#, no-c-format
+msgid "... optionally creates backups, with the \".orig\" extension,"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1240
+#, no-c-format
+msgid "Starting Directory Comparison Or Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1241
+#, 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."
+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
+#. +> trunk5
+#: index.docbook:1262
+#, 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
+#. +> trunk5
+#: index.docbook:1269
+#, no-c-format
+msgid "Directory Merge Visible Information"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1270
+#, 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
+#. +> trunk5
+#: index.docbook:1274
+#, no-c-format
+msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1281
+#, no-c-format
+msgid "... and details about the currently selected item on the right:"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1289
+#, no-c-format
+msgid "The Name Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1290
+#, 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
+#. +> trunk5
+#: index.docbook:1293
+#, 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
+#. +> trunk5
+#: index.docbook:1299
+#, 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
+#. +> trunk5
+#: index.docbook:1303
+#, 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
+#. +> trunk5
+#: index.docbook:1308
+#, no-c-format
+msgid "Normal file"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1309
+#, no-c-format
+msgid "Normal directory (directory-image)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1310
+#, no-c-format
+msgid "Link to a file (file-image with a link arrow)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1311
+#, no-c-format
+msgid "Link to a directory (directory-image with a link arrow)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1313
+#, 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
+#. +> trunk5
+#: index.docbook:1322
+#, no-c-format
+msgid "The Columns A/B/C and the Coloring Scheme"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1323
+#, 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
+#. +> trunk5
+#: index.docbook:1328
+#, no-c-format
+msgid "Black: This item doesn't exist in this directory."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1329
+#, no-c-format
+msgid "Green: Newest item."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1330
+#, no-c-format
+msgid "Yellow: Older than green, newer than red."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1331
+#, no-c-format
+msgid "Red: Oldest item."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1333
+#, 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
+#. +> trunk5
+#: index.docbook:1336
+#, 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
+#. +> trunk5
+#: index.docbook:1340
+#, 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
+#. +> trunk5
+#: index.docbook:1347
+#, no-c-format
+msgid "The Operation Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1348
+#, 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
+#. +> trunk5
+#: index.docbook:1359
+#, no-c-format
+msgid "Three directory-merge (\"A\" is treated as older base of both)."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1360
+#, no-c-format
+msgid "Two directory-merge."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1361
+#, no-c-format
+msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1363
+#, no-c-format
+msgid "In three directory merge the operation proposal will be: If for an item ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1367
+#, no-c-format
+msgid "... all three directories are equal: Copy from C"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1368
+#, 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
+#. +> trunk5
+#: index.docbook:1370
+#, 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
+#. +> trunk5
+#: index.docbook:1372
+#, 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
+#. +> trunk5
+#: index.docbook:1374
+#, no-c-format
+msgid "... only A exists: Delete the destination (if exists)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1375
+#, no-c-format
+msgid "... only B exists: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1376
+#, no-c-format
+msgid "... only C exists: Copy from C"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1377
+#, no-c-format
+msgid "... A, B and C are not equal: Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1378
+#, 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
+#. +> trunk5
+#: index.docbook:1382
+#, no-c-format
+msgid "In two directory merge the operation proposal will be: If for an item ..."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1386
+#, no-c-format
+msgid "... both directories are equal: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1387
+#, no-c-format
+msgid "... A exists, but not B: Copy from A"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1388
+#, no-c-format
+msgid "... B exists, but not A: Copy from B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1389
+#, no-c-format
+msgid "... A and B exist but are not equal: Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1390 index.docbook:1407
+#, 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
+#. +> trunk5
+#: index.docbook:1394
+#, 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
+#. +> trunk5
+#: index.docbook:1401
+#, no-c-format
+msgid "... both directories are equal: Nothing will be done."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1402
+#, no-c-format
+msgid "... A exists, but not B: Copy A to B"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1403
+#, no-c-format
+msgid "... B exists, but not A: Copy B to A"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1404
+#, 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
+#. +> trunk5
+#: index.docbook:1411
+#, 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
+#. +> trunk5
+#: index.docbook:1420
+#, no-c-format
+msgid "The Status Column"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1421
+#, 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
+#. +> trunk5
+#: index.docbook:1430
+#, no-c-format
+msgid "Statistics Columns"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1431
+#, 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
+#. +> trunk5
+#: index.docbook:1438
+#, no-c-format
+msgid "Selecting Listed Files"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1439
+#, 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
+#. +> trunk5
+#: index.docbook:1443
+#, no-c-format
+msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1444
+#, no-c-format
+msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1445
+#, no-c-format
+msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1446
+#, no-c-format
+msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1447
+#, no-c-format
+msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1449
+#, 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
+#. +> trunk5
+#: index.docbook:1454
+#, 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
+#. +> trunk5
+#: index.docbook:1457
+#, 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
+#. +> trunk5
+#: index.docbook:1465
+#, no-c-format
+msgid "Doing A Directory Merge"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1466
+#, 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
+#. +> trunk5
+#: index.docbook:1470
+#, no-c-format
+msgid "Be aware that if you didn't specify a destination directory explicitly, 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
+#. +> trunk5
+#: index.docbook:1474
+#, 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
+#. +> trunk5
+#: index.docbook:1481
+#, no-c-format
+msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1483
+#, no-c-format
+msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1484
+#, no-c-format
+msgid "\"Exclude Hidden Files\""
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1485
+#, no-c-format
+msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1487
+#, 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
+#. +> trunk5
+#: index.docbook:1492
+#, 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
+#. +> trunk5
+#: index.docbook:1496
+#, no-c-format
+msgid "If you are satisfied so far, the rest is easy."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1498
+#, 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
+#. +> trunk5
+#: index.docbook:1503
+#, 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
+#. +> trunk5
+#: index.docbook:1507
+#, 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
+#. +> trunk5
+#: index.docbook:1512
+#, 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
+#. +> trunk5
+#: index.docbook:1514
+#, no-c-format
+msgid "Otherwise select \"Do it\" to really start merging."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1516
+#, 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
+#. +> trunk5
+#: index.docbook:1520
+#, 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
+#. +> trunk5
+#: index.docbook:1524
+#, 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
+#. +> trunk5
+#: index.docbook:1531
+#, no-c-format
+msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1534
+#, 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
+#. +> trunk5
+#: index.docbook:1544
+#, no-c-format
+msgid "Options for Comparing and Merging Directories"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1545
+#, no-c-format
+msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1551
+#, no-c-format
+msgid "Recursive Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1551
+#, no-c-format
+msgid "Select whether to search directories recursively."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1553
+#, no-c-format
+msgid "File Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1553
+#, 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
+#. +> trunk5
+#: index.docbook:1557
+#, no-c-format
+msgid "File Anti-Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1557
+#, 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
+#. +> trunk5
+#: index.docbook:1561
+#, no-c-format
+msgid "Directory Anti-Pattern(s):"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1561
+#, 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
+#. +> trunk5
+#: index.docbook:1565
+#, no-c-format
+msgid "Use CVS-Ignore:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1565
+#, 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
+#. +> trunk5
+#: index.docbook:1570
+#, no-c-format
+msgid "Find Hidden Files and Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1570
+#, 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
+#. +> trunk5
+#: index.docbook:1574
+#, no-c-format
+msgid "Follow File Links:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1574
+#, 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
+#. +> trunk5
+#: index.docbook:1577
+#, no-c-format
+msgid "Follow Directory Links:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1577
+#, 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
+#. +> trunk5
+#: index.docbook:1584
+#, no-c-format
+msgid "Case Sensitive Filename Comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1584
+#, no-c-format
+msgid "Default is false on Windows, true for other operating systems."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1586
+#, no-c-format
+msgid "File Comparison Mode:"
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1588
+#, no-c-format
+msgid "Binary Comparison:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1588
+#, no-c-format
+msgid "This is the default file comparison mode."
+msgstr ""
+
+#. Tag: emphasis
+#. +> trunk5
+#: index.docbook:1591
+#, no-c-format
+msgid "Full Analysis:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1591
+#, 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
+#. +> trunk5
+#: index.docbook:1598
+#, no-c-format
+msgid "Trust the modification date:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1598
+#, 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
+#. +> trunk5
+#: index.docbook:1602
+#, no-c-format
+msgid "Trust the size:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1602
+#, 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
+#. +> trunk5
+#: index.docbook:1609
+#, no-c-format
+msgid "Synchronize Directories:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1609
+#, 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
+#. +> trunk5
+#: index.docbook:1614
+#, no-c-format
+msgid "Copy newer instead of merging:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1614
+#, 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
+#. +> trunk5
+#: index.docbook:1618
+#, 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
+#. +> trunk5
+#: index.docbook:1626
+#, no-c-format
+msgid "Other Functions in Directory Merge Window"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1627
+#, no-c-format
+msgid "Split/Full Screen Mode"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1628
+#, 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 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
+#. +> trunk5
+#: index.docbook:1637
+#, no-c-format
+msgid "Comparing or Merging a Single File"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1638
+#, 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
+#. +> trunk5
+#: index.docbook:1645
+#, 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
+#. +> trunk5
+#: index.docbook:1650
+#, no-c-format
+msgid "Comparing or Merging Files with Different Names"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1651
+#, 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
+#. +> trunk5
+#: index.docbook:1654
+#, 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
+#. +> trunk5
+#: index.docbook:1658
+#, no-c-format
+msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
+#. +> trunk5
+#: index.docbook:1662
+#, 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
+#. +> trunk5
+#: index.docbook:1670
+#, no-c-format
+msgid "Miscellaneous Topics"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1672
+#, no-c-format
+msgid "Networktransparency via KIO"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1673
+#, no-c-format
+msgid "KIO-Slaves"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1674
+#, no-c-format
+msgid "The KIO library from Frameworks 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."
+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
+#. +> trunk5
+#: index.docbook:1686
+#, no-c-format
+msgid "Other KIO-slaves that are interesting are:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1690
+#, no-c-format
+msgid "Files from the WWW (http:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1691
+#, no-c-format
+msgid "Files from the FTP (ftp:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1692
+#, no-c-format
+msgid "Encrypted file transfer (fish:, sftp:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1693
+#, no-c-format
+msgid "Windows-resources (smb:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1694
+#, no-c-format
+msgid "Local files (file:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1696
+#, no-c-format
+msgid "Other things that are possible, but probably less useful are:"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1700
+#, no-c-format
+msgid "Man-pages (man:),"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1701
+#, no-c-format
+msgid "Info-pages (info:),"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1705
+#, no-c-format
+msgid "How To Write URLs"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1706
+#, 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
+#. +> trunk5
+#: index.docbook:1711
+#, 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
+#. +> trunk5
+#: index.docbook:1714
+#, 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
+#. +> trunk5
+#: index.docbook:1717
+#, no-c-format
+msgid "When URLs don't work as expected, try to open them in Konqueror first."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1724
+#, no-c-format
+msgid "Capabilities of KIO-Slaves"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1725
+#, no-c-format
+msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1727
+#, 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
+#. +> trunk5
+#: index.docbook:1732
+#, no-c-format
+msgid "Sometimes there is no support for links."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1734
+#, 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
+#. +> trunk5
+#: index.docbook:1737
+#, no-c-format
+msgid "Can't always determine the filesize."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1739
+#, no-c-format
+msgid "Limited support for permissions."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1741
+#, 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
+#. +> trunk5
+#: index.docbook:1751
+#, no-c-format
+msgid "Using &kdiff3; as a KPart"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1752
+#, no-c-format
+msgid "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1754
+#, 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 context menu."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1758
+#, no-c-format
+msgid "&kdiff3; normally requires two complete files as input. When used as part &kdiff3; will assume that the input file 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
+#. +> trunk5
+#: index.docbook:1764
+#, no-c-format
+msgid "In &dolphin; you can select a patch-file and select \"Preview in\"-\"KDiff3Part\" from the context menu. 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
+#. +> trunk5
+#: index.docbook:1769
+#, 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
+#. +> trunk5
+#: index.docbook:1776
+#, no-c-format
+msgid "Using &kdiff3; as a Git Diff and Merging Tool"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1777
+#, no-c-format
+msgid "&kdiff3; can be used as a <ulink url=\"https://git-scm.com/\">Git</ulink> diff and merge tool."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1780
+#, no-c-format
+msgid "Just add the following lines into your <filename>gitconfig</filename> file."
+msgstr ""
+
+#. Tag: programlisting
+#. +> trunk5
+#: index.docbook:1783
+#, no-c-format
+msgid ""
+"[diff]\n"
+" tool = kdiff3\n"
+"[difftool \"kdiff3\"]\n"
+" path = <path to kdiff3 binary in your system>\n"
+"[difftool]\n"
+" prompt = false\n"
+" keepBackup = false\n"
+" trustExitCode = false\n"
+"[merge]\n"
+" tool = kdiff3\n"
+"[mergetool]\n"
+" prompt = false\n"
+" keepBackup = false\n"
+" keepTemporaries = false\n"
+"[mergetool \"kdiff3\"]\n"
+" path = <path to kdiff3 binary in your system>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1784
+#, no-c-format
+msgid "Then to see the difference between two commits use <userinput>git difftool <replaceable>first_hash</replaceable> <replaceable>second_hash</replaceable> --tool=kdiff3 --cc <replaceable>some_file_in_the_git_tree</replaceable></userinput>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1787
+#, no-c-format
+msgid "To merge a branch with &kdiff3; use <userinput>git merge <replaceable>branch_name</replaceable> && git mergetool --tool=kdiff3</userinput>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1790
+#, no-c-format
+msgid "After resolving merging conflicts in the <link linkend=\"synchronise_views\">usual way</link> it is enough to commit the changes to do the job."
+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
+#. +> trunk5
+#: index.docbook:1811
+#, no-c-format
+msgid "Why did I release it under GPL?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1813
+#, 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
+#. +> trunk5
+#: index.docbook:1819
+#, no-c-format
+msgid "Some buttons and functions are missing. What's wrong?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1821
+#, no-c-format
+msgid "You compiled from source but you probably didn't specify the correct prefix for the installation. By default cmake wants to install in /usr/local but then the user-interface resource file (i.e. kdiff3ui.rc) can't be found. The README-file contains more information about the correct prefix."
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1828
+#, no-c-format
+msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1831
+#, 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
+#. +> trunk5
+#: index.docbook:1839
+#, no-c-format
+msgid "Why must all conflicts be solved before the merge result can be saved?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1841
+#, 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
+#. +> trunk5
+#: index.docbook:1850
+#, 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
+#. +> trunk5
+#: index.docbook:1852
+#, no-c-format
+msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1856
+#, no-c-format
+msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1858
+#, 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
+#. +> trunk5
+#: index.docbook:1864
+#, no-c-format
+msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1867
+#, no-c-format
+msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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
+#. +> trunk5
+#: index.docbook:1878
+#, no-c-format
+msgid "Why doesn't &kdiff3; support syntax-highlighting?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1880
+#, 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
+#. +> trunk5
+#: index.docbook:1885
+#, no-c-format
+msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1887
+#, 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
+#. +> trunk5
+#: index.docbook:1890
+#, 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
+#. +> trunk5
+#: index.docbook:1896
+#, 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
+#. +> trunk5
+#: index.docbook:1900
+#, 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 clipboard 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
+#. +> trunk5
+#: index.docbook:1908
+#, no-c-format
+msgid "Where has the directory option \"List only deltas\" gone?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1910
+#, 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
+#. +> trunk5
+#: index.docbook:1915
+#, no-c-format
+msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1918
+#, 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
+#. +> trunk5
+#: index.docbook:1924
+#, no-c-format
+msgid "There is so much information here, but your question is still not answered?"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1926
+#, no-c-format
+msgid "Please send me your question. I appreciate every comment."
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: index.docbook:1935
+#, no-c-format
+msgid "Credits and License"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1937
+#, no-c-format
+msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1940
+#, no-c-format
+msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: index.docbook:1943
+#, no-c-format
+msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
+msgid "More detailed user documentation is available from <ulink url=\"help:/kdiff3\">help:/kdiff3</ulink> (either enter this &URL; into &konqueror;, or run <userinput><command>khelpcenter</command> <parameter>help:/kdiff3</parameter></userinput>)."
+msgstr ""
+
+#. Tag: member
+#. +> trunk5
+#: man-kdiff3.1.docbook:196
+#, no-c-format
+msgid "kf5options(7)"
+msgstr ""
+
+#. Tag: member
+#. +> trunk5
+#: man-kdiff3.1.docbook:197
+#, no-c-format
+msgid "qt5options(7)"
+msgstr ""
+
+#. Tag: title
+#. +> trunk5
+#: man-kdiff3.1.docbook:202
+#, no-c-format
+msgid "Authors"
+msgstr ""
+
+#. Tag: para
+#. +> trunk5
+#: man-kdiff3.1.docbook:203
+#, no-c-format
+msgid "This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;."
-msgid "More detailed user documentation is available from <ulink url=\"help:/kdiff3\">help:/kdiff3</ulink> (either enter this &URL; into &konqueror;, or run <userinput><command>khelpcenter</command> <parameter>help:/kdiff3</parameter></userinput>)."
-msgstr ""
-
-#. Tag: member
-#. +> trunk5
-#: man-kdiff3.1.docbook:196
-#, no-c-format
-msgid "kf5options(7)"
-msgstr ""
-
-#. Tag: member
-#. +> trunk5
-#: man-kdiff3.1.docbook:197
-#, no-c-format
-msgid "qt5options(7)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: man-kdiff3.1.docbook:202
-#, no-c-format
-msgid "Authors"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: man-kdiff3.1.docbook:203
-#, no-c-format
-msgid "This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;."
-msgid "Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:104
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:111
-#, 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
-#. +> trunk5
-#: index.docbook:115
-#, 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
-#. +> trunk5
-#: index.docbook:119
-#, 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
-#. +> trunk5
-#: index.docbook:122
-#, 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
-#. +> trunk5
-#: index.docbook:125
-#, 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
-#. +> trunk5
-#: index.docbook:128
-#, no-c-format
-msgid "I hope &kdiff3; works for you too. Have fun!"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:130
-#, no-c-format
-msgid "Joachim Eibl (2003)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:135
-#, no-c-format
-msgid "Screenshots and Features"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:136
-#, no-c-format
-msgid "This screenshot shows the difference between two text files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:137
-#, no-c-format
-msgid "(Using an early version of &kdiff3;):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:142
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:155
-#, no-c-format
-msgid "&kdiff3; also helps you to compare and merge complete directories. This screenshot shows &kdiff3; during a directory merge:"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:164
-#, no-c-format
-msgid "More Features"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:165
-#, no-c-format
-msgid "Line-By-Line And Char-By-Char Diff-Viewer"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:166
-#, no-c-format
-msgid "By using the possibilities 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:174
-#, no-c-format
-msgid "See White-Space Differences At One Glance"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:175
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:184
-#, no-c-format
-msgid "Triple-Diff"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:185
-#, no-c-format
-msgid "Analyze three files and see where they differ."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:186
-#, 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
-#. +> trunk5
-#: index.docbook:189
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:199
-#, no-c-format
-msgid "Comfortable Merge Of Two Or Three Input Files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:200
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:210
-#, no-c-format
-msgid "And ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:212
-#, no-c-format
-msgid "Fast navigation via buttons."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:213
-#, no-c-format
-msgid "A mouse-click into a summary column sync's all windows to show the same position."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:214
-#, no-c-format
-msgid "Select and copy from any window and paste into the merge result window."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:215
-#, no-c-format
-msgid "Overview column that shows where the changes and conflicts are."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:216
-#, no-c-format
-msgid "The colors are adjustable to your specific preferences."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:217
-#, no-c-format
-msgid "Adjustable Tab size."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:218
-#, no-c-format
-msgid "Option to insert spaces instead of tabs."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:219
-#, no-c-format
-msgid "Open files comfortably via dialog or specify files on the command line."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:220
-#, no-c-format
-msgid "Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:221
-#, no-c-format
-msgid "Show the line numbers for each line."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:222
-#, no-c-format
-msgid "Paste clipboard or drag text into a diff input window."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:223
-#, no-c-format
-msgid "Networktransparency via KIO."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:224
-#, no-c-format
-msgid "Can be used as diff-viewer in KDevelop 3."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:225
-#, no-c-format
-msgid "Word-wrap for long lines."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:226
-#, no-c-format
-msgid "Support for Unicode, UTF-8 and other codecs."
-msgid "Note that <replaceable>file1</replaceable> will be treated as base of <replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:259
-#, no-c-format
-msgid "Special case: Files with the same name"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:260
-#, 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.:"
-" --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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:278
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:281
-#, 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 ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:284
-#, no-c-format
-msgid "Ignorable command line options"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:285
-#, 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:"
-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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:296
-#, 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
-#. +> trunk5
-#: index.docbook:301
-#, no-c-format
-msgid "Open-Dialog"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:302
-#, no-c-format
-msgid "Since many input files must be selectable, the program has a special open dialog:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:308
-#, no-c-format
-msgid "The open dialog allows you to edit the filenames by hand, selecting a file via the file-browser (\"File...\") or allows you 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
-#. +> trunk5
-#: index.docbook:315
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:320
-#, 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
-#. +> trunk5
-#: index.docbook:324
-#, 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
-#. +> trunk5
-#: index.docbook:330
-#, no-c-format
-msgid "Paste and Drop Input"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:331
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:336
-#, 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 ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:339
-#, 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
-#. +> trunk5
-#: index.docbook:343
-#, no-c-format
-msgid "Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input is supported."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:346
-#, 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
-#. +> trunk5
-#: index.docbook:352
-#, no-c-format
-msgid "Comparing Files And Interpreting The Information In The Input Windows"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:356
-#, no-c-format
-msgid "Info Line"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:356
-#, 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
-#. +> trunk5
-#: index.docbook:361
-#, 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
-#. +> trunk5
-#: index.docbook:365
-#, no-c-format
-msgid "Coloring"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:365
-#, 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
-#. +> trunk5
-#: index.docbook:369
-#, 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
-#. +> trunk5
-#: index.docbook:375
-#, no-c-format
-msgid "Summary Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:375
-#, 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
-#. +> trunk5
-#: index.docbook:382
-#, 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
-#. +> trunk5
-#: index.docbook:386
-#, no-c-format
-msgid "Overview Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:386
-#, 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
-#. +> trunk5
-#: index.docbook:398
-#, no-c-format
-msgid "Manually Aligning Lines"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:398
-#, 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 <keycombo>&Ctrl;<keycap>Y</keycap></keycombo>). 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
-#. +> trunk5
-#: index.docbook:409
-#, no-c-format
-msgid "Currently merging doesn't support the use of manual diff help."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:411
-#, no-c-format
-msgid "Manually Joining and Splitting Diff Sections"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:411
-#, 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
-#. +> trunk5
-#: index.docbook:414
-#, 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
-#. +> trunk5
-#: index.docbook:419
-#, 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
-#. +> trunk5
-#: index.docbook:426
-#, no-c-format
-msgid "Merging And The Merge Output Editor Window"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:430
-#, 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
-#. +> trunk5
-#: index.docbook:435
-#, 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
-#. +> trunk5
-#: index.docbook:438
-#, no-c-format
-msgid "With only two input files every difference is also a conflict that must be solved manually."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:441
-#, 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
-#. +> trunk5
-#: index.docbook:448
-#, no-c-format
-msgid "The Summary Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:448
-#, 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 \"<Merge Conflict>\", 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
-#. +> trunk5
-#: index.docbook:458
-#, no-c-format
-msgid "Setting The Current Group And Synchronising Merge And Diff View Position"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:458
-#, 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
-#. +> trunk5
-#: index.docbook:464
-#, no-c-format
-msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:464
-#, 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
-#. +> trunk5
-#: index.docbook:471
-#, 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
-#. +> trunk5
-#: index.docbook:477
-#, 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
-#. +> trunk5
-#: index.docbook:483
-#, 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 <No src line> 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
-#. +> trunk5
-#: index.docbook:489
-#, no-c-format
-msgid "The text \"<Merge Conflict>\" 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
-#. +> trunk5
-#: index.docbook:493
-#, no-c-format
-msgid "Choosing Input A, B, or C for All Conflicts"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:493
-#, 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
-#. +> trunk5
-#: index.docbook:504
-#, 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
-#. +> trunk5
-#: index.docbook:509
-#, no-c-format
-msgid "Automatic Merge of Version Control Keywords and History (Log)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:509
-#, no-c-format
-msgid "Many version control systems support special keywords in the file. (e.g. \"$Date$\", \"$Header$\", \"$Author$\", \"$Log$\" etc.) During the check-in the version control system (VCS) changes these lines. For instance \"$Date$\" will turn into \"$Date: 2005/03/22 18:45:01 $\". Since this line will be different in every version of the file, it would require manual interaction during the merge."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:516
-#, 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
-#. +> trunk5
-#: index.docbook:524
-#, 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
-#. +> trunk5
-#: index.docbook:529
-#, no-c-format
-msgid "Usually the version control history begins with a line containing the keyword \"$Log$\". 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 \"$Log$\"-keyword. If the same \"leading comment\"-characters also appears in the following lines, then they are also included in the history."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:535
-#, 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
-#. +> trunk5
-#: index.docbook:540
-#, 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
-#. +> trunk5
-#: index.docbook:546
-#, 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
-#. +> trunk5
-#: index.docbook:552
-#, no-c-format
-msgid "Note that &kdiff3; will remove duplicate history entries. 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
-#. +> trunk5
-#: index.docbook:555
-#, 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
-#. +> trunk5
-#: index.docbook:561
-#, 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
-#. +> trunk5
-#: index.docbook:565
-#, no-c-format
-msgid ""
-"Example: Assume a history that looks like this: <screen>\n"
-"</screen> The history start line matches the regular expression \".*\\$Log.*\\$.*\". Then follow the history entries."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:569
-#, no-c-format
-msgid "The line with the \"$Log$\"-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
-#. +> trunk5
-#: index.docbook:575
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:583
-#, 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
-#. +> trunk5
-#: index.docbook:588
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:596
-#, 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:"
-msgid "For more information also see <link linkend=\"mergeoptions\">Merge Settings</link>."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:608
-#, no-c-format
-msgid "Navigation And Editing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:609
-#, 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
-#. +> trunk5
-#: index.docbook:616
-#, no-c-format
-msgid "You can also use the wheel mouse to scroll up and down."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:618
-#, 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
-#. +> trunk5
-#: index.docbook:622
-#, 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
-#. +> trunk5
-#: index.docbook:626
-#, 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
-#. +> trunk5
-#: index.docbook:634
-#, no-c-format
-msgid "Auto-Advance"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:635
-#, 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- & 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
-#. +> trunk5
-#: index.docbook:651
-#, no-c-format
-msgid "Select, Copy And Paste"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:652
-#, 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
-#. +> trunk5
-#: index.docbook:659
-#, 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
-#. +> trunk5
-#: index.docbook:662
-#, 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
-#. +> trunk5
-#: index.docbook:666
-#, no-c-format
-msgid "In order to select everything in the current window use menu \"Edit\"->\"Select All\" (Ctrl-A)."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:668
-#, 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 explicitly copy. But pay attention when using this because the contents of the clipboard might then be destroyed accidentally."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:674
-#, no-c-format
-msgid "\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the selected text."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:677
-#, 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
-#. +> trunk5
-#: index.docbook:687
-#, no-c-format
-msgid "Saving"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:688
-#, 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
-#. +> trunk5
-#: index.docbook:696
-#, 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
-#. +> trunk5
-#: index.docbook:705
-#, no-c-format
-msgid "Finding Strings"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:706
-#, 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
-#. +> trunk5
-#: index.docbook:717
-#, no-c-format
-msgid "Printing"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:718
-#, 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
-#. +> trunk5
-#: index.docbook:722
-#, 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
-#. +> trunk5
-#: index.docbook:727
-#, no-c-format
-msgid "All:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:727
-#, no-c-format
-msgid "Print everything."
-msgstr ""
-
-#. Tag: term
-#. +> trunk5
-#: index.docbook:728
-#, no-c-format
-msgid "Current:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:728
-#, no-c-format
-msgid "Print a page starting at the first visible line in the window. (On systems without this option this can be achieved by specifying page number 10000 for printing.)"
-msgstr ""
-
-#. Tag: term
-#. +> trunk5
-#: index.docbook:730
-#, no-c-format
-msgid "Selection:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:730
-#, 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
-#. +> trunk5
-#: index.docbook:736
-#, no-c-format
-msgid "Range:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:736
-#, no-c-format
-msgid "Specify the first and last page."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:739
-#, no-c-format
-msgid "Other important options for printing will be taken from the normal options:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:742
-#, no-c-format
-msgid "Font, font size"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:743
-#, no-c-format
-msgid "Show line numbers"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:744
-#, no-c-format
-msgid "Word wrap"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:745
-#, no-c-format
-msgid "<para>Colors</para>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:746
-#, no-c-format
-msgid "etc."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:748
-#, no-c-format
-msgid "Landscape formatting is also recommended for printing."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:753
-#, no-c-format
-msgid "Options"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:754
-#, 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
-#. +> trunk5
-#: index.docbook:758
-#, no-c-format
-msgid "Font"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:759
-#, 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
-#. +> trunk5
-#: index.docbook:764
-#, no-c-format
-msgid "Italic Font for Deltas:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:764
-#, 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
-#. +> trunk5
-#: index.docbook:771
-#, no-c-format
-msgid "<title>Colors</title>"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:773
-#, no-c-format
-msgid "Foreground color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:773 index.docbook:786
-#, no-c-format
-msgid "Usually black."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:774
-#, no-c-format
-msgid "Background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:774
-#, no-c-format
-msgid "Usually white."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:775
-#, no-c-format
-msgid "Diff Background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:775
-#, no-c-format
-msgid "Usually light gray."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:776
-#, no-c-format
-msgid "Color A:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:776
-#, no-c-format
-msgid "Usually dark blue."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:777
-#, no-c-format
-msgid "Color B:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:777
-#, no-c-format
-msgid "Usually dark green."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:778
-#, no-c-format
-msgid "Color C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:778
-#, no-c-format
-msgid "Usually dark magenta."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:779
-#, no-c-format
-msgid "Conflict Color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:779 index.docbook:784
-#, no-c-format
-msgid "Usually red."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:780
-#, no-c-format
-msgid "Current range background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:780
-#, no-c-format
-msgid "Usually light yellow."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:781
-#, no-c-format
-msgid "Current range diff background color:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:781 index.docbook:785
-#, no-c-format
-msgid "Usually dark yellow."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:782
-#, no-c-format
-msgid "Color for manually selected diff ranges:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:782
-#, no-c-format
-msgid "Usually orange."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:783
-#, no-c-format
-msgid "Newest file color in directory comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:783
-#, no-c-format
-msgid "Usually green."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:784
-#, no-c-format
-msgid "Oldest file color in directory comparison:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:785
-#, no-c-format
-msgid "Middle age file color in directory comparison:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:786
-#, no-c-format
-msgid "Color for missing files in directory comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:788
-#, no-c-format
-msgid "Changing the colors for directory comparison will be effective only when starting the next directory comparison."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:791
-#, 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
-#. +> trunk5
-#: index.docbook:797
-#, no-c-format
-msgid "Editor Settings"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:799
-#, no-c-format
-msgid "Tab inserts spaces:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:799
-#, 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
-#. +> trunk5
-#: index.docbook:802
-#, no-c-format
-msgid "Tab size:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:802
-#, no-c-format
-msgid "Can be adjusted for your specific needs. Default is 8."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:803
-#, no-c-format
-msgid "Auto indentation:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:803
-#, no-c-format
-msgid "When pressing Enter or Return the indentation of the previous line is used for the new line."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:805
-#, no-c-format
-msgid "Auto copy selection:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:805
-#, no-c-format
-msgid "Every selection is immediately copied to the clipboard when active and you needn't explicitly copy it."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:807
-#, no-c-format
-msgid "Line end style:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:807
-#, 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
-#. +> trunk5
-#: index.docbook:812
-#, no-c-format
-msgid "Diff Settings"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:813
-#, 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
-#. +> trunk5
-#: index.docbook:821
-#, no-c-format
-msgid "Ignore numbers:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:821
-#, 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
-#. +> trunk5
-#: index.docbook:826
-#, no-c-format
-msgid "Ignore C/C++ comments:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:826
-#, no-c-format
-msgid "Default is off. Changes in comments will be treated like changes in white space."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:829
-#, no-c-format
-msgid "Ignore case:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:829
-#, 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
-#. +> trunk5
-#: index.docbook:832 index.docbook:999
-#, no-c-format
-msgid "Preprocessor-Command:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:832 index.docbook:835
-#, no-c-format
-msgid "See <link linkend=\"preprocessors\">next section</link>."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:835 index.docbook:1006
-#, no-c-format
-msgid "Line-Matching Preprocessor-Command:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:838
-#, no-c-format
-msgid "Try Hard:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:838
-#, 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
-#. +> trunk5
-#: index.docbook:845
-#, no-c-format
-msgid "Merge Settings"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:847
-#, no-c-format
-msgid "Auto Advance Delay (ms):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:847
-#, 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
-#. +> trunk5
-#: index.docbook:851
-#, no-c-format
-msgid "White space 2/3-file merge default:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:851
-#, 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
-#. +> trunk5
-#: index.docbook:858
-#, no-c-format
-msgid "Auto merge regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:858
-#, 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
-#. +> trunk5
-#: index.docbook:861
-#, no-c-format
-msgid "Run regular expression auto merge on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:861
-#, 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
-#. +> trunk5
-#: index.docbook:864
-#, no-c-format
-msgid "History start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:864
-#, no-c-format
-msgid "Regular expression for the start of the merge history entry. Usually this line contains the \"$Log$\"-keyword. Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:869
-#, no-c-format
-msgid "History entry start regular expression:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:869
-#, 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
-#. +> trunk5
-#: index.docbook:876
-#, no-c-format
-msgid "History merge sorting:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:876
-#, no-c-format
-msgid "Enable version control history sorting."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:879
-#, no-c-format
-msgid "History entry start sort key order:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:879
-#, 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
-#. +> trunk5
-#: index.docbook:887
-#, no-c-format
-msgid "Merge version control history on merge start:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:887
-#, no-c-format
-msgid "If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:890
-#, no-c-format
-msgid "Max number of history entries:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:890
-#, 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
-#. +> trunk5
-#: index.docbook:893
-#, no-c-format
-msgid "Test your regular expressions"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:893
-#, 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
-#. +> trunk5
-#: index.docbook:899
-#, no-c-format
-msgid "Irrelevant merge command:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:899
-#, 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
-#. +> trunk5
-#: index.docbook:911
-#, no-c-format
-msgid "Directory Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:912
-#, 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
-#. +> trunk5
-#: index.docbook:916
-#, no-c-format
-msgid "Yet there is one option here that is also relevant for saving single files:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:920 index.docbook:1618
-#, no-c-format
-msgid "Backup files:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:920
-#, 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
-#. +> trunk5
-#: index.docbook:928
-#, no-c-format
-msgid "Regional and Language Options"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:930
-#, no-c-format
-msgid "Language:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:930
-#, 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 Frameworks version of &kdiff3;.)"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:932
-#, no-c-format
-msgid "Use the same encoding for everything:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:932
-#, 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
-#. +> trunk5
-#: index.docbook:934
-#, no-c-format
-msgid "Local Encoding:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:934
-#, 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
-#. +> trunk5
-#: index.docbook:936
-#, no-c-format
-msgid "File Encoding for A/B/C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:936
-#, 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
-#. +> trunk5
-#: index.docbook:938
-#, no-c-format
-msgid "File Encoding for Merge Output and Saving:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:938
-#, 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
-#. +> trunk5
-#: index.docbook:940
-#, no-c-format
-msgid "File Encoding for Preprocessor Files:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:940
-#, 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
-#. +> trunk5
-#: index.docbook:942
-#, no-c-format
-msgid "Right To Left Language:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:942
-#, 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
-#. +> trunk5
-#: index.docbook:948
-#, no-c-format
-msgid "Miscellaneous"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:949
-#, no-c-format
-msgid "(These options and actions are available in menus or the buttonbar.)"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:951
-#, no-c-format
-msgid "Show line numbers:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:951
-#, no-c-format
-msgid "You can select if line numbers should be shown for the input files."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:953
-#, no-c-format
-msgid "Show space and tabulator characters for differences:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:953
-#, no-c-format
-msgid "Sometimes the visible spaces and tabs are disturbing. You can turn this off."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:955
-#, no-c-format
-msgid "Show white space:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:955
-#, 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
-#. +> trunk5
-#: index.docbook:959
-#, no-c-format
-msgid "Overview options:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:959
-#, 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
-#. +> trunk5
-#: index.docbook:966
-#, no-c-format
-msgid "Word wrap diff windows:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:966
-#, no-c-format
-msgid "Wrap lines when their length would exceed the width of a window."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:969
-#, no-c-format
-msgid "Show Window A/B/C:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:969
-#, 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
-#. +> trunk5
-#: index.docbook:972
-#, no-c-format
-msgid "Toggle Split Orientation:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:972
-#, 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
-#. +> trunk5
-#: index.docbook:976
-#, no-c-format
-msgid "Start a merge quickly:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:976
-#, 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
-#. +> trunk5
-#: index.docbook:986
-#, no-c-format
-msgid "Configuring Keyboard-Shortcuts"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:987
-#, no-c-format
-msgid "Currently only the Frameworks-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...)"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:994
-#, no-c-format
-msgid "Preprocessor Commands"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:995
-#, no-c-format
-msgid "&kdiff3; supports two preprocessor options."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:999
-#, 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
-#. +> trunk5
-#: index.docbook:1006
-#, 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
-#. +> trunk5
-#: index.docbook:1016
-#, 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."
-"</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
-#. +> trunk5
-#: index.docbook:1039
-#, no-c-format
-msgid "<command>sed</command> Basics"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1040
-#, 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
-#. +> trunk5
-#: index.docbook:1051
-#, no-c-format
-msgid ""
-"In this context only the <command>sed</command>-substitute-command is used: <screen>\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"
-"</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"
-"</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."
-msgid "Examples For <command>sed</command>-Use In &kdiff3;"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1068
-#, no-c-format
-msgid "Ignoring Other Types Of Comments"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1069
-#, 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 (') are only important when testing on the command shell as it will otherwise attempt to process some characters. KDiff3 does not do this except for the escape sequences '\\\"' and '\\\\'."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1086
-#, no-c-format
-msgid "Caseinsensitive Diff"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1087
-#, 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
-#. +> trunk5
-#: index.docbook:1097
-#, no-c-format
-msgid "Ignoring Version Control Keywords"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1098
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:1108
-#, 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
-#. +> trunk5
-#: index.docbook:1115
-#, no-c-format
-msgid "Ignoring Numbers"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1116
-#, 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"
-"</screen> Any character within '[' and ']' is a match and will be replaced with nothing."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1124
-#, no-c-format
-msgid "Ignoring Certain Columns"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1125
-#, 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"
-"</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
-#. +> trunk5
-#: index.docbook:1135
-#, no-c-format
-msgid "Combining Several Substitutions"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1136
-#, 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:"
-"</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:"
-msgid "The data is piped through all internal and external preprocessors in the following order:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1162
-#, no-c-format
-msgid "Normal preprocessor,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1163
-#, no-c-format
-msgid "Line-Matching-Preprocessor,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1164
-#, no-c-format
-msgid "Ignore case (conversion to uppercase),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1165
-#, no-c-format
-msgid "Detection of C/C++ comments,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1166
-#, no-c-format
-msgid "Ignore numbers,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1167
-#, no-c-format
-msgid "Ignore white space"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1169
-#, 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
-#. +> trunk5
-#: index.docbook:1172
-#, 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
-#. +> trunk5
-#: index.docbook:1178
-#, no-c-format
-msgid "Warning"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1179
-#, 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
-#. +> trunk5
-#: index.docbook:1183
-#, 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 want 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
-#. +> trunk5
-#: index.docbook:1198
-#, no-c-format
-msgid "Directory Comparison and Merge with &kdiff3;"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1199
-#, no-c-format
-msgid "Introduction into Directory Comparison and Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1200
-#, 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
-#. +> trunk5
-#: index.docbook:1204
-#, 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
-#. +> trunk5
-#: index.docbook:1218
-#, no-c-format
-msgid "To err is human, but to really mess things up you need a computer."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1220
-#, no-c-format
-msgid "So this is what this program can do for you: &kdiff3; ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1224
-#, no-c-format
-msgid "... reads and compares two or three directories recursively,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1225
-#, no-c-format
-msgid "... takes special care of symbolic links,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1226
-#, no-c-format
-msgid "... lets you browse files on mouse double click,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1227
-#, no-c-format
-msgid "... for each item proposes a merge operation, which you can change before starting the directory merge,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1229
-#, no-c-format
-msgid "... lets you simulate the merge and lists the actions that would take place, without actually doing them,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1231
-#, no-c-format
-msgid "... lets you really do the merge, and lets you interact whenever manual interaction is needed,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1233
-#, no-c-format
-msgid "... lets you run the selected operation for all items (key F7) or the selected item (key F6),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1234
-#, no-c-format
-msgid "... lets you continue the merge after manual interaction with key F7,"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1235
-#, no-c-format
-msgid "... optionally creates backups, with the \".orig\" extension,"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1240
-#, no-c-format
-msgid "Starting Directory Comparison Or Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1241
-#, 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."
-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
-#. +> trunk5
-#: index.docbook:1262
-#, 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
-#. +> trunk5
-#: index.docbook:1269
-#, no-c-format
-msgid "Directory Merge Visible Information"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1270
-#, 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
-#. +> trunk5
-#: index.docbook:1274
-#, no-c-format
-msgid "When the directory scan is complete then &kdiff3; will show a listbox with the results left, ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1281
-#, no-c-format
-msgid "... and details about the currently selected item on the right:"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1289
-#, no-c-format
-msgid "The Name Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1290
-#, 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
-#. +> trunk5
-#: index.docbook:1293
-#, 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
-#. +> trunk5
-#: index.docbook:1299
-#, 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
-#. +> trunk5
-#: index.docbook:1303
-#, 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
-#. +> trunk5
-#: index.docbook:1308
-#, no-c-format
-msgid "Normal file"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1309
-#, no-c-format
-msgid "Normal directory (directory-image)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1310
-#, no-c-format
-msgid "Link to a file (file-image with a link arrow)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1311
-#, no-c-format
-msgid "Link to a directory (directory-image with a link arrow)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1313
-#, 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
-#. +> trunk5
-#: index.docbook:1322
-#, no-c-format
-msgid "The Columns A/B/C and the Coloring Scheme"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1323
-#, 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
-#. +> trunk5
-#: index.docbook:1328
-#, no-c-format
-msgid "Black: This item doesn't exist in this directory."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1329
-#, no-c-format
-msgid "Green: Newest item."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1330
-#, no-c-format
-msgid "Yellow: Older than green, newer than red."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1331
-#, no-c-format
-msgid "Red: Oldest item."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1333
-#, 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
-#. +> trunk5
-#: index.docbook:1336
-#, 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
-#. +> trunk5
-#: index.docbook:1340
-#, 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
-#. +> trunk5
-#: index.docbook:1347
-#, no-c-format
-msgid "The Operation Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1348
-#, 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
-#. +> trunk5
-#: index.docbook:1359
-#, no-c-format
-msgid "Three directory-merge (\"A\" is treated as older base of both)."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1360
-#, no-c-format
-msgid "Two directory-merge."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1361
-#, no-c-format
-msgid "Two directory-sync-mode (activate via option \"Synchronize Directories\")."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1363
-#, no-c-format
-msgid "In three directory merge the operation proposal will be: If for an item ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1367
-#, no-c-format
-msgid "... all three directories are equal: Copy from C"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1368
-#, 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
-#. +> trunk5
-#: index.docbook:1370
-#, 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
-#. +> trunk5
-#: index.docbook:1372
-#, 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
-#. +> trunk5
-#: index.docbook:1374
-#, no-c-format
-msgid "... only A exists: Delete the destination (if exists)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1375
-#, no-c-format
-msgid "... only B exists: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1376
-#, no-c-format
-msgid "... only C exists: Copy from C"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1377
-#, no-c-format
-msgid "... A, B and C are not equal: Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1378
-#, 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
-#. +> trunk5
-#: index.docbook:1382
-#, no-c-format
-msgid "In two directory merge the operation proposal will be: If for an item ..."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1386
-#, no-c-format
-msgid "... both directories are equal: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1387
-#, no-c-format
-msgid "... A exists, but not B: Copy from A"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1388
-#, no-c-format
-msgid "... B exists, but not A: Copy from B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1389
-#, no-c-format
-msgid "... A and B exist but are not equal: Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1390 index.docbook:1407
-#, 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
-#. +> trunk5
-#: index.docbook:1394
-#, 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
-#. +> trunk5
-#: index.docbook:1401
-#, no-c-format
-msgid "... both directories are equal: Nothing will be done."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1402
-#, no-c-format
-msgid "... A exists, but not B: Copy A to B"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1403
-#, no-c-format
-msgid "... B exists, but not A: Copy B to A"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1404
-#, 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
-#. +> trunk5
-#: index.docbook:1411
-#, 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
-#. +> trunk5
-#: index.docbook:1420
-#, no-c-format
-msgid "The Status Column"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1421
-#, 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
-#. +> trunk5
-#: index.docbook:1430
-#, no-c-format
-msgid "Statistics Columns"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1431
-#, 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
-#. +> trunk5
-#: index.docbook:1438
-#, no-c-format
-msgid "Selecting Listed Files"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1439
-#, 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
-#. +> trunk5
-#: index.docbook:1443
-#, no-c-format
-msgid "\"Show Identical Files\": Files that have been detected equal in all input directories."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1444
-#, no-c-format
-msgid "\"Show Different Files\": Files that exist in two or more directories but are not equal."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1445
-#, no-c-format
-msgid "\"Show Files only in A\": Files that exist only in A, but not in B or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1446
-#, no-c-format
-msgid "\"Show Files only in B\": Files that exist only in B, but not in A or C."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1447
-#, no-c-format
-msgid "\"Show Files only in C\": Files that exist only in C, but not in A or B."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1449
-#, 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
-#. +> trunk5
-#: index.docbook:1454
-#, 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
-#. +> trunk5
-#: index.docbook:1457
-#, 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
-#. +> trunk5
-#: index.docbook:1465
-#, no-c-format
-msgid "Doing A Directory Merge"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1466
-#, 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
-#. +> trunk5
-#: index.docbook:1470
-#, no-c-format
-msgid "Be aware that if you didn't specify a destination directory explicitly, 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
-#. +> trunk5
-#: index.docbook:1474
-#, 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
-#. +> trunk5
-#: index.docbook:1481
-#, no-c-format
-msgid "\"Recursive Directories\": If this is off, then items in subdirectories will not be found."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1483
-#, no-c-format
-msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1484
-#, no-c-format
-msgid "\"Exclude Hidden Files\""
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1485
-#, no-c-format
-msgid "<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show Identical/Different Files, Files only in A/B/C)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1487
-#, 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
-#. +> trunk5
-#: index.docbook:1492
-#, 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
-#. +> trunk5
-#: index.docbook:1496
-#, no-c-format
-msgid "If you are satisfied so far, the rest is easy."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1498
-#, 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
-#. +> trunk5
-#: index.docbook:1503
-#, 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
-#. +> trunk5
-#: index.docbook:1507
-#, 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
-#. +> trunk5
-#: index.docbook:1512
-#, 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
-#. +> trunk5
-#: index.docbook:1514
-#, no-c-format
-msgid "Otherwise select \"Do it\" to really start merging."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1516
-#, 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
-#. +> trunk5
-#: index.docbook:1520
-#, 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
-#. +> trunk5
-#: index.docbook:1524
-#, 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
-#. +> trunk5
-#: index.docbook:1531
-#, no-c-format
-msgid "When the merge is complete, then &kdiff3; will inform you via a message box."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1534
-#, 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
-#. +> trunk5
-#: index.docbook:1544
-#, no-c-format
-msgid "Options for Comparing and Merging Directories"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1545
-#, no-c-format
-msgid "The &kdiff3;-preferences (menu \"Settings\"->\"Configure &kdiff3;\") has a section called \"Directory Merge\" with these options:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1551
-#, no-c-format
-msgid "Recursive Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1551
-#, no-c-format
-msgid "Select whether to search directories recursively."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1553
-#, no-c-format
-msgid "File Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1553
-#, 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
-#. +> trunk5
-#: index.docbook:1557
-#, no-c-format
-msgid "File Anti-Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1557
-#, 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
-#. +> trunk5
-#: index.docbook:1561
-#, no-c-format
-msgid "Directory Anti-Pattern(s):"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1561
-#, 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
-#. +> trunk5
-#: index.docbook:1565
-#, no-c-format
-msgid "Use CVS-Ignore:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1565
-#, 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
-#. +> trunk5
-#: index.docbook:1570
-#, no-c-format
-msgid "Find Hidden Files and Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1570
-#, 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
-#. +> trunk5
-#: index.docbook:1574
-#, no-c-format
-msgid "Follow File Links:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1574
-#, 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
-#. +> trunk5
-#: index.docbook:1577
-#, no-c-format
-msgid "Follow Directory Links:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1577
-#, 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
-#. +> trunk5
-#: index.docbook:1584
-#, no-c-format
-msgid "Case Sensitive Filename Comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1584
-#, no-c-format
-msgid "Default is false on Windows, true for other operating systems."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1586
-#, no-c-format
-msgid "File Comparison Mode:"
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1588
-#, no-c-format
-msgid "Binary Comparison:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1588
-#, no-c-format
-msgid "This is the default file comparison mode."
-msgstr ""
-
-#. Tag: emphasis
-#. +> trunk5
-#: index.docbook:1591
-#, no-c-format
-msgid "Full Analysis:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1591
-#, 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
-#. +> trunk5
-#: index.docbook:1598
-#, no-c-format
-msgid "Trust the modification date:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1598
-#, 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
-#. +> trunk5
-#: index.docbook:1602
-#, no-c-format
-msgid "Trust the size:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1602
-#, 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
-#. +> trunk5
-#: index.docbook:1609
-#, no-c-format
-msgid "Synchronize Directories:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1609
-#, 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
-#. +> trunk5
-#: index.docbook:1614
-#, no-c-format
-msgid "Copy newer instead of merging:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1614
-#, 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
-#. +> trunk5
-#: index.docbook:1618
-#, 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
-#. +> trunk5
-#: index.docbook:1626
-#, no-c-format
-msgid "Other Functions in Directory Merge Window"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1627
-#, no-c-format
-msgid "Split/Full Screen Mode"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1628
-#, 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 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
-#. +> trunk5
-#: index.docbook:1637
-#, no-c-format
-msgid "Comparing or Merging a Single File"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1638
-#, 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
-#. +> trunk5
-#: index.docbook:1645
-#, 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
-#. +> trunk5
-#: index.docbook:1650
-#, no-c-format
-msgid "Comparing or Merging Files with Different Names"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1651
-#, 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
-#. +> trunk5
-#: index.docbook:1654
-#, 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
-#. +> trunk5
-#: index.docbook:1658
-#, no-c-format
-msgid "Proceed by choosing \"Compare Explicitly Selected Files\" or \"Merge Explicitly 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
-#. +> trunk5
-#: index.docbook:1662
-#, 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
-#. +> trunk5
-#: index.docbook:1670
-#, no-c-format
-msgid "Miscellaneous Topics"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1672
-#, no-c-format
-msgid "Networktransparency via KIO"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1673
-#, no-c-format
-msgid "KIO-Slaves"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1674
-#, no-c-format
-msgid "The KIO library from Frameworks 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."
-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
-#. +> trunk5
-#: index.docbook:1686
-#, no-c-format
-msgid "Other KIO-slaves that are interesting are:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1690
-#, no-c-format
-msgid "Files from the WWW (http:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1691
-#, no-c-format
-msgid "Files from the FTP (ftp:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1692
-#, no-c-format
-msgid "Encrypted file transfer (fish:, sftp:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1693
-#, no-c-format
-msgid "Windows-resources (smb:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1694
-#, no-c-format
-msgid "Local files (file:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1696
-#, no-c-format
-msgid "Other things that are possible, but probably less useful are:"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1700
-#, no-c-format
-msgid "Man-pages (man:),"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1701
-#, no-c-format
-msgid "Info-pages (info:),"
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1705
-#, no-c-format
-msgid "How To Write URLs"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1706
-#, 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
-#. +> trunk5
-#: index.docbook:1711
-#, 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
-#. +> trunk5
-#: index.docbook:1714
-#, 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
-#. +> trunk5
-#: index.docbook:1717
-#, no-c-format
-msgid "When URLs don't work as expected, try to open them in Konqueror first."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1724
-#, no-c-format
-msgid "Capabilities of KIO-Slaves"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1725
-#, no-c-format
-msgid "Networktransparency has one drawback: Not all resources have the same capabilities."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1727
-#, 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
-#. +> trunk5
-#: index.docbook:1732
-#, no-c-format
-msgid "Sometimes there is no support for links."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1734
-#, 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
-#. +> trunk5
-#: index.docbook:1737
-#, no-c-format
-msgid "Can't always determine the filesize."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1739
-#, no-c-format
-msgid "Limited support for permissions."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1741
-#, 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
-#. +> trunk5
-#: index.docbook:1751
-#, no-c-format
-msgid "Using &kdiff3; as a KPart"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1752
-#, no-c-format
-msgid "&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1754
-#, 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 context menu."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1758
-#, no-c-format
-msgid "&kdiff3; normally requires two complete files as input. When used as part &kdiff3; will assume that the input file 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
-#. +> trunk5
-#: index.docbook:1764
-#, no-c-format
-msgid "In &dolphin; you can select a patch-file and select \"Preview in\"-\"KDiff3Part\" from the context menu. 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
-#. +> trunk5
-#: index.docbook:1769
-#, 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
-#. +> trunk5
-#: index.docbook:1776
-#, no-c-format
-msgid "Using &kdiff3; as a Git Diff and Merging Tool"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1777
-#, no-c-format
-msgid "&kdiff3; can be used as a <ulink url=\"https://git-scm.com/\">Git</ulink> diff and merge tool."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1780
-#, no-c-format
-msgid "Just add the following lines into your <filename>gitconfig</filename> file."
-msgstr ""
-
-#. Tag: programlisting
-#. +> trunk5
-#: index.docbook:1783
-#, no-c-format
-msgid ""
-"[diff]\n"
-" tool = kdiff3\n"
-"[difftool \"kdiff3\"]\n"
-" path = <path to kdiff3 binary in your system>\n"
-"[difftool]\n"
-" prompt = false\n"
-" keepBackup = false\n"
-" trustExitCode = false\n"
-"[merge]\n"
-" tool = kdiff3\n"
-"[mergetool]\n"
-" prompt = false\n"
-" keepBackup = false\n"
-" keepTemporaries = false\n"
-"[mergetool \"kdiff3\"]\n"
-" path = <path to kdiff3 binary in your system>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1784
-#, no-c-format
-msgid "Then to see the difference between two commits use <userinput>git difftool <replaceable>first_hash</replaceable> <replaceable>second_hash</replaceable> --tool=kdiff3 --cc <replaceable>some_file_in_the_git_tree</replaceable></userinput>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1787
-#, no-c-format
-msgid "To merge a branch with &kdiff3; use <userinput>git merge <replaceable>branch_name</replaceable> && git mergetool --tool=kdiff3</userinput>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1790
-#, no-c-format
-msgid "After resolving merging conflicts in the <link linkend=\"synchronise_views\">usual way</link> it is enough to commit the changes to do the job."
-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
-#. +> trunk5
-#: index.docbook:1811
-#, no-c-format
-msgid "Why did I release it under GPL?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1813
-#, 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
-#. +> trunk5
-#: index.docbook:1819
-#, no-c-format
-msgid "Some buttons and functions are missing. What's wrong?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1821
-#, no-c-format
-msgid "You compiled from source but you probably didn't specify the correct prefix for the installation. By default cmake wants to install in /usr/local but then the user-interface resource file (i.e. kdiff3ui.rc) can't be found. The README-file contains more information about the correct prefix."
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1828
-#, no-c-format
-msgid "Often lines that are similar but not identical appear next to each other but sometimes not. Why?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1831
-#, 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
-#. +> trunk5
-#: index.docbook:1839
-#, no-c-format
-msgid "Why must all conflicts be solved before the merge result can be saved?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1841
-#, 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
-#. +> trunk5
-#: index.docbook:1850
-#, 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
-#. +> trunk5
-#: index.docbook:1852
-#, no-c-format
-msgid "Click into the summary column left of the text. (<link linkend=\"synchronise_views\">See also here.</link>)"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1856
-#, no-c-format
-msgid "Why does the editor in the merge result window not have an \"undo\"-function?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1858
-#, 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
-#. +> trunk5
-#: index.docbook:1864
-#, no-c-format
-msgid "When I removed some text, then suddenly \"<No src line>\" appeared and cannot be deleted. What does that mean and how can one remove this?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1867
-#, no-c-format
-msgid "For each equal or different section the editor in the merge result window remembers where it begins or ends. \"<No src line>\" 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
-#. +> trunk5
-#: index.docbook:1878
-#, no-c-format
-msgid "Why doesn't &kdiff3; support syntax-highlighting?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1880
-#, 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
-#. +> trunk5
-#: index.docbook:1885
-#, no-c-format
-msgid "Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1887
-#, 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
-#. +> trunk5
-#: index.docbook:1890
-#, 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
-#. +> trunk5
-#: index.docbook:1896
-#, 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
-#. +> trunk5
-#: index.docbook:1900
-#, 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 clipboard 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
-#. +> trunk5
-#: index.docbook:1908
-#, no-c-format
-msgid "Where has the directory option \"List only deltas\" gone?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1910
-#, 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
-#. +> trunk5
-#: index.docbook:1915
-#, no-c-format
-msgid "How can I make a big selection in the diff input window because scrolling takes so long?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1918
-#, 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
-#. +> trunk5
-#: index.docbook:1924
-#, no-c-format
-msgid "There is so much information here, but your question is still not answered?"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1926
-#, no-c-format
-msgid "Please send me your question. I appreciate every comment."
-msgstr ""
-
-#. Tag: title
-#. +> trunk5
-#: index.docbook:1935
-#, no-c-format
-msgid "Credits and License"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1937
-#, no-c-format
-msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1940
-#, no-c-format
-msgid "Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>"
-msgstr ""
-
-#. Tag: para
-#. +> trunk5
-#: index.docbook:1943
-#, no-c-format
-msgid "Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!"
+"For simple comparison of two selected files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
+"Same also applies to directory comparison and merge."
-"For simple comparison of two selected files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n"
-"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n"
-"Same also applies to directory comparison and merge."