Mercurial > hg > easyhg-kdiff3
changeset 59:b9d051fd4fd5
Version 0.9.83
author | joachim99 |
---|---|
date | Sun, 07 Mar 2004 10:05:41 +0000 |
parents | 8af4bb9d9a5a |
children | 4732f709a8cb |
files | kdiff3/po/README kdiff3/po/fr.po kdiff3/po/pt.po kdiff3/po/ru.po kdiff3/po/ta.po |
diffstat | 5 files changed, 4849 insertions(+), 826 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/po/README Sun Mar 07 09:59:09 2004 +0000 +++ b/kdiff3/po/README Sun Mar 07 10:05:41 2004 +0000 @@ -13,6 +13,7 @@ de Deutsch en_GB British English et Estonian +fr French it Italian pt Portuguese pt_BR Brazilian Portuguese @@ -22,6 +23,7 @@ These languages are partly done: es Espaniol hu Hungarian +ru Russian Thanks to all translators! @@ -49,6 +51,12 @@ msgfmt, but this happens automatically during the build process. (If a new po-file was added: make -f Makefile.cvs; configure; make) +Before starting to translate make sure nobody else is already doing it. It would +be a pity, if your precious time is wasted. Look at http://i18n.kde.org/, send a +message to the translation team coordinator for your language, and tell them that +you want to translate KDiff3. He'll inform you if you should proceed. Also read +the other docs on that site. + ============ The following is for my own memory and for those who really want to learn dirty tricks and details:
--- a/kdiff3/po/fr.po Sun Mar 07 09:59:09 2004 +0000 +++ b/kdiff3/po/fr.po Sun Mar 07 10:05:41 2004 +0000 @@ -1,88 +1,86 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# traduction de kdiff3.app.po en Français +# translation of kdiff3.app.po to French +# Copyright (C) 2004 Free Software Foundation, Inc. +# Simon DEPIETS <sdepiets@hotmail.com>, 2004. +# Delafond <gerard@delafond.org>, 2004. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-10 01:44+0100\n" -"PO-Revision-Date: 2004-01-31 15:26+0100\n" -"Last-Translator: Sbastien Fricker <sebastien_fricker@yahoo.fr>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"Project-Id-Version: kdiff3.app\n" +"POT-Creation-Date: 2004-01-09 01:37+0100\n" +"PO-Revision-Date: 2004-02-12 18:53+0100\n" +"Last-Translator: Delafond <gerard@delafond.org>\n" +"Language-Team: Français <kde-francophone@kde.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3\n" #: _translatorinfo.cpp:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "Sbastien Fricker" +msgstr "Simon Depiets" #: _translatorinfo.cpp:3 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "sebastien_fricker@yahoo.fr" +msgstr "2df@tuxfamily.org" #: diff.cpp:472 msgid "From Clipboard" -msgstr "" +msgstr "Depuis le Presse-papiers" -#: diff.cpp:1098 -#: diff.cpp:1112 +#: diff.cpp:1096 diff.cpp:1110 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -"Erreur de perte de donnes:\n" -"Si l'erreur se produit a nouveau, contactez l'auteur.\n" +"Données perdues :\n" +"Si cela se reproduit, contactez l'auteur.\n" -#: diff.cpp:1100 -#: diff.cpp:1114 +#: diff.cpp:1098 diff.cpp:1112 msgid "Severe Internal Error" -msgstr "Erreur Interne Critique" +msgstr "Erreur interne sévère" -#: difftextwindow.cpp:789 +#: difftextwindow.cpp:790 #, c-format msgid "Topline %1" -msgstr "" +msgstr "Première Ligne %1" -#: difftextwindow.cpp:791 +#: difftextwindow.cpp:792 msgid "End" msgstr "Fin" #: directorymergewindow.cpp:113 msgid "Mix of links and normal files." -msgstr "" +msgstr "Mélange de liens et de fichiers normaux." #: directorymergewindow.cpp:120 msgid "Link: " -msgstr "Lien:" +msgstr "Lien : " #: directorymergewindow.cpp:128 msgid "Size. " -msgstr "Taille." +msgstr "Taille. " #: directorymergewindow.cpp:141 msgid "Date & Size: " -msgstr "Date et Taille:" +msgstr "Date et Taille : " -#: directorymergewindow.cpp:150 -#: directorymergewindow.cpp:156 +#: directorymergewindow.cpp:150 directorymergewindow.cpp:156 msgid "Creating temp copy of %1 failed." -msgstr "" +msgstr "La création de la copie temporaire de %1 a échoué." -#: directorymergewindow.cpp:167 -#: directorymergewindow.cpp:175 +#: directorymergewindow.cpp:167 directorymergewindow.cpp:175 msgid "Opening %1 failed." -msgstr "Erreur d'ouverture de %1." +msgstr "L'ouverture de %1 a échoué." -#: directorymergewindow.cpp:191 -#: directorymergewindow.cpp:197 +#: directorymergewindow.cpp:191 directorymergewindow.cpp:197 #, c-format msgid "Error reading from %1" -msgstr "Erreur de lecture de %1." +msgstr "Erreur de lecture de %1" #: directorymergewindow.cpp:243 msgid "Name" @@ -90,191 +88,190 @@ #: directorymergewindow.cpp:247 msgid "Operation" -msgstr "Opration" +msgstr "Opération" #: directorymergewindow.cpp:248 msgid "Status" -msgstr "tat" +msgstr "État" #: directorymergewindow.cpp:271 -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" +"Vous procédez à une fusion. Confirmez-vous l'abandon de la fusion et le " +"rafraîchissement du dossier ?" -#: directorymergewindow.cpp:272 -#: directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:272 directorymergewindow.cpp:2269 msgid "Rescan" -msgstr "Rescanner" +msgstr "Rafraîchissement" -#: directorymergewindow.cpp:272 -#: kdiff3.cpp:504 -#: pdiff.cpp:1186 +#: directorymergewindow.cpp:272 kdiff3.cpp:504 pdiff.cpp:1201 msgid "Continue Merging" -msgstr "Continuer la fusion" +msgstr "La fusion continue" -#: directorymergewindow.cpp:380 +#: directorymergewindow.cpp:381 msgid "Opening of directories failed:" -msgstr "chec d'ouverture du rpertoire" +msgstr "L'ouverture des dossiers a échoué :" -#: directorymergewindow.cpp:383 -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Rpertoire \"%1\" n'existe pas ou n'est pas un rpertoire.\n" +#: directorymergewindow.cpp:384 +msgid "" +"Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "" +"Le dossier A « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:386 -msgid "Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:387 +msgid "" +"Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" +"Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:389 -msgid "Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:390 +msgid "" +"Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" +"Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:391 +#: directorymergewindow.cpp:392 msgid "Directory Open Error" -msgstr "erreur d'ouverture du rpertoire." +msgstr "Erreur lors de l'ouverture du dossier" -#: directorymergewindow.cpp:399 +#: directorymergewindow.cpp:400 msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" +"Le dossier de destination ne doit pas être le même que A ou B quand trois " +"fichiers sont fusionnés.\n" +"Vérifiez avant de continuer." -#: directorymergewindow.cpp:401 +#: directorymergewindow.cpp:402 msgid "Parameter Warning" -msgstr "" +msgstr "Avertissement pour les paramètres" -#: directorymergewindow.cpp:428 +#: directorymergewindow.cpp:429 msgid "Reading Directory A" -msgstr "Lecture du Rpertoire A" +msgstr "Lecture du dossier A" -#: directorymergewindow.cpp:450 +#: directorymergewindow.cpp:451 msgid "Reading Directory B" -msgstr "Lecture du Rpertoire B" +msgstr "Lecture du dossier B" -#: directorymergewindow.cpp:472 +#: directorymergewindow.cpp:473 msgid "Reading Directory C" -msgstr "Lecture du Rpertoire C" +msgstr "Lecture du dossier C" -#: directorymergewindow.cpp:498 +#: directorymergewindow.cpp:499 msgid "Some subdirectories were not readable in" -msgstr "" +msgstr "Certains sous-dossiers ne sont pas lisibles" -#: directorymergewindow.cpp:503 +#: directorymergewindow.cpp:504 msgid "Check the permissions of the subdirectories." -msgstr "" - -#: directorymergewindow.cpp:550 -msgid "Directory Comparison Status" -msgstr "tat de la Comparaison des Rpertoires" +msgstr "Vérifiez les permissions des sous-dossiers." #: directorymergewindow.cpp:551 -msgid "Number of subdirectories:" -msgstr "" +msgid "Directory Comparison Status" +msgstr "État de la comparaison des dossiers." #: directorymergewindow.cpp:552 -msgid "Number of equal files:" -msgstr "" +msgid "Number of subdirectories:" +msgstr "Nombre de sous-dossiers :" #: directorymergewindow.cpp:553 +msgid "Number of equal files:" +msgstr "Nombre de fichiers identiques :" + +#: directorymergewindow.cpp:554 msgid "Number of different files:" -msgstr "" +msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:556 +#: directorymergewindow.cpp:557 msgid "Number of manual merges:" -msgstr "" +msgstr "Nombre de fusions manuelles :" -#: directorymergewindow.cpp:684 +#: directorymergewindow.cpp:693 msgid "This affects all merge operations." -msgstr "" +msgstr "Cela affecte toutes les opérations de fusion" -#: directorymergewindow.cpp:685 +#: directorymergewindow.cpp:694 msgid "Changing All Merge Operations" -msgstr "" +msgstr "Changement de toutes les opérations de fusion" -#: directorymergewindow.cpp:685 -#: mergeresultwindow.cpp:251 +#: directorymergewindow.cpp:694 mergeresultwindow.cpp:252 msgid "C&ontinue" msgstr "C&ontinuer" -#: directorymergewindow.cpp:952 +#: directorymergewindow.cpp:961 msgid "Processing " -msgstr "Traitement en cours" +msgstr "En cours " -#: directorymergewindow.cpp:1300 -#: directorymergewindow.cpp:1307 +#: directorymergewindow.cpp:1309 directorymergewindow.cpp:1316 msgid "To do." -msgstr " faire." +msgstr "A faire." -#: directorymergewindow.cpp:1334 -#: directorymergewindow.cpp:2279 +#: directorymergewindow.cpp:1343 directorymergewindow.cpp:2284 msgid "Copy A to B" msgstr "Copier A vers B" -#: directorymergewindow.cpp:1335 -#: directorymergewindow.cpp:2280 +#: directorymergewindow.cpp:1344 directorymergewindow.cpp:2285 msgid "Copy B to A" msgstr "Copier B vers A" -#: directorymergewindow.cpp:1336 -#: directorymergewindow.cpp:2281 +#: directorymergewindow.cpp:1345 directorymergewindow.cpp:2286 msgid "Delete A" -msgstr "ffacer A" +msgstr "Supprimer A" -#: directorymergewindow.cpp:1337 -#: directorymergewindow.cpp:2282 +#: directorymergewindow.cpp:1346 directorymergewindow.cpp:2287 msgid "Delete B" -msgstr "ffacer B" +msgstr "Supprimer B" -#: directorymergewindow.cpp:1338 +#: directorymergewindow.cpp:1347 msgid "Delete A & B" -msgstr "ffacer A & B" +msgstr "Supprimer A et B" -#: directorymergewindow.cpp:1339 -#: directorymergewindow.cpp:2284 +#: directorymergewindow.cpp:1348 directorymergewindow.cpp:2289 msgid "Merge to A" -msgstr "Fusionner dans A" +msgstr "Fusionner vers A" -#: directorymergewindow.cpp:1340 -#: directorymergewindow.cpp:2285 +#: directorymergewindow.cpp:1349 directorymergewindow.cpp:2290 msgid "Merge to B" -msgstr "Fusionner dans B" +msgstr "Fusionner vers B" -#: directorymergewindow.cpp:1341 +#: directorymergewindow.cpp:1350 msgid "Merge to A & B" -msgstr "Fusionner dans A & B" +msgstr "Fusionner vers A et B" -#: directorymergewindow.cpp:1345 +#: directorymergewindow.cpp:1354 msgid "Delete (if exists)" -msgstr "ffacer (si existant)" +msgstr "Supprimer (si existant)" -#: directorymergewindow.cpp:1346 -#: directorymergewindow.cpp:1347 -#: directorymergewindow.cpp:2275 -#: pdiff.cpp:1061 +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +#: directorymergewindow.cpp:2280 pdiff.cpp:1076 msgid "Merge" msgstr "Fusion" -#: directorymergewindow.cpp:1346 -#: directorymergewindow.cpp:1347 +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 msgid "Merge (manual)" -msgstr "Fusion (manuelle)" +msgstr "Fusion (Manuelle)" -#: directorymergewindow.cpp:1348 +#: directorymergewindow.cpp:1357 msgid "Error: Conflicting File Types" -msgstr "" +msgstr "Erreur : conflit de types de fichiers" -#: directorymergewindow.cpp:1349 +#: directorymergewindow.cpp:1358 msgid "Error: Dates are equal but files are not." -msgstr "" +msgstr "Erreur : les dates sont les mêmes, mais pas les fichiers." -#: directorymergewindow.cpp:1373 +#: directorymergewindow.cpp:1382 msgid "This operation is currently not possible." -msgstr "" +msgstr "Cette opération n'est pas possible actuellement." -#: directorymergewindow.cpp:1373 -#: directorymergewindow.cpp:1633 +#: directorymergewindow.cpp:1382 directorymergewindow.cpp:1642 msgid "Operation Not Possible" -msgstr "" +msgstr "Opération impossible" -#: directorymergewindow.cpp:1416 +#: directorymergewindow.cpp:1425 msgid "" "This should never happen: \n" "\n" @@ -282,1103 +279,1205 @@ "\n" "If you know how to reproduce this, please contact the program author." msgstr "" +"Cela ne devrait jamais arriver : \n" +"\n" +"mergeResultSaved : m_pMFI=0\n" +"\n" +"Si vous savez comment reproduire cela, veuillez contacter l'auteur." -#: directorymergewindow.cpp:1416 +#: directorymergewindow.cpp:1425 msgid "Program Error" +msgstr "Erreur du programme" + +#: directorymergewindow.cpp:1436 +msgid "" +"An error occurred while copying.\n" msgstr "" +"Une erreur est survenue lors de la copie.\n" -#: directorymergewindow.cpp:1427 -msgid "An error occurred while copying.\n" -msgstr "" +#: directorymergewindow.cpp:1437 directorymergewindow.cpp:1843 +msgid "Merge Error" +msgstr "Erreur de fusion" -#: directorymergewindow.cpp:1428 -#: directorymergewindow.cpp:1834 -msgid "Merge Error" -msgstr "" +#: directorymergewindow.cpp:1442 directorymergewindow.cpp:1848 +msgid "Error." +msgstr "Erreur." -#: directorymergewindow.cpp:1433 -#: directorymergewindow.cpp:1839 -msgid "Error." -msgstr "" +#: directorymergewindow.cpp:1447 directorymergewindow.cpp:1739 +#: directorymergewindow.cpp:1779 +msgid "Done." +msgstr "Fait." -#: directorymergewindow.cpp:1438 -#: directorymergewindow.cpp:1730 -#: directorymergewindow.cpp:1770 -msgid "Done." -msgstr "" +#: directorymergewindow.cpp:1470 +msgid "Not saved." +msgstr "Non enregistré." -#: directorymergewindow.cpp:1461 -msgid "Not saved." -msgstr "" +#: directorymergewindow.cpp:1505 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" -#: directorymergewindow.cpp:1496 -msgid "Unknown merge operation. (This must never happen!)" -msgstr "" +#: directorymergewindow.cpp:1537 +msgid "Unknown merge operation." +msgstr "Opération de fusion inconnue." -#: directorymergewindow.cpp:1528 -msgid "Unknown merge operation." -msgstr "" - -#: directorymergewindow.cpp:1543 +#: directorymergewindow.cpp:1552 msgid "" "The merge is about to begin.\n" "\n" -"Choose \"Do it\" if you have read the instructions and know what you are doing.\n" +"Choose \"Do it\" if you have read the instructions and know what you are " +"doing.\n" "Choosing \"Simulate it\" will tell you what would happen.\n" "\n" -"Be aware that this program still has beta status and there is NO WARRANTY whatsoever! Make backups of your vital data!" +"Be aware that this program still has beta status and there is NO WARRANTY " +"whatsoever! Make backups of your vital data!" msgstr "" +"La fusion est sur le point de commencer\n" +"\n" +"Choisissez « Faire » si vous avez lu les instructions et savez ce que " +"vous faites.\n" +"Choisissez « Simuler » pour simuler ce qui arrivera.\n" +"\n" +"Sachez que ce programme est toujours en phase bêta et qu'il n'y a AUCUNE " +"GARANTIE en aucun cas ! Sauvegardez vos données vitales !" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Starting Merge" -msgstr "" +msgstr "Lancement de la fusion" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Do It" -msgstr "" +msgstr "Faire" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Simulate It" -msgstr "" - -#: directorymergewindow.cpp:1574 -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "" +msgstr "Simuler" #: directorymergewindow.cpp:1583 -msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" +"L'objet surligné a un format différent dans les différents dossiers. " +"Choisissez que faire." -#: directorymergewindow.cpp:1633 +#: directorymergewindow.cpp:1592 +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"Les dates de modification du fichier sont égales, mais pas les fichiers. " +"Sélectionnez que faire." + +#: directorymergewindow.cpp:1642 msgid "This operation is currently not possible because dir merge currently runs." msgstr "" +"Cette opération n'est actuellement pas possible car une fusion de dossiers " +"est en cours." -#: directorymergewindow.cpp:1692 +#: directorymergewindow.cpp:1701 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" +"Il y a eu une erreur à la dernière étape.\n" +"Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous " +"le sauter ?" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Continue merge after an error" -msgstr "" +msgstr "Continuer la fusion après une erreur" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Continue With Last Item" -msgstr "" +msgstr "Continuer avec le dernier élément" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Skip Item" -msgstr "" +msgstr "Sauter l'élément" -#: directorymergewindow.cpp:1730 +#: directorymergewindow.cpp:1739 msgid "Skipped." -msgstr "" +msgstr "Elément sauté." -#: directorymergewindow.cpp:1737 -#: directorymergewindow.cpp:1963 +#: directorymergewindow.cpp:1746 directorymergewindow.cpp:1972 msgid "In progress..." -msgstr "" +msgstr "En cours..." -#: directorymergewindow.cpp:1785 +#: directorymergewindow.cpp:1794 msgid "Merge operation complete." -msgstr "" +msgstr "Opération de fusion complète." -#: directorymergewindow.cpp:1785 -#: directorymergewindow.cpp:1788 +#: directorymergewindow.cpp:1794 directorymergewindow.cpp:1797 msgid "Merge Complete" -msgstr "" +msgstr "Fusion complète." -#: directorymergewindow.cpp:1797 +#: directorymergewindow.cpp:1806 msgid "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" +"Simulation de fusion complète : vérifiez si vous êtes d'accord avec les " +"opérations proposées." -#: directorymergewindow.cpp:1833 -msgid "An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:1842 +msgid "" +"An error occurred. Press OK to see detailed information.\n" msgstr "" +"Une erreur s'est produite. Appuyez sur OK pour les informations " +"détaillées.\n" -#: directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1885 msgid "Error: While deleting %1: Creating backup failed." msgstr "" +"Erreur : durant la suppression de %1 : échec de la création de " +"sauvegarde." -#: directorymergewindow.cpp:1883 +#: directorymergewindow.cpp:1892 msgid "delete directory recursively( %1 )" -msgstr "" +msgstr "supprimer le dossier récursivement (%1)" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1894 msgid "delete( %1 )" -msgstr "" +msgstr "supprimer (%1)" -#: directorymergewindow.cpp:1900 +#: directorymergewindow.cpp:1909 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" +"Erreur : échec de la suppression d'un dossier durant la tentative de " +"lecture du dossier." -#: directorymergewindow.cpp:1919 +#: directorymergewindow.cpp:1928 msgid "Error: rmdir( %1 ) operation failed." -msgstr "" +msgstr "Erreur : échec de la suppression du dossier (%1)" -#: directorymergewindow.cpp:1929 +#: directorymergewindow.cpp:1938 msgid "Error: delete operation failed." -msgstr "" +msgstr "Erreur : échec de l'opération de suppression." -#: directorymergewindow.cpp:1955 +#: directorymergewindow.cpp:1964 msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" +msgstr "Fusion manuelle (%1, %2, %3 vers %4)" -#: directorymergewindow.cpp:1958 +#: directorymergewindow.cpp:1967 msgid " Note: After a manual merge the user should continue via F7." msgstr "" +" Note : après une fusion manuelle, l'utilisateur peut continuer avec " +"F7." -#: directorymergewindow.cpp:1981 +#: directorymergewindow.cpp:1990 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" +"Erreur : la copie de %1 vers %2 a échoué. La suppression de la " +"destination existante a échoué." -#: directorymergewindow.cpp:1991 +#: directorymergewindow.cpp:2000 msgid "copyLink( %1 -> %2 )" -msgstr "" +msgstr "copier le lien (%1 vers %2)" -#: directorymergewindow.cpp:2002 +#: directorymergewindow.cpp:2011 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" +"Erreur : la copie des liens à échoué: les liens distants ne sont pas " +"encore gérés." -#: directorymergewindow.cpp:2008 +#: directorymergewindow.cpp:2017 msgid "Error: copyLink failed." -msgstr "" +msgstr "Erreur : échec de la copie du lien" -#: directorymergewindow.cpp:2028 +#: directorymergewindow.cpp:2037 msgid "copy( %1 -> %2 )" -msgstr "" +msgstr "copie (%1 vers %2)" -#: directorymergewindow.cpp:2054 +#: directorymergewindow.cpp:2063 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" - -#: directorymergewindow.cpp:2060 -msgid "rename( %1 -> %2 )" -msgstr "" +"Erreur lors du changement de nom du fichier (%1 vers %2) : impossible de " +"supprimer la destination." #: directorymergewindow.cpp:2069 +msgid "rename( %1 -> %2 )" +msgstr "changement de nom (%1 vers %2)" + +#: directorymergewindow.cpp:2078 msgid "Error: Rename failed." -msgstr "" +msgstr "Erreur : échec du changement de nom." -#: directorymergewindow.cpp:2087 +#: directorymergewindow.cpp:2096 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" +"Erreur durant la création du dossier %1. Impossible de supprimer le fichier " +"existant." -#: directorymergewindow.cpp:2103 +#: directorymergewindow.cpp:2112 msgid "makeDir( %1 )" -msgstr "" +msgstr "Création du Dossier (%1)" -#: directorymergewindow.cpp:2113 +#: directorymergewindow.cpp:2122 msgid "Error while creating directory." -msgstr "" +msgstr "Erreur durant la création du dossier" -#: directorymergewindow.cpp:2140 -#: directorymergewindow.cpp:2248 +#: directorymergewindow.cpp:2145 directorymergewindow.cpp:2253 msgid "Dest" -msgstr "" +msgstr "Destination" -#: directorymergewindow.cpp:2144 -#: directorymergewindow.cpp:2173 +#: directorymergewindow.cpp:2149 directorymergewindow.cpp:2178 msgid "Dir" -msgstr "" +msgstr "Dossier" -#: directorymergewindow.cpp:2145 +#: directorymergewindow.cpp:2150 msgid "Type" -msgstr "" +msgstr "Type" -#: directorymergewindow.cpp:2146 +#: directorymergewindow.cpp:2151 msgid "Size" -msgstr "" +msgstr "Taille" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2152 msgid "Attr" -msgstr "" +msgstr "Attributs" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2153 msgid "Last Modification" -msgstr "" +msgstr "Dernière modification" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2154 msgid "Link-Destination" -msgstr "" +msgstr "Destination du lien" -#: directorymergewindow.cpp:2190 +#: directorymergewindow.cpp:2195 msgid "not available" -msgstr "" +msgstr "non disponible" -#: directorymergewindow.cpp:2210 +#: directorymergewindow.cpp:2215 msgid "A (Dest): " -msgstr "" +msgstr "A (Destination) : " -#: directorymergewindow.cpp:2213 +#: directorymergewindow.cpp:2218 msgid "A (Base): " -msgstr "" +msgstr "A (Base) : " -#: directorymergewindow.cpp:2219 +#: directorymergewindow.cpp:2224 msgid "B (Dest): " -msgstr "" +msgstr "B (Destination) : " -#: directorymergewindow.cpp:2227 +#: directorymergewindow.cpp:2232 msgid "C (Dest): " -msgstr "" +msgstr "C (Destination) : " -#: directorymergewindow.cpp:2233 +#: directorymergewindow.cpp:2238 msgid "Dest: " -msgstr "" - -#: directorymergewindow.cpp:2258 -msgid "Start/Continue Directory Merge" -msgstr "" - -#: directorymergewindow.cpp:2259 -msgid "Run Operation for Current Item" -msgstr "" - -#: directorymergewindow.cpp:2260 -msgid "Compare Selected File" -msgstr "" - -#: directorymergewindow.cpp:2261 -msgid "Merge Current File" -msgstr "" - -#: directorymergewindow.cpp:2262 -msgid "Fold All Subdirs" -msgstr "" +msgstr "Destination : " #: directorymergewindow.cpp:2263 -msgid "Unfold All Subdirs" -msgstr "" +msgid "Start/Continue Directory Merge" +msgstr "Commencer/Continuer la fusion des dossiers" + +#: directorymergewindow.cpp:2264 +msgid "Run Operation for Current Item" +msgstr "Lancer l'opération pour l'élément courant" #: directorymergewindow.cpp:2265 -msgid "Choose A for All Items" -msgstr "" +msgid "Compare Selected File" +msgstr "Comparer le fichier sélectionné" #: directorymergewindow.cpp:2266 -msgid "Choose B for All Items" -msgstr "" +msgid "Merge Current File" +msgstr "Fusionner le fichier en cours" #: directorymergewindow.cpp:2267 -msgid "Choose C for All Items" -msgstr "" +msgid "Fold All Subdirs" +msgstr "Inclure tous les sous-dossiers" #: directorymergewindow.cpp:2268 -msgid "Auto-Choose Operation for All Items" -msgstr "" +msgid "Unfold All Subdirs" +msgstr "Ne pas suivre les sous-dossiers" -#: directorymergewindow.cpp:2269 -msgid "No Operation for All Items" -msgstr "" +#: directorymergewindow.cpp:2270 +msgid "Choose A for All Items" +msgstr "Choisir A pour tous les éléments" #: directorymergewindow.cpp:2271 -#: directorymergewindow.cpp:2278 -msgid "Do Nothing" -msgstr "" +msgid "Choose B for All Items" +msgstr "Choisir B pour tous les éléments" #: directorymergewindow.cpp:2272 -msgid "A" -msgstr "" +msgid "Choose C for All Items" +msgstr "Choisir C pour tous les éléments" #: directorymergewindow.cpp:2273 -msgid "B" -msgstr "" +msgid "Auto-Choose Operation for All Items" +msgstr "Choisir automatiquement l'opération pour tous les éléments" #: directorymergewindow.cpp:2274 +msgid "No Operation for All Items" +msgstr "Pas d'opérations pour tous les éléments" + +#: directorymergewindow.cpp:2276 directorymergewindow.cpp:2283 +msgid "Do Nothing" +msgstr "Ne rien faire" + +#: directorymergewindow.cpp:2277 +msgid "A" +msgstr "A" + +#: directorymergewindow.cpp:2278 +msgid "B" +msgstr "B" + +#: directorymergewindow.cpp:2279 msgid "C" -msgstr "" +msgstr "C" -#: directorymergewindow.cpp:2276 +#: directorymergewindow.cpp:2281 msgid "Delete (If Exists)" -msgstr "" +msgstr "Supprimer (si existant)" -#: directorymergewindow.cpp:2283 +#: directorymergewindow.cpp:2288 msgid "Delete A and B" -msgstr "" +msgstr "Supprimer A et B" -#: directorymergewindow.cpp:2286 +#: directorymergewindow.cpp:2291 msgid "Merge to A and B" -msgstr "" +msgstr "Fusionner dans A et B" #: fileaccess.cpp:535 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" +"Pendant le tentative d'enregistrement, la suppression d'un enregistrement " +"précédent a échoué.\n" +"Nom du fichier :" #: fileaccess.cpp:542 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" +"Pendant le tentative d'enregistrement, le changement de nom a échoué.\n" +"Noms des fichiers :" #: fileaccess.cpp:564 #, c-format msgid "Getting file status: %1" -msgstr "" +msgstr "Recherche de l'état du fichier : %1" #: fileaccess.cpp:606 #, c-format msgid "Reading file: %1" -msgstr "" +msgstr "Lecture du fichier : %1" #: fileaccess.cpp:642 #, c-format msgid "Writing file: %1" -msgstr "" +msgstr "Écriture du fichier : %1" #: fileaccess.cpp:670 msgid "Out of memory" -msgstr "" +msgstr "Plus de mémoire" #: fileaccess.cpp:705 #, c-format msgid "Making directory: %1" -msgstr "" +msgstr "Création du dossier : %1" #: fileaccess.cpp:725 #, c-format msgid "Removing directory: %1" -msgstr "" +msgstr "Suppression du dossier %1" #: fileaccess.cpp:740 #, c-format msgid "Removing file: %1" -msgstr "" +msgstr "Suppression du fichier : %1" #: fileaccess.cpp:756 msgid "Creating symbolic link: %1 -> %2" -msgstr "" +msgstr "Création d'un lien symbolique : %1 vers %2" #: fileaccess.cpp:782 msgid "Renaming file: %1 -> %2" -msgstr "" +msgstr "Changement de nom du fichier : %1 vers %2" #: fileaccess.cpp:817 msgid "Copying file: %1 -> %2" -msgstr "" +msgstr "Copie du fichier : %1 vers %2" #: fileaccess.cpp:831 #, c-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" +"Erreur durant la copie : l'ouverture du fichier pour la lecture a échoué. " +"Nom du Fichier : %1" #: fileaccess.cpp:837 #, c-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" +"Erreur durant la copie : l'ouverture du fichier pour l'écriture a " +"échoué. Nom du Fichier : %1" #: fileaccess.cpp:852 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" +"Erreur durant la copie d'un fichier : échec de la lecture. Nom du " +"fichier : %1" #: fileaccess.cpp:861 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" +"Erreur durant la copie d'un fichier : échec de l'écriture. Nom du " +"fichier : %1" #: fileaccess.cpp:1162 msgid "Reading directory: " -msgstr "" +msgstr "Lecture du dossier : " #: fileaccess.cpp:1218 #, c-format msgid "Listing directory: %1" -msgstr "" +msgstr "Listage du dossier : %1" #: kdiff3.cpp:125 msgid "Option --auto used, but no output file specified." -msgstr "" +msgstr "Option --auto-utilisée, mais pas de fichier résultat spécifié." #: kdiff3.cpp:223 msgid "Option --auto ignored for directory comparison." -msgstr "" +msgstr "Option --auto-ignorée pour la comparaison de dossiers." #: kdiff3.cpp:263 msgid "Saving failed." -msgstr "" +msgstr "Échec de l'enregistrement." -#: kdiff3.cpp:287 -#: pdiff.cpp:1245 -#: pdiff.cpp:1306 +#: kdiff3.cpp:287 pdiff.cpp:1260 pdiff.cpp:1321 msgid "Opening of these files failed:" -msgstr "" +msgstr "L'ouverture de ces fichiers a échoué :" #: kdiff3.cpp:296 msgid "File Open Error" -msgstr "" +msgstr "Erreur d'ouverture d'un Fichier" #: kdiff3.cpp:315 msgid "Opens documents for comparison..." -msgstr "" +msgstr "Ouvre les documents pour comparaison..." #: kdiff3.cpp:317 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" +"Enregistre le résultat de la fusion. Tous les conflits doivent être " +"résolus !" #: kdiff3.cpp:319 msgid "Saves the current document as..." -msgstr "" +msgstr "Enregistre le document courant sous..." #: kdiff3.cpp:321 msgid "Quits the application" -msgstr "" +msgstr "Quitte l'application" #: kdiff3.cpp:323 msgid "Cuts the selected section and puts it to the clipboard" -msgstr "" +msgstr "Coupe la sélection et la met dans le presse-papiers" #: kdiff3.cpp:325 msgid "Copies the selected section to the clipboard" -msgstr "" +msgstr "Copie la sélection vers le presse-papiers" #: kdiff3.cpp:327 msgid "Pastes the clipboard contents to actual position" -msgstr "" +msgstr "Colle le contenu du presse-papiers à la position actuelle" #: kdiff3.cpp:329 msgid "Search for a string" -msgstr "" +msgstr "Cherche un passage" #: kdiff3.cpp:331 msgid "Search again for the string" -msgstr "" +msgstr "Cherche de nouveau le passage" #: kdiff3.cpp:333 msgid "Enables/disables the toolbar" -msgstr "" +msgstr "Active/désactive la barre d'outils" #: kdiff3.cpp:335 msgid "Enables/disables the statusbar" -msgstr "" +msgstr "Active/désactive la barre de état" #: kdiff3.cpp:339 msgid "Configure KDiff3..." -msgstr "" +msgstr "Configurer KDiff3..." #: kdiff3.cpp:359 msgid "Go to Current Delta" -msgstr "" +msgstr "Aller à la différence actuelle" #: kdiff3.cpp:360 msgid "Go to First Delta" -msgstr "" +msgstr "Aller à la première différence" #: kdiff3.cpp:361 msgid "Go to Last Delta" -msgstr "" +msgstr "Aller à la dernière différence" #: kdiff3.cpp:362 msgid "Go to Previous Delta" -msgstr "" +msgstr "Aller à la prochaine différence" #: kdiff3.cpp:363 msgid "Go to Next Delta" -msgstr "" +msgstr "Aller à la différence suivante" #: kdiff3.cpp:364 msgid "Go to Previous Conflict" -msgstr "" +msgstr "Aller au conflit précédent" #: kdiff3.cpp:365 msgid "Go to Next Conflict" -msgstr "" +msgstr "Aller au conflit suivant" #: kdiff3.cpp:366 msgid "Go to Previous Unsolved Conflict" -msgstr "" +msgstr "Aller au conflit conflit non résolu précédent" #: kdiff3.cpp:367 msgid "Go to Next Unsolved Conflict" -msgstr "" +msgstr "Aller au conflit non résolu suivant" #: kdiff3.cpp:368 msgid "Select Line(s) From A" -msgstr "" +msgstr "Sélectionner la source depuis A" #: kdiff3.cpp:369 msgid "Select Line(s) From B" -msgstr "" +msgstr "Sélectionner la source depuis B" #: kdiff3.cpp:370 msgid "Select Line(s) From C" -msgstr "" +msgstr "Sélectionner la source depuis C" #: kdiff3.cpp:371 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" +msgstr "Aller automatiquement au conflit suivant après sélection de la source" #: kdiff3.cpp:373 msgid "Show Space && Tabulator Characters for Differences" -msgstr "" +msgstr "Montrer les espaces et les alinéas en tant que différences" #: kdiff3.cpp:374 msgid "Show White Space" -msgstr "" +msgstr "Montrer les espaces" #: kdiff3.cpp:376 msgid "Show Line Numbers" -msgstr "" +msgstr "Montrer les numéros de Ligne" #: kdiff3.cpp:377 msgid "Choose A Everywhere" -msgstr "" +msgstr "Choisir A partout" #: kdiff3.cpp:378 msgid "Choose B Everywhere" -msgstr "" +msgstr "Choisir B Partout" #: kdiff3.cpp:379 msgid "Choose C Everywhere" -msgstr "" +msgstr "Choisir C Partout" #: kdiff3.cpp:380 msgid "Choose A For All Unsolved Conflicts" -msgstr "" +msgstr "Choisir A pour tous les conflits non résolus" #: kdiff3.cpp:381 msgid "Choose B For All Unsolved Conflicts" -msgstr "" +msgstr "Choisir B pour tous les conflits non résolus" #: kdiff3.cpp:382 msgid "Choose C For All Unsolved Conflicts" -msgstr "" +msgstr "Choisir C pour tous les conflits non résolus" #: kdiff3.cpp:383 msgid "Choose A For All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "Choisir A pour tous les conflits d'espaces non résolus" #: kdiff3.cpp:384 msgid "Choose B For All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "Choisir B pour tous les conflits d'espaces non résolus" #: kdiff3.cpp:385 msgid "Choose C For All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "Choisir C pour tous les conflits d'espaces non résolus" #: kdiff3.cpp:386 msgid "Automatically Solve Simple Conflicts" -msgstr "" +msgstr "Résoudre automatiquement les conflits simples" #: kdiff3.cpp:387 msgid "Set Deltas to Conflicts" -msgstr "" +msgstr "Rendre les différences comme conflits" #: kdiff3.cpp:389 msgid "Show Window A" -msgstr "" +msgstr "Montrer la fenêtre A" #: kdiff3.cpp:390 msgid "Show Window B" -msgstr "" +msgstr "Montrer la fenêtre B" #: kdiff3.cpp:391 msgid "Show Window C" -msgstr "" +msgstr "Montrer la fenêtre C" -#: kdiff3.cpp:392 -#: kdiff3.cpp:394 +#: kdiff3.cpp:392 kdiff3.cpp:394 msgid "Focus Next Window" -msgstr "" +msgstr "S'aligner sur la fenêtre suivante" #: kdiff3.cpp:396 msgid "Focus Prev Window" -msgstr "" +msgstr "S'aligner sur la fenêtre précédente" #: kdiff3.cpp:397 msgid "Toggle Split Orientation" -msgstr "" +msgstr "Partage et cadrage de l'écran" #: kdiff3.cpp:399 msgid "Dir && Text Split Screen View" -msgstr "" +msgstr "Vue partagée entre dossier et texte" #: kdiff3.cpp:401 msgid "Toggle Between Dir && Text View" -msgstr "" +msgstr "Inverser entre vue dossier et texte" -#: kdiff3.cpp:420 -#: kdiff3.cpp:536 -#: kdiff3.cpp:560 -#: kdiff3.cpp:593 -#: kdiff3.cpp:613 -#: pdiff.cpp:1263 -#: pdiff.cpp:1325 -#: pdiff.cpp:1346 -#: pdiff.cpp:1362 -#: pdiff.cpp:1393 +#: kdiff3.cpp:420 kdiff3.cpp:536 kdiff3.cpp:560 kdiff3.cpp:593 kdiff3.cpp:613 +#: pdiff.cpp:1278 pdiff.cpp:1340 pdiff.cpp:1361 pdiff.cpp:1377 pdiff.cpp:1408 msgid "Ready." -msgstr "" +msgstr "Prêt." -#: kdiff3.cpp:483 -#: pdiff.cpp:1695 +#: kdiff3.cpp:483 pdiff.cpp:1702 msgid "The merge result hasn't been saved." -msgstr "" +msgstr "Le résultat de la fusion n'a pas été enregistré." #: kdiff3.cpp:484 msgid "Save && Quit" -msgstr "" +msgstr "Enregistrer et Quitter" #: kdiff3.cpp:484 msgid "Quit Without Saving" -msgstr "" +msgstr "Quitter sans enregistrer" -#: kdiff3.cpp:492 -#: pdiff.cpp:1704 +#: kdiff3.cpp:492 pdiff.cpp:1711 msgid "Saving the merge result failed." -msgstr "" +msgstr "L'enregistrement du résultat de la fusion a échoué." -#: kdiff3.cpp:503 -#: pdiff.cpp:1185 +#: kdiff3.cpp:503 pdiff.cpp:1200 msgid "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" +"Vous faites actuellement une fusion de dossiers. Voulez-vous vraiment " +"annuler ?" #: kdiff3.cpp:526 msgid "Saving file..." -msgstr "" +msgstr "Enregistrement du fichier..." #: kdiff3.cpp:542 msgid "Saving file with a new filename..." -msgstr "" +msgstr "Enregistrement du fichier avec un nouveau nom..." #: kdiff3.cpp:566 msgid "Exiting..." -msgstr "" +msgstr "Fermeture..." #: kdiff3.cpp:578 msgid "Toggling toolbar..." -msgstr "" +msgstr "Cadrage de la barre d'outils..." #: kdiff3.cpp:598 msgid "Toggle the statusbar..." -msgstr "" +msgstr "Cadrage de la barre de état..." #: kdiff3.cpp:638 msgid "Searchtext:" -msgstr "" +msgstr "Chercher dans le texte :" #: kdiff3.cpp:645 msgid "Case sensitive" -msgstr "" +msgstr "Sensible à la casse" #: kdiff3.cpp:648 msgid "Search A" -msgstr "" +msgstr "Chercher dans A" #: kdiff3.cpp:653 msgid "Search B" -msgstr "" +msgstr "Chercher dans B" #: kdiff3.cpp:658 msgid "Search C" -msgstr "" +msgstr "Chercher dans C" #: kdiff3.cpp:663 msgid "Search output" -msgstr "" +msgstr "Chercher dans le résultat" #: kdiff3.cpp:668 msgid "&Search" -msgstr "" +msgstr "&Chercher" -#: kdiff3_part.cpp:131 -#: kdiff3_part.cpp:196 +#: kdiff3_part.cpp:131 kdiff3_part.cpp:196 msgid "Couldn't find files for comparison." -msgstr "" +msgstr "Impossible de trouver les fichiers pour la comparaison" #: kdiff3_part.cpp:263 msgid "KDiff3Part" -msgstr "" +msgstr "KDiff3Part" #: kdiff3_shell.cpp:63 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." +"This usually happens due to an installation problem. Please read the " +"README-file in the source package for details." msgstr "" +"Impossible de trouver le fichier part !\n" +"Cela est dû la plupart du temps a un problème d'installation. Veuillez " +"lire le fichier README dans le paquetage source pour plus de détails." -#: main.cpp:26 +#: main.cpp:27 msgid "Text Diff and Merge Tool" -msgstr "" +msgstr "Outil de diff et de fusion de textes" -#: main.cpp:31 +#: main.cpp:32 msgid "Merge the input." -msgstr "" +msgstr "Fusionner les entrées." -#: main.cpp:33 +#: main.cpp:34 msgid "Explicit base file. For compatibility with certain tools." -msgstr "" - -#: main.cpp:35 -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" +msgstr "Fichier de base explicite. Pour compatibilité avec certains outils." #: main.cpp:36 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Fichier de résultat. Implique -m. Ex : -o nouveaufichier.txt" + +#: main.cpp:37 msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" +"Fichier de résultat, encore. (Pour raison de compatibilité avec certains " +"outils)." -#: main.cpp:37 +#: main.cpp:38 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" - -#: main.cpp:38 -msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "" +"Pas de GUI si tous les conflits se résolvent automatiquement. (Besoin d'un " +"fichier -o)" #: main.cpp:39 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "Ne pas résoudre les conflits automatiquement. (Par compatibilité...)." + +#: main.cpp:40 msgid "Visible name replacement. Supply this once for every input." -msgstr "" +msgstr "Remplacement visible. Faire cela une fois pour chaque fichier d'entrée." -#: main.cpp:41 +#: main.cpp:42 msgid "For compatibility with certain tools." -msgstr "" - -#: main.cpp:43 -msgid "file1 to open (base, if not specified via --base)" -msgstr "" +msgstr "Par compatibilité avec certains outils." #: main.cpp:44 -msgid "file2 to open" -msgstr "" +msgid "file1 to open (base, if not specified via --base)" +msgstr "fichier 1 à ouvrir (base, si non spécifié, via --base)" #: main.cpp:45 +msgid "file2 to open" +msgstr "fichier 2 à ouvrir" + +#: main.cpp:46 msgid "file3 to open" -msgstr "" +msgstr "fichier 3 à ouvrir" -#: main.cpp:98 -#: rc.cpp:3 +#: main.cpp:99 rc.cpp:3 msgid "KDiff3" -msgstr "" +msgstr "KDiff3" -#: mergeresultwindow.cpp:249 +#: mergeresultwindow.cpp:250 msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" +"Le résultat a été modifié.\n" +"Si vous continuez, vos changement seront perdus." -#: mergeresultwindow.cpp:667 -#: pdiff.cpp:585 +#: mergeresultwindow.cpp:671 pdiff.cpp:591 msgid "All input files are binary equal." +msgstr "Tous les fichiers d'entrées sont égaux binairement." + +#: mergeresultwindow.cpp:673 pdiff.cpp:593 +msgid "All input files contain the same text." +msgstr "Tous les fichiers d'entrées contiennent le même texte." + +#: mergeresultwindow.cpp:675 pdiff.cpp:595 +msgid "" +"Files A and B are binary equal.\n" msgstr "" +"Les fichiers A et B sont égaux binairement.\n" -#: mergeresultwindow.cpp:669 -#: pdiff.cpp:587 -msgid "All input files contain the same text." +#: mergeresultwindow.cpp:676 pdiff.cpp:596 +msgid "" +"Files A and B have equal text. \n" msgstr "" +"Les fichiers A et B ont le même texte.\n" -#: mergeresultwindow.cpp:671 -#: pdiff.cpp:589 -msgid "Files A and B are binary equal.\n" +#: mergeresultwindow.cpp:677 pdiff.cpp:597 +msgid "" +"Files A and C are binary equal.\n" msgstr "" +"Les fichiers A et C sont égaux binairement.\n" -#: mergeresultwindow.cpp:672 -#: pdiff.cpp:590 -msgid "Files A and B have equal text. \n" +#: mergeresultwindow.cpp:678 pdiff.cpp:598 +msgid "" +"Files A and C have equal text. \n" msgstr "" +"Les fichiers A et C ont le même texte.\n" -#: mergeresultwindow.cpp:673 -#: pdiff.cpp:591 -msgid "Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:679 pdiff.cpp:599 +msgid "" +"Files B and C are binary equal.\n" msgstr "" +"Les fichiers B et C sont égaux binairement.\n" -#: mergeresultwindow.cpp:674 -#: pdiff.cpp:592 -msgid "Files A and C have equal text. \n" +#: mergeresultwindow.cpp:680 pdiff.cpp:600 +msgid "" +"Files B and C have equal text. \n" msgstr "" +"Les fichiers B et C ont le même texte.\n" -#: mergeresultwindow.cpp:675 -#: pdiff.cpp:593 -msgid "Files B and C are binary equal.\n" -msgstr "" +#: mergeresultwindow.cpp:683 +msgid "Total number of conflicts: " +msgstr "Nombre total de conflits : " -#: mergeresultwindow.cpp:676 -#: pdiff.cpp:594 -msgid "Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:679 -msgid "Total number of conflicts: " -msgstr "" - -#: mergeresultwindow.cpp:680 +#: mergeresultwindow.cpp:684 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" +"\n" +"Nombre de conflits résolus automatiquement : " -#: mergeresultwindow.cpp:681 +#: mergeresultwindow.cpp:685 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" +"\n" +"Nombre de conflits non résolus : " -#: mergeresultwindow.cpp:683 +#: mergeresultwindow.cpp:687 msgid "Conflicts" -msgstr "" +msgstr "Conflits" -#: mergeresultwindow.cpp:1011 +#: mergeresultwindow.cpp:1015 msgid "<No src line>" -msgstr "" +msgstr "<Pas de ligne source>" -#: mergeresultwindow.cpp:1018 +#: mergeresultwindow.cpp:1022 msgid "<Merge Conflict>" -msgstr "" +msgstr "<Conflit de Fusion>" -#: mergeresultwindow.cpp:1082 +#: mergeresultwindow.cpp:1086 msgid "[Modified]" -msgstr "" +msgstr "[Modifié]" -#: mergeresultwindow.cpp:1957 +#: mergeresultwindow.cpp:1964 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" +"Tous les conflits ne sont pas encore résolus.\n" +"Fichier non enregistré.\n" -#: mergeresultwindow.cpp:1959 +#: mergeresultwindow.cpp:1966 msgid "Conflicts Left" -msgstr "" +msgstr "Il reste des conflits" -#: mergeresultwindow.cpp:1971 +#: mergeresultwindow.cpp:1978 msgid "" "\n" "\n" "File not saved." msgstr "" +"\n" +"\n" +"Fichier non enregistré." -#: mergeresultwindow.cpp:1971 -#: mergeresultwindow.cpp:2033 +#: mergeresultwindow.cpp:1978 mergeresultwindow.cpp:2040 msgid "File Save Error" -msgstr "" +msgstr "Erreur d'enregistrement du fichier" -#: mergeresultwindow.cpp:1987 +#: mergeresultwindow.cpp:1994 msgid "Out of memory while preparing to save." -msgstr "" +msgstr "Plus de mémoire au moment de l'enregistrement." -#: mergeresultwindow.cpp:2033 +#: mergeresultwindow.cpp:2040 msgid "Error while writing." -msgstr "" +msgstr "Erreur durant l'écriture." #: optiondialog.cpp:236 msgid "Editor & Diff Output Font" -msgstr "" +msgstr "Police de l'éditeur et du résultat de Diff" #: optiondialog.cpp:248 msgid "Italic font for deltas" -msgstr "" +msgstr "Police en italique pour les différences" #: optiondialog.cpp:251 msgid "" "Selects the italic version of the font for differences.\n" "If the font doesn't support italic characters, then this does nothing." msgstr "" +"Sélectionne la version italique pour les différences.\n" +"Si la police ne gère pas les caractères en italique, cela ne fait rien." #: optiondialog.cpp:259 msgid "Color" -msgstr "" +msgstr "Couleur" #: optiondialog.cpp:259 msgid "Colors in Editor & Diff Output" -msgstr "" +msgstr "Couleur dans l'éditeur et le résultat d'une Diff" #: optiondialog.cpp:273 msgid "Foreground color:" -msgstr "" +msgstr "Couleur du premier plan :" #: optiondialog.cpp:279 msgid "Background color:" -msgstr "" +msgstr "Couleur de l'arrière plan :" #: optiondialog.cpp:286 msgid "Diff background color:" -msgstr "" +msgstr "Couleur de l'arrière plan d'un Diff :" #: optiondialog.cpp:293 msgid "Color A:" -msgstr "" +msgstr "Couleur A :" #: optiondialog.cpp:300 msgid "Color B:" -msgstr "" +msgstr "Couleur B :" #: optiondialog.cpp:307 msgid "Color C:" -msgstr "" +msgstr "Couleur C :" #: optiondialog.cpp:313 msgid "Conflict color:" -msgstr "" +msgstr "Couleur des conflits :" #: optiondialog.cpp:320 msgid "Current range background color:" -msgstr "" +msgstr "Couleur de l'arrière plan de la sélection :" #: optiondialog.cpp:327 msgid "Current range diff background color:" -msgstr "" +msgstr "Couleur de l'arrière plan de la sélection diff courante :" #: optiondialog.cpp:338 msgid "Editor" -msgstr "" +msgstr "Éditeur" #: optiondialog.cpp:338 msgid "Editor Behaviour" -msgstr "" +msgstr "Comportement de l'éditeur" #: optiondialog.cpp:347 msgid "Tab inserts spaces" -msgstr "" +msgstr "La tabulation insère des espaces" #: optiondialog.cpp:350 msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A Tab-character will be inserted." msgstr "" +"Activé : actionner Tab génère le nombre approprié d'espaces.\n" +"Désactivé : Un caractère de tabulation sera inséré." #: optiondialog.cpp:356 msgid "Tab size:" -msgstr "" +msgstr "Taille d'une tabulation :" #: optiondialog.cpp:361 msgid "Auto indentation" -msgstr "" +msgstr "Indentation automatique" #: optiondialog.cpp:364 -msgid "On: The indentation of the previous line is used for a new line.\n" +msgid "" +"On: The indentation of the previous line is used for a new line.\n" msgstr "" +"Activé : l'indentation de la ligne précédente est utilisée pour une " +"nouvelle ligne.\n" #: optiondialog.cpp:368 msgid "Auto copy selection" -msgstr "" +msgstr "Copie de la sélection automatique" #: optiondialog.cpp:371 msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" +"Activé : toute sélection sera automatiquement copiée vers le " +"presse-papiers.\n" +"Désactivé : vous devrez copier explicitement l'élément (ex : via " +"Ctrl+C)." #: optiondialog.cpp:376 msgid "Use locale encoding" -msgstr "" +msgstr "Utiliser l'encodage local" #: optiondialog.cpp:379 msgid "Change this if non-ascii-characters aren't displayed correctly." -msgstr "" +msgstr "Changez cela si les caractères ASCII ne sont pas affichés correctement." #: optiondialog.cpp:389 msgid "Diff & Merge" -msgstr "" +msgstr "Différences et fusion" #: optiondialog.cpp:389 msgid "Diff & Merge Settings" -msgstr "" +msgstr "Options de diff et fusion" #: optiondialog.cpp:399 msgid "Preserve carriage return" -msgstr "" +msgstr "Préserver des les retours à la ligne" #: optiondialog.cpp:402 msgid "" "Show carriage return characters '\\r' if they exist.\n" "Helps to compare files that were modified under different operating systems." msgstr "" +"Montre les retours à la ligne « \\r » s'ils existent.\n" +"Aide à comparer les fichiers s'ils ont été modifiées sous des OS " +"différents." #: optiondialog.cpp:407 msgid "Ignore numbers" -msgstr "" +msgstr "Ignorer les nombres" #: optiondialog.cpp:410 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" +"Ignorer les nombres durant une diff ou une fusion. (Similaire à ignorer les " +"espaces).\n" +"Peut vous aider à comparer les fichiers ayant des données numériques." #: optiondialog.cpp:415 msgid "Ignore C/C++ Comments" -msgstr "" +msgstr "Ignorer les Commentaires C/C++" #: optiondialog.cpp:417 msgid "Treat C/C++ comments like white space." -msgstr "" +msgstr "Traiter les commentaires C/C++ comme des espaces." #: optiondialog.cpp:421 msgid "Convert to upper case" -msgstr "" +msgstr "Convertir en majuscules" #: optiondialog.cpp:424 msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" msgstr "" +"Rendre toutes les minuscules en majuscules lors de la lecture. (ex : " +"« a » devient « A »)" #: optiondialog.cpp:428 msgid "Preprocessor command:" -msgstr "" +msgstr "Commande de précompilation :" #: optiondialog.cpp:432 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" +"Précompilation définie par l'utilisateur. (Voir les documentations pour " +"les détails)." #: optiondialog.cpp:435 msgid "Line-matching preprocessor command:" -msgstr "" +msgstr "Commande de précompilation sur la comparaison de lignes :" #: optiondialog.cpp:439 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" +"Cette commande de précompilation n'est utilisée que durant la comparaison " +"de lignes.\n" +"(Voir les documentations pour les détails)." #: optiondialog.cpp:442 msgid "Try hard (slower)" -msgstr "" +msgstr "Essayer avec moins de mémoire (plus lent)" #: optiondialog.cpp:445 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" +"Active l'option -minimal pour une diff externe.\n" +"L'analyse de gros fichiers sera plus lente." #: optiondialog.cpp:450 msgid "Auto advance delay (ms):" -msgstr "" +msgstr "Délai d'avance automatique (en ms) :" #: optiondialog.cpp:455 msgid "" "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 "" +"La durée, dans le mode Avancée automatique, ou le résultat de la " +"sélection est montré \n" +" pour la période spécifiée, avant d'aller au conflit suivant. Étendue : " +"0-2000 ms" #: optiondialog.cpp:460 msgid "White space 2-file merge default:" +msgstr "Option par défaut pour les espaces lors de la fusion de 2 fichiers :" + +#: optiondialog.cpp:464 optiondialog.cpp:477 +msgid "Manual choice" +msgstr "Choix manuel" + +#: optiondialog.cpp:468 optiondialog.cpp:482 +msgid "" +"Allow the merge algorithm to automatically select an input for " +"white-space-only changes." msgstr "" - -#: optiondialog.cpp:464 -#: optiondialog.cpp:477 -msgid "Manual choice" -msgstr "" - -#: optiondialog.cpp:468 -#: optiondialog.cpp:482 -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "" +"Autoriser l'algorithme de fusion à sélectionner une entrée pour les " +"changements d'espaces seulement." #: optiondialog.cpp:473 msgid "White space 3-file merge default:" -msgstr "" +msgstr "Option par défaut pour les espaces lors de la fusion de 3 fichiers :" #: optiondialog.cpp:492 msgid "Directory Merge" -msgstr "" +msgstr "Fusion de dossiers" #: optiondialog.cpp:500 msgid "Recursive directories" -msgstr "" +msgstr "Fusionner les sous-dossiers" #: optiondialog.cpp:502 msgid "Whether to analyze subdirectories or not." -msgstr "" +msgstr "Si vous voulez analyser les sous-dossiers ou non." #: optiondialog.cpp:504 msgid "File pattern(s):" -msgstr "" +msgstr "Formats acceptés :" #: optiondialog.cpp:509 msgid "" @@ -1386,10 +1485,14 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"Format(s) des fichiers devant être analysés. \n" +"Inconnues : « * » et « ? » \n" +"Les formats peuvent être spécifiés en utilisant le séparateur : " +"« ; »" #: optiondialog.cpp:515 msgid "File-anti-pattern(s):" -msgstr "" +msgstr "Formats refusés(s) :" #: optiondialog.cpp:520 msgid "" @@ -1397,10 +1500,14 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"Format(s) des fichiers devant être exclus des analyses. \n" +"Inconnues : « * » et « ? »\n" +"Les formats peuvent être spécifiés en utilisant le séparateur : " +"« ; »" #: optiondialog.cpp:526 msgid "Dir-anti-pattern(s):" -msgstr "" +msgstr "Formats de dossiers refusés :" #: optiondialog.cpp:531 msgid "" @@ -1408,80 +1515,100 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"Format(s) des dossiers devant être exclus des analyses. \n" +"Inconnues : « * » et « ? »\n" +"Les formats peuvent être spécifiés en utilisant le séparateur : " +"« ; »" #: optiondialog.cpp:537 msgid "Use .cvsignore" -msgstr "" +msgstr "Utiliser .cvsignore" #: optiondialog.cpp:540 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" +"Étendre l'exlusion de format à tout ce qui pourrait être ignoré par " +"CVS.\n" +" Via un « .cvsignore »-files local, cela pourra être le dossier " +"spécifiquement." #: optiondialog.cpp:545 msgid "Find hidden files and directories" -msgstr "" +msgstr "Trouver les fichiers et les dossiers cachés" #: optiondialog.cpp:548 msgid "Finds files and directories with the hidden attribute." -msgstr "" +msgstr "Trouver les fichiers et dossiers ayant l'attribut « caché »." #: optiondialog.cpp:550 msgid "Finds files and directories starting with '.'." -msgstr "" +msgstr "Trouver les fichiers et dossiers commençant par « . »." #: optiondialog.cpp:554 msgid "Follow file links" -msgstr "" +msgstr "Trouver les fichiers liens" #: optiondialog.cpp:557 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" +"Activé : compare les fichiers derrières les liens.\n" +"Désactivé : compare les liens." #: optiondialog.cpp:562 msgid "Follow directory links" -msgstr "" +msgstr "Suivre les liens vers un dossier" #: optiondialog.cpp:565 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" +"Activé : compare les dossiers derrière les liens.\n" +"Désactivé : compare les liens." #: optiondialog.cpp:570 msgid "List only deltas" -msgstr "" +msgstr "Lister seulement les différences" #: optiondialog.cpp:573 msgid "Files and directories without change will not appear in the list." -msgstr "" +msgstr "Fichiers et dossiers sans différences n'apparaîtront pas dans la liste." #: optiondialog.cpp:576 msgid "Trust the modification date (unsafe)" -msgstr "" +msgstr "Se fier à la date de modification (peu sûr)" #: optiondialog.cpp:578 msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" +"Assume that files are equal if the modification date and file length are " +"equal.\n" "Useful for big directories or slow networks." msgstr "" +"Dire que les fichiers sont égaux si la dernière date de modification et la " +"taille du fichier sont égales.\n" +"Utile pour les gros dossiers ou les réseaux lents." #: optiondialog.cpp:582 msgid "Trust the size (unsafe)" -msgstr "" +msgstr "Se fier à la taille (peu sûr)" #: optiondialog.cpp:584 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." +"Useful for big directories or slow networks when the date is modified during " +"download." msgstr "" +"Suppose que tous les fichiers sont égaux si leur taille est égale.\n" +"Utile pour les gros dossiers ou les réseaux lents, quand la taille est " +"modifiée durant le téléchargement." #: optiondialog.cpp:589 msgid "Synchronize directories" -msgstr "" +msgstr "Synchroniser les dossiers" #: optiondialog.cpp:592 msgid "" @@ -1489,10 +1616,14 @@ "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" +"Stocker les fichiers dans les deux dossiers pour que les deux dossiers " +"soient égaux après.\n" +"Ne fonctionne que lors de la comparaison de dossiers sans spécification de " +"destination." #: optiondialog.cpp:597 msgid "Copy newer instead of merging (unsafe)" -msgstr "" +msgstr "Copier le plus récent au lieu de fusionner (peu sûr)" #: optiondialog.cpp:600 msgid "" @@ -1500,16 +1631,22 @@ "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" +"Ne pas ouvrir le fichier, prendre juste le plus récent.\n" +"(Ne faites cela que si vous savez ce que vous faites !)\n" +"Effectif seulement lors de la comparaison de dossiers." #: optiondialog.cpp:605 msgid "Backup files (.orig)" -msgstr "" +msgstr "Copie de sauvegarde (.orig)" #: optiondialog.cpp:608 msgid "" "When 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 le fichier doit être enregistré sur un fichier plus ancien, le vieux " +"fichier sera renommé avec une extension « .orig » au lieu d'être " +"supprimé." #: optiondialog.cpp:636 msgid "" @@ -1520,179 +1657,184 @@ "\n" "Do you want to continue or do you want to select another font." msgstr "" +"Vous avez sélectionné une hauteur de police variable.\n" +"\n" +"Étant donné que ce programme ne gère pas correctement les hauteurs de " +"police variables, vous pourriez rencontrer des problèmes lors de " +"l'édition.\n" +"\n" +"Voulez-vous continuer ou voulez-vous sélectionner une autre police." #: optiondialog.cpp:640 msgid "Incompatible Font" -msgstr "" +msgstr "Police incompatible" #: optiondialog.cpp:641 msgid "Continue at Own Risk" -msgstr "" +msgstr "Continuez à vos risques et périls" #: optiondialog.cpp:641 msgid "Select Another Font" -msgstr "" +msgstr "Sélectionnez une autre police" #: optiondialog.cpp:669 msgid "This resets all options. Not only those of the current topic." msgstr "" +"Cela remet à zéro toutes les options. Pas seulement celles de la rubrique " +"actuelle." -#: pdiff.cpp:371 +#: pdiff.cpp:377 msgid "" "Running the external diff failed.\n" -"Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" -"The external diff option will be disabled now and the internal diff will be used." +"Check if the diff works, if the program can write in the temp folder or if " +"the disk is full.\n" +"The external diff option will be disabled now and the internal diff will be " +"used." msgstr "" +"Le lancement d'une diff externe à échoué.\n" +"Vérifiez si la commande diff fonctionne, si le programme peut écrire dans " +"le dossier temporaire ou si le disque est plein.\n" +"L'option de diff externe sera désactivée désormais, et une diff interne " +"sera utilisée." -#: pdiff.cpp:437 +#: pdiff.cpp:443 msgid "Loading A" -msgstr "" +msgstr "Chargement de A" -#: pdiff.cpp:442 +#: pdiff.cpp:448 msgid "Loading B" -msgstr "" +msgstr "Chargement de B" -#: pdiff.cpp:453 -#: pdiff.cpp:481 -#: pdiff.cpp:493 +#: pdiff.cpp:459 pdiff.cpp:487 pdiff.cpp:499 msgid "Diff: A <-> B" -msgstr "" +msgstr "Différence entre A et B" -#: pdiff.cpp:461 -#: pdiff.cpp:514 +#: pdiff.cpp:467 pdiff.cpp:520 msgid "Linediff: A <-> B" -msgstr "" +msgstr "Différence de ligne entre A et B" -#: pdiff.cpp:470 +#: pdiff.cpp:476 msgid "Loading C" -msgstr "" +msgstr "Chargement de C" -#: pdiff.cpp:484 -#: pdiff.cpp:496 +#: pdiff.cpp:490 pdiff.cpp:502 msgid "Diff: B <-> C" -msgstr "" +msgstr "Différence entre B et C" -#: pdiff.cpp:487 -#: pdiff.cpp:499 +#: pdiff.cpp:493 pdiff.cpp:505 msgid "Diff: A <-> C" -msgstr "" +msgstr "Différence entre A et C" -#: pdiff.cpp:517 +#: pdiff.cpp:523 msgid "Linediff: B <-> C" -msgstr "" +msgstr "Différence de ligne entre B et C" -#: pdiff.cpp:520 +#: pdiff.cpp:526 msgid "Linediff: A <-> C" -msgstr "" +msgstr "Différence de ligne entre A et C" -#: pdiff.cpp:604 +#: pdiff.cpp:610 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" +"Certains fichiers d'entrée ne semblent pas être des fichiers texte purs.\n" +"Notez que la fusion KDiff3 n'est pas prévue pour les données binaires.\n" +"Continuez à vos risques et périls." -#: pdiff.cpp:1015 +#: pdiff.cpp:1030 msgid "A (Base):" -msgstr "" +msgstr "A (Base) :" -#: pdiff.cpp:1021 -#: pdiff.cpp:1036 -#: pdiff.cpp:1051 -#: pdiff.cpp:1069 +#: pdiff.cpp:1036 pdiff.cpp:1051 pdiff.cpp:1066 pdiff.cpp:1084 msgid "File..." -msgstr "" +msgstr "Fichier..." -#: pdiff.cpp:1023 -#: pdiff.cpp:1038 -#: pdiff.cpp:1053 -#: pdiff.cpp:1071 +#: pdiff.cpp:1038 pdiff.cpp:1053 pdiff.cpp:1068 pdiff.cpp:1086 msgid "Dir..." -msgstr "" +msgstr "Dossier..." -#: pdiff.cpp:1046 +#: pdiff.cpp:1061 msgid "C (Optional):" -msgstr "" +msgstr "C (Optionnel) :" -#: pdiff.cpp:1064 +#: pdiff.cpp:1079 msgid "Output (optional):" -msgstr "" +msgstr "Fichier de résultat (optionnel) :" -#: pdiff.cpp:1093 +#: pdiff.cpp:1108 msgid "Configure..." -msgstr "" +msgstr "Configurer..." -#: pdiff.cpp:1186 +#: pdiff.cpp:1201 msgid "Abort" -msgstr "" +msgstr "Abandonner" -#: pdiff.cpp:1192 -#: pdiff.cpp:1271 +#: pdiff.cpp:1207 pdiff.cpp:1286 msgid "Opening files..." -msgstr "" +msgstr "Ouverture des fichiers..." -#: pdiff.cpp:1254 -#: pdiff.cpp:1315 +#: pdiff.cpp:1269 pdiff.cpp:1330 msgid "File open error" -msgstr "" +msgstr "Erreur d'ouverture du fichier" -#: pdiff.cpp:1330 +#: pdiff.cpp:1345 msgid "Cutting selection..." -msgstr "" +msgstr "Coupe de la sélection..." -#: pdiff.cpp:1351 +#: pdiff.cpp:1366 msgid "Copying selection to clipboard..." -msgstr "" +msgstr "Copie de la sélection vers le presse-papiers..." -#: pdiff.cpp:1367 +#: pdiff.cpp:1382 msgid "Inserting clipboard contents..." -msgstr "" +msgstr "Insertion du contenu du presse-papiers..." -#: pdiff.cpp:1696 +#: pdiff.cpp:1703 msgid "Save && Continue" -msgstr "" +msgstr "Enregistrer et continuer" -#: pdiff.cpp:1696 +#: pdiff.cpp:1703 msgid "Continue Without Saving" -msgstr "" +msgstr "Continuer sans enregistrer" -#: pdiff.cpp:1901 +#: pdiff.cpp:1908 msgid "Search complete." -msgstr "" +msgstr "Recherche terminée." -#: pdiff.cpp:1901 +#: pdiff.cpp:1908 msgid "Search Complete" -msgstr "" +msgstr "Recherche terminée." #: rc.cpp:1 msgid "&KDiff3" -msgstr "" +msgstr "&KDiff3" #: rc.cpp:2 msgid "Configure KDiff3" -msgstr "" +msgstr "Configurer KDiff3" #: rc.cpp:5 msgid "&Directory" -msgstr "" +msgstr "&Dossier" #: rc.cpp:6 msgid "Current Item Merge Operation" -msgstr "" +msgstr "Fusion de l'élément actuel" #: rc.cpp:7 msgid "Current Item Sync Operation" -msgstr "" +msgstr "Synchronisation de l'élément actuel" #: rc.cpp:8 msgid "&Movement" -msgstr "" +msgstr "&Mouvement" #: rc.cpp:9 msgid "&Merge" -msgstr "" +msgstr "&Fusion" #: rc.cpp:10 msgid "&Window" -msgstr "" - +msgstr "&Fenêtre"
--- a/kdiff3/po/pt.po Sun Mar 07 09:59:09 2004 +0000 +++ b/kdiff3/po/pt.po Sun Mar 07 10:05:41 2004 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2003-12-10 01:44+0100\n" -"PO-Revision-Date: 2004-01-02 17:23+0000\n" +"POT-Creation-Date: 2004-01-09 01:37+0100\n" +"PO-Revision-Date: 2004-01-06 23:27+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" "Language-Team: pt <kde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "From Clipboard" msgstr "Da Área de Transferência" -#: diff.cpp:1098 diff.cpp:1112 +#: diff.cpp:1096 diff.cpp:1110 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -33,16 +33,16 @@ "Erro de perda de dados:\n" "Se for reprodutível, contacte por favor o autor.\n" -#: diff.cpp:1100 diff.cpp:1114 +#: diff.cpp:1098 diff.cpp:1112 msgid "Severe Internal Error" msgstr "Erro Interno Grave" -#: difftextwindow.cpp:789 +#: difftextwindow.cpp:790 #, c-format msgid "Topline %1" msgstr "Linha de topo %1" -#: difftextwindow.cpp:791 +#: difftextwindow.cpp:792 msgid "End" msgstr "Fim" @@ -95,41 +95,41 @@ "Você está neste momento a fazer uma junção de directoria. Tem a certeza " "que deseja interromper a junção e analisar a directoria de novo?" -#: directorymergewindow.cpp:272 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:272 directorymergewindow.cpp:2269 msgid "Rescan" msgstr "Analisar de Novo" -#: directorymergewindow.cpp:272 kdiff3.cpp:504 pdiff.cpp:1186 +#: directorymergewindow.cpp:272 kdiff3.cpp:504 pdiff.cpp:1201 msgid "Continue Merging" msgstr "Continuar a Junção" -#: directorymergewindow.cpp:380 +#: directorymergewindow.cpp:381 msgid "Opening of directories failed:" msgstr "O acesso às directorias foi mal-sucedido:" -#: directorymergewindow.cpp:383 +#: directorymergewindow.cpp:384 msgid "" "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" "A directoria A \"%1\" não existe ou não é uma directoria.\n" -#: directorymergewindow.cpp:386 +#: directorymergewindow.cpp:387 msgid "" "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" "A directoria B \"%1\" não existe ou não é uma directoria.\n" -#: directorymergewindow.cpp:389 +#: directorymergewindow.cpp:390 msgid "" "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" "A directoria C \"%1\" não existe ou não é uma directoria.\n" -#: directorymergewindow.cpp:391 +#: directorymergewindow.cpp:392 msgid "Directory Open Error" msgstr "Erro de Acesso à Directoria" -#: directorymergewindow.cpp:399 +#: directorymergewindow.cpp:400 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -139,132 +139,132 @@ "reunidas três directorias.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:401 +#: directorymergewindow.cpp:402 msgid "Parameter Warning" msgstr "Aviso do Parâmetro" -#: directorymergewindow.cpp:428 +#: directorymergewindow.cpp:429 msgid "Reading Directory A" msgstr "A Ler a Directoria A" -#: directorymergewindow.cpp:450 +#: directorymergewindow.cpp:451 msgid "Reading Directory B" msgstr "A Ler a Directoria B" -#: directorymergewindow.cpp:472 +#: directorymergewindow.cpp:473 msgid "Reading Directory C" msgstr "A Ler a Directoria C" -#: directorymergewindow.cpp:498 +#: directorymergewindow.cpp:499 msgid "Some subdirectories were not readable in" msgstr "Algumas das sub-directorias não eram legíveis" -#: directorymergewindow.cpp:503 +#: directorymergewindow.cpp:504 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões das sub-directorias." -#: directorymergewindow.cpp:550 +#: directorymergewindow.cpp:551 msgid "Directory Comparison Status" msgstr "Estado da Comparação da Directoria" -#: directorymergewindow.cpp:551 +#: directorymergewindow.cpp:552 msgid "Number of subdirectories:" msgstr "Número de sub-directorias:" -#: directorymergewindow.cpp:552 +#: directorymergewindow.cpp:553 msgid "Number of equal files:" msgstr "Número de ficheiros iguais:" -#: directorymergewindow.cpp:553 +#: directorymergewindow.cpp:554 msgid "Number of different files:" msgstr "Número de ficheiros diferentes:" -#: directorymergewindow.cpp:556 +#: directorymergewindow.cpp:557 msgid "Number of manual merges:" msgstr "Número de junções manuais:" -#: directorymergewindow.cpp:684 +#: directorymergewindow.cpp:693 msgid "This affects all merge operations." msgstr "Isto afecta todas as operações de junção." -#: directorymergewindow.cpp:685 +#: directorymergewindow.cpp:694 msgid "Changing All Merge Operations" msgstr "A Mudar Todas as Operações de Junção" -#: directorymergewindow.cpp:685 mergeresultwindow.cpp:251 +#: directorymergewindow.cpp:694 mergeresultwindow.cpp:252 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:952 +#: directorymergewindow.cpp:961 msgid "Processing " msgstr "A processar " -#: directorymergewindow.cpp:1300 directorymergewindow.cpp:1307 +#: directorymergewindow.cpp:1309 directorymergewindow.cpp:1316 msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:1334 directorymergewindow.cpp:2279 +#: directorymergewindow.cpp:1343 directorymergewindow.cpp:2284 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1335 directorymergewindow.cpp:2280 +#: directorymergewindow.cpp:1344 directorymergewindow.cpp:2285 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1336 directorymergewindow.cpp:2281 +#: directorymergewindow.cpp:1345 directorymergewindow.cpp:2286 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1337 directorymergewindow.cpp:2282 +#: directorymergewindow.cpp:1346 directorymergewindow.cpp:2287 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1338 +#: directorymergewindow.cpp:1347 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1339 directorymergewindow.cpp:2284 +#: directorymergewindow.cpp:1348 directorymergewindow.cpp:2289 msgid "Merge to A" msgstr "Juntar a A" -#: directorymergewindow.cpp:1340 directorymergewindow.cpp:2285 +#: directorymergewindow.cpp:1349 directorymergewindow.cpp:2290 msgid "Merge to B" msgstr "Juntar a B" -#: directorymergewindow.cpp:1341 +#: directorymergewindow.cpp:1350 msgid "Merge to A & B" msgstr "Juntar a A e B" -#: directorymergewindow.cpp:1345 +#: directorymergewindow.cpp:1354 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1346 directorymergewindow.cpp:1347 -#: directorymergewindow.cpp:2275 pdiff.cpp:1061 +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +#: directorymergewindow.cpp:2280 pdiff.cpp:1076 msgid "Merge" msgstr "Juntar" -#: directorymergewindow.cpp:1346 directorymergewindow.cpp:1347 +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 msgid "Merge (manual)" msgstr "Juntar (manual)" -#: directorymergewindow.cpp:1348 +#: directorymergewindow.cpp:1357 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Ficheiros em Conflito" -#: directorymergewindow.cpp:1349 +#: directorymergewindow.cpp:1358 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os ficheiros não." -#: directorymergewindow.cpp:1373 +#: directorymergewindow.cpp:1382 msgid "This operation is currently not possible." msgstr "Esta operação não é possível de momento." -#: directorymergewindow.cpp:1373 directorymergewindow.cpp:1633 +#: directorymergewindow.cpp:1382 directorymergewindow.cpp:1642 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:1416 +#: directorymergewindow.cpp:1425 msgid "" "This should never happen: \n" "\n" @@ -278,42 +278,42 @@ "\n" "Se souber como reproduzir isto, contacte por favor o autor do programa." -#: directorymergewindow.cpp:1416 +#: directorymergewindow.cpp:1425 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:1427 +#: directorymergewindow.cpp:1436 msgid "" "An error occurred while copying.\n" msgstr "" "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1428 directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1437 directorymergewindow.cpp:1843 msgid "Merge Error" msgstr "Erro na Junção" -#: directorymergewindow.cpp:1433 directorymergewindow.cpp:1839 +#: directorymergewindow.cpp:1442 directorymergewindow.cpp:1848 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:1438 directorymergewindow.cpp:1730 -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1447 directorymergewindow.cpp:1739 +#: directorymergewindow.cpp:1779 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:1461 +#: directorymergewindow.cpp:1470 msgid "Not saved." msgstr "Não gravado." -#: directorymergewindow.cpp:1496 +#: directorymergewindow.cpp:1505 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de junção desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:1528 +#: directorymergewindow.cpp:1537 msgid "Unknown merge operation." msgstr "Operação de junção desconhecida." -#: directorymergewindow.cpp:1543 +#: directorymergewindow.cpp:1552 msgid "" "The merge is about to begin.\n" "\n" @@ -332,19 +332,19 @@ "Tenha em atenção que este programa está ainda em estado Beta e NÃO " "EXISTE NENHUMA GARANTIA! Faça cópias de segurança dos seus dados vitais!" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Starting Merge" msgstr "A Iniciar a Junção" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Do It" msgstr "Fazê-lo" -#: directorymergewindow.cpp:1548 +#: directorymergewindow.cpp:1557 msgid "Simulate It" msgstr "Simulá-lo" -#: directorymergewindow.cpp:1574 +#: directorymergewindow.cpp:1583 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -352,7 +352,7 @@ "O item realçado tem um tipo diferente nas várias directorias. Seleccione o " "que fazer." -#: directorymergewindow.cpp:1583 +#: directorymergewindow.cpp:1592 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -360,13 +360,13 @@ "As datas de modificação dos ficheiros são iguais mas estes não o são. " "Seleccione o que fazer." -#: directorymergewindow.cpp:1633 +#: directorymergewindow.cpp:1642 msgid "This operation is currently not possible because dir merge currently runs." msgstr "" "Esta operação não é possível de momento que a junção da directoria " "está a decorrer." -#: directorymergewindow.cpp:1692 +#: directorymergewindow.cpp:1701 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -375,247 +375,247 @@ "Ocorreu um erro no último passo.\n" "Deseja continuar com o item que causou o erro ou deseja saltar este item?" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Continue merge after an error" msgstr "Continuar a junção após um erro" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:1694 +#: directorymergewindow.cpp:1703 msgid "Skip Item" msgstr "Saltar o Item" -#: directorymergewindow.cpp:1730 +#: directorymergewindow.cpp:1739 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:1737 directorymergewindow.cpp:1963 +#: directorymergewindow.cpp:1746 directorymergewindow.cpp:1972 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:1785 +#: directorymergewindow.cpp:1794 msgid "Merge operation complete." msgstr "A operação de junção terminou." -#: directorymergewindow.cpp:1785 directorymergewindow.cpp:1788 +#: directorymergewindow.cpp:1794 directorymergewindow.cpp:1797 msgid "Merge Complete" msgstr "Junção Completa" -#: directorymergewindow.cpp:1797 +#: directorymergewindow.cpp:1806 msgid "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação da junção terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1842 msgid "" "An error occurred. Press OK to see detailed information.\n" msgstr "" "Ocorreu um erro. Carregue em OK para ver a informação detalhada.\n" -#: directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1885 msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar o %1: a criação da cópia de segurança falhou." -#: directorymergewindow.cpp:1883 +#: directorymergewindow.cpp:1892 msgid "delete directory recursively( %1 )" msgstr "apagar recursivamente as directorias( %1 )" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1894 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:1900 +#: directorymergewindow.cpp:1909 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operação de remoção da directoria falhou ao tentar ler a " "directoria." -#: directorymergewindow.cpp:1919 +#: directorymergewindow.cpp:1928 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operação rmdir( %1 ) falhou." -#: directorymergewindow.cpp:1929 +#: directorymergewindow.cpp:1938 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:1955 +#: directorymergewindow.cpp:1964 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "junção manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:1958 +#: directorymergewindow.cpp:1967 msgid " Note: After a manual merge the user should continue via F7." msgstr " Nota: Após uma junção manual o utilizador deve continuar com o F7." -#: directorymergewindow.cpp:1981 +#: directorymergewindow.cpp:1990 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: a cópia( %1 -> %2 ) falhou. A remoção do destino existente falhou." -#: directorymergewindow.cpp:1991 +#: directorymergewindow.cpp:2000 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2002 +#: directorymergewindow.cpp:2011 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: o copyLink falhou: As ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2008 +#: directorymergewindow.cpp:2017 msgid "Error: copyLink failed." msgstr "Erro: o copyLink falhou." -#: directorymergewindow.cpp:2028 +#: directorymergewindow.cpp:2037 msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2054 +#: directorymergewindow.cpp:2063 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante o rename( %1 -> %2 ): Não é possível remover o destino " "existente." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:2069 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2069 +#: directorymergewindow.cpp:2078 msgid "Error: Rename failed." -msgstr "Erro: A renomeação falhou." +msgstr "Erro: A mudança de nome falhou." -#: directorymergewindow.cpp:2087 +#: directorymergewindow.cpp:2096 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Erro durante o makeDir do %1. Não é possível remover o ficheiro existente." -#: directorymergewindow.cpp:2103 +#: directorymergewindow.cpp:2112 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2113 +#: directorymergewindow.cpp:2122 msgid "Error while creating directory." msgstr "Erro ao criar a directoria." -#: directorymergewindow.cpp:2140 directorymergewindow.cpp:2248 +#: directorymergewindow.cpp:2145 directorymergewindow.cpp:2253 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2144 directorymergewindow.cpp:2173 +#: directorymergewindow.cpp:2149 directorymergewindow.cpp:2178 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2145 +#: directorymergewindow.cpp:2150 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2146 +#: directorymergewindow.cpp:2151 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2152 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2153 msgid "Last Modification" msgstr "Última Modificação" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2154 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2190 +#: directorymergewindow.cpp:2195 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2210 +#: directorymergewindow.cpp:2215 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2213 +#: directorymergewindow.cpp:2218 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2219 +#: directorymergewindow.cpp:2224 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2227 +#: directorymergewindow.cpp:2232 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2233 +#: directorymergewindow.cpp:2238 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2263 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a Junção da Directoria" -#: directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2264 msgid "Run Operation for Current Item" msgstr "Executar a Operação o Item Actual" -#: directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2265 msgid "Compare Selected File" msgstr "Comparar o Ficheiro Seleccionado" -#: directorymergewindow.cpp:2261 +#: directorymergewindow.cpp:2266 msgid "Merge Current File" msgstr "Juntar o Ficheiro Actual" -#: directorymergewindow.cpp:2262 +#: directorymergewindow.cpp:2267 msgid "Fold All Subdirs" msgstr "Fechar Todas as Sub-Directorias" -#: directorymergewindow.cpp:2263 +#: directorymergewindow.cpp:2268 msgid "Unfold All Subdirs" msgstr "Expandir Todas as Sub-Directorias" -#: directorymergewindow.cpp:2265 +#: directorymergewindow.cpp:2270 msgid "Choose A for All Items" msgstr "Seleccionar Todos os Itens do A" -#: directorymergewindow.cpp:2266 +#: directorymergewindow.cpp:2271 msgid "Choose B for All Items" msgstr "Seleccionar Todos os Itens do B" -#: directorymergewindow.cpp:2267 +#: directorymergewindow.cpp:2272 msgid "Choose C for All Items" msgstr "Seleccionar Todos os Itens do C" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2273 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2274 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2278 +#: directorymergewindow.cpp:2276 directorymergewindow.cpp:2283 msgid "Do Nothing" msgstr "Fazer Nada" -#: directorymergewindow.cpp:2272 +#: directorymergewindow.cpp:2277 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2273 +#: directorymergewindow.cpp:2278 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2274 +#: directorymergewindow.cpp:2279 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2276 +#: directorymergewindow.cpp:2281 msgid "Delete (If Exists)" msgstr "Apagar (Se Existir)" -#: directorymergewindow.cpp:2283 +#: directorymergewindow.cpp:2288 msgid "Delete A and B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:2286 +#: directorymergewindow.cpp:2291 msgid "Merge to A and B" msgstr "Juntar a A e B" @@ -737,7 +737,7 @@ msgid "Saving failed." msgstr "A gravação falhou." -#: kdiff3.cpp:287 pdiff.cpp:1245 pdiff.cpp:1306 +#: kdiff3.cpp:287 pdiff.cpp:1260 pdiff.cpp:1321 msgid "Opening of these files failed:" msgstr "O acesso a estes ficheiros falhou:" @@ -936,11 +936,11 @@ msgstr "Mudar Entre a Janela de Directorias e de Texto" #: kdiff3.cpp:420 kdiff3.cpp:536 kdiff3.cpp:560 kdiff3.cpp:593 kdiff3.cpp:613 -#: pdiff.cpp:1263 pdiff.cpp:1325 pdiff.cpp:1346 pdiff.cpp:1362 pdiff.cpp:1393 +#: pdiff.cpp:1278 pdiff.cpp:1340 pdiff.cpp:1361 pdiff.cpp:1377 pdiff.cpp:1408 msgid "Ready." msgstr "Pronto." -#: kdiff3.cpp:483 pdiff.cpp:1695 +#: kdiff3.cpp:483 pdiff.cpp:1702 msgid "The merge result hasn't been saved." msgstr "O resultado da junção não foi ainda gravado." @@ -952,11 +952,11 @@ msgid "Quit Without Saving" msgstr "Sair sem Gravar" -#: kdiff3.cpp:492 pdiff.cpp:1704 +#: kdiff3.cpp:492 pdiff.cpp:1711 msgid "Saving the merge result failed." msgstr "A gravação do resultado da junção falhou." -#: kdiff3.cpp:503 pdiff.cpp:1185 +#: kdiff3.cpp:503 pdiff.cpp:1200 msgid "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Você está a fazer uma junção de directorias de momento. Tem a certeza " @@ -988,7 +988,7 @@ #: kdiff3.cpp:645 msgid "Case sensitive" -msgstr "Distinguir maiúsculas" +msgstr "Distinguir capitalização" #: kdiff3.cpp:648 msgid "Search A" @@ -1028,61 +1028,61 @@ "Isto acontece normalmente devido a um problema de instalação. Leia por " "favor o ficheiro README no pacote de código para mais detalhes." -#: main.cpp:26 +#: main.cpp:27 msgid "Text Diff and Merge Tool" msgstr "Ferramenta de Junção e Diferenças do Texto" -#: main.cpp:31 +#: main.cpp:32 msgid "Merge the input." msgstr "Juntar a entrada." -#: main.cpp:33 +#: main.cpp:34 msgid "Explicit base file. For compatibility with certain tools." msgstr "Ficheiro de base explícito. Para a compatibilidade com certas ferramentas." -#: main.cpp:35 +#: main.cpp:36 msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Ficheiro de saída. Implica o -m. P.ex.: -o novoficheiro.txt" -#: main.cpp:36 +#: main.cpp:37 msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Ficheiro de saída, de novo. (para a compatibilidade com certas ferramentas)" -#: main.cpp:37 +#: main.cpp:38 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sem interface se todos os conflitos são resolvidos automaticamente (precisa " "do -o ficheiro)" -#: main.cpp:38 +#: main.cpp:39 msgid "Don't solve conflicts automatically. (For compatibility...)" msgstr "Não resolver os conflitos automaticamente. (Para compatibilidade...)" -#: main.cpp:39 +#: main.cpp:40 msgid "Visible name replacement. Supply this once for every input." msgstr "Substituição do nome visível. Indique isto para cada entrada." -#: main.cpp:41 +#: main.cpp:42 msgid "For compatibility with certain tools." msgstr "Para a compatibilidade com certas ferramentas." -#: main.cpp:43 +#: main.cpp:44 msgid "file1 to open (base, if not specified via --base)" msgstr "o ficheiro 1 a abrir (base, se não for indicado através do --base)" -#: main.cpp:44 +#: main.cpp:45 msgid "file2 to open" msgstr "o ficheiro 2 a abrir" -#: main.cpp:45 +#: main.cpp:46 msgid "file3 to open" msgstr "o ficheiro 3 a abrir" -#: main.cpp:98 rc.cpp:3 +#: main.cpp:99 rc.cpp:3 msgid "KDiff3" msgstr "KDiff3" -#: mergeresultwindow.cpp:249 +#: mergeresultwindow.cpp:250 msgid "" "The output has been modified.\n" "If you continue your changes will be lost." @@ -1090,55 +1090,55 @@ "O resultado foi modificado.\n" "Se você continuar as suas alterações serão perdidas." -#: mergeresultwindow.cpp:667 pdiff.cpp:585 +#: mergeresultwindow.cpp:671 pdiff.cpp:591 msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada são iguais a nível binário." -#: mergeresultwindow.cpp:669 pdiff.cpp:587 +#: mergeresultwindow.cpp:673 pdiff.cpp:593 msgid "All input files contain the same text." msgstr "Todos os ficheiros de entrada contêm o mesmo texto." -#: mergeresultwindow.cpp:671 pdiff.cpp:589 +#: mergeresultwindow.cpp:675 pdiff.cpp:595 msgid "" "Files A and B are binary equal.\n" msgstr "" "Os ficheiros A e B são iguais a nível binário.\n" -#: mergeresultwindow.cpp:672 pdiff.cpp:590 +#: mergeresultwindow.cpp:676 pdiff.cpp:596 msgid "" "Files A and B have equal text. \n" msgstr "" "Os ficheiros A e B têm texto igual.\n" -#: mergeresultwindow.cpp:673 pdiff.cpp:591 +#: mergeresultwindow.cpp:677 pdiff.cpp:597 msgid "" "Files A and C are binary equal.\n" msgstr "" "Os ficheiros A e C são iguais a nível binário.\n" -#: mergeresultwindow.cpp:674 pdiff.cpp:592 +#: mergeresultwindow.cpp:678 pdiff.cpp:598 msgid "" "Files A and C have equal text. \n" msgstr "" "Os ficheiros A e C têm texto igual.\n" -#: mergeresultwindow.cpp:675 pdiff.cpp:593 +#: mergeresultwindow.cpp:679 pdiff.cpp:599 msgid "" "Files B and C are binary equal.\n" msgstr "" "Os ficheiros B e C são iguais a nível binário.\n" -#: mergeresultwindow.cpp:676 pdiff.cpp:594 +#: mergeresultwindow.cpp:680 pdiff.cpp:600 msgid "" "Files B and C have equal text. \n" msgstr "" "Os ficheiros B e C têm texto igual.\n" -#: mergeresultwindow.cpp:679 +#: mergeresultwindow.cpp:683 msgid "Total number of conflicts: " msgstr "Número total de conflitos: " -#: mergeresultwindow.cpp:680 +#: mergeresultwindow.cpp:684 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1146,7 +1146,7 @@ "\n" "Número total de conflitos resolvidos automaticamente: " -#: mergeresultwindow.cpp:681 +#: mergeresultwindow.cpp:685 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1154,23 +1154,23 @@ "\n" "Número de conflitos por resolver: " -#: mergeresultwindow.cpp:683 +#: mergeresultwindow.cpp:687 msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1011 +#: mergeresultwindow.cpp:1015 msgid "<No src line>" msgstr "<Sem linha de origem>" -#: mergeresultwindow.cpp:1018 +#: mergeresultwindow.cpp:1022 msgid "<Merge Conflict>" msgstr "<Conflito na Junção>" -#: mergeresultwindow.cpp:1082 +#: mergeresultwindow.cpp:1086 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:1957 +#: mergeresultwindow.cpp:1964 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1178,11 +1178,11 @@ "Nem todos os conflitos estão ainda resolvidos.\n" "O ficheiro não foi gravado.\n" -#: mergeresultwindow.cpp:1959 +#: mergeresultwindow.cpp:1966 msgid "Conflicts Left" msgstr "Conflitos Restantes" -#: mergeresultwindow.cpp:1971 +#: mergeresultwindow.cpp:1978 msgid "" "\n" "\n" @@ -1192,15 +1192,15 @@ "\n" "O ficheiro não foi gravado." -#: mergeresultwindow.cpp:1971 mergeresultwindow.cpp:2033 +#: mergeresultwindow.cpp:1978 mergeresultwindow.cpp:2040 msgid "File Save Error" msgstr "Erro na Gravação do Ficheiro" -#: mergeresultwindow.cpp:1987 +#: mergeresultwindow.cpp:1994 msgid "Out of memory while preparing to save." msgstr "Falta de memória ao preparar a gravação." -#: mergeresultwindow.cpp:2033 +#: mergeresultwindow.cpp:2040 msgid "Error while writing." msgstr "Erro ao gravar." @@ -1648,7 +1648,7 @@ msgid "This resets all options. Not only those of the current topic." msgstr "Isto repõe todas as opções, não só as do tópico actual." -#: pdiff.cpp:371 +#: pdiff.cpp:377 msgid "" "Running the external diff failed.\n" "Check if the diff works, if the program can write in the temp folder or if " @@ -1662,43 +1662,43 @@ "A opção do 'diff' externo será agora desactivada e será usado o 'diff' " "interno." -#: pdiff.cpp:437 +#: pdiff.cpp:443 msgid "Loading A" msgstr "A Carregar o A" -#: pdiff.cpp:442 +#: pdiff.cpp:448 msgid "Loading B" msgstr "A Carregar o B" -#: pdiff.cpp:453 pdiff.cpp:481 pdiff.cpp:493 +#: pdiff.cpp:459 pdiff.cpp:487 pdiff.cpp:499 msgid "Diff: A <-> B" msgstr "Diferenças: A <-> B" -#: pdiff.cpp:461 pdiff.cpp:514 +#: pdiff.cpp:467 pdiff.cpp:520 msgid "Linediff: A <-> B" msgstr "Dif. Linhas: A <-> B" -#: pdiff.cpp:470 +#: pdiff.cpp:476 msgid "Loading C" msgstr "A Carregar o C" -#: pdiff.cpp:484 pdiff.cpp:496 +#: pdiff.cpp:490 pdiff.cpp:502 msgid "Diff: B <-> C" msgstr "Diferenças: B <-> C" -#: pdiff.cpp:487 pdiff.cpp:499 +#: pdiff.cpp:493 pdiff.cpp:505 msgid "Diff: A <-> C" msgstr "Diferenças: A <-> C" -#: pdiff.cpp:517 +#: pdiff.cpp:523 msgid "Linediff: B <-> C" msgstr "Dif. Linhas: B <-> C" -#: pdiff.cpp:520 +#: pdiff.cpp:526 msgid "Linediff: A <-> C" msgstr "Dif. Linhas: A <-> C" -#: pdiff.cpp:604 +#: pdiff.cpp:610 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1709,67 +1709,67 @@ "binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:1015 +#: pdiff.cpp:1030 msgid "A (Base):" msgstr "A (Base):" -#: pdiff.cpp:1021 pdiff.cpp:1036 pdiff.cpp:1051 pdiff.cpp:1069 +#: pdiff.cpp:1036 pdiff.cpp:1051 pdiff.cpp:1066 pdiff.cpp:1084 msgid "File..." msgstr "Ficheiro..." -#: pdiff.cpp:1023 pdiff.cpp:1038 pdiff.cpp:1053 pdiff.cpp:1071 +#: pdiff.cpp:1038 pdiff.cpp:1053 pdiff.cpp:1068 pdiff.cpp:1086 msgid "Dir..." msgstr "Directoria..." -#: pdiff.cpp:1046 +#: pdiff.cpp:1061 msgid "C (Optional):" msgstr "C (Opcional):" -#: pdiff.cpp:1064 +#: pdiff.cpp:1079 msgid "Output (optional):" msgstr "Resultado (opcional):" -#: pdiff.cpp:1093 +#: pdiff.cpp:1108 msgid "Configure..." msgstr "Configurar..." -#: pdiff.cpp:1186 +#: pdiff.cpp:1201 msgid "Abort" msgstr "Abortar..." -#: pdiff.cpp:1192 pdiff.cpp:1271 +#: pdiff.cpp:1207 pdiff.cpp:1286 msgid "Opening files..." msgstr "A aceder aos ficheiros..." -#: pdiff.cpp:1254 pdiff.cpp:1315 +#: pdiff.cpp:1269 pdiff.cpp:1330 msgid "File open error" msgstr "Erro ao abrir ficheiro" -#: pdiff.cpp:1330 +#: pdiff.cpp:1345 msgid "Cutting selection..." msgstr "A cortar a selecção..." -#: pdiff.cpp:1351 +#: pdiff.cpp:1366 msgid "Copying selection to clipboard..." msgstr "A copiar a selecção..." -#: pdiff.cpp:1367 +#: pdiff.cpp:1382 msgid "Inserting clipboard contents..." msgstr "A inserir o conteúdo da área de transferência..." -#: pdiff.cpp:1696 +#: pdiff.cpp:1703 msgid "Save && Continue" msgstr "Gravar e Continuar" -#: pdiff.cpp:1696 +#: pdiff.cpp:1703 msgid "Continue Without Saving" msgstr "Continuar sem Gravar" -#: pdiff.cpp:1901 +#: pdiff.cpp:1908 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1901 +#: pdiff.cpp:1908 msgid "Search Complete" msgstr "Procura Terminada"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/po/ru.po Sun Mar 07 10:05:41 2004 +0000 @@ -0,0 +1,1679 @@ +# KDE3 - kdeextragear-1/kdiff3.po Russian translation. +# Copyright (C) 2004, KDE Team. +# Nick Shafff <linux@l10n.org.ua>, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"POT-Creation-Date: 2004-01-09 01:37+0100\n" +"PO-Revision-Date: 2004-01-30 08:11+0300\n" +"Last-Translator: Andrey S. Cherepanov <sibskull@mail.ru>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Николай Шафоростов" + +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "linux@l10n.org.ua" + +#: diff.cpp:472 +msgid "From Clipboard" +msgstr "Из буфера обмена" + +#: diff.cpp:1096 diff.cpp:1110 +msgid "" +"Data loss error:\n" +"If it is reproducable please contact the author.\n" +msgstr "Потеря данных.\n" + +#: diff.cpp:1098 diff.cpp:1112 +msgid "Severe Internal Error" +msgstr "Внутренняя ошибка" + +#: difftextwindow.cpp:790 +#, c-format +msgid "Topline %1" +msgstr "Первая строка %1" + +#: difftextwindow.cpp:792 +msgid "End" +msgstr "Конец" + +#: directorymergewindow.cpp:113 +msgid "Mix of links and normal files." +msgstr "Совмещение ссылок и обычных файлов" + +#: directorymergewindow.cpp:120 +msgid "Link: " +msgstr "Ссылка: " + +#: directorymergewindow.cpp:128 +msgid "Size. " +msgstr "Размер. " + +#: directorymergewindow.cpp:141 +msgid "Date & Size: " +msgstr "Дата и размер: " + +#: directorymergewindow.cpp:150 directorymergewindow.cpp:156 +msgid "Creating temp copy of %1 failed." +msgstr "Не удалось создать временную копию ." + +#: directorymergewindow.cpp:167 directorymergewindow.cpp:175 +msgid "Opening %1 failed." +msgstr "Не удалось открыть %1." + +#: directorymergewindow.cpp:191 directorymergewindow.cpp:197 +#, c-format +msgid "Error reading from %1" +msgstr "Ошибка чтения из %1" + +#: directorymergewindow.cpp:243 +msgid "Name" +msgstr "Имя" + +#: directorymergewindow.cpp:247 +msgid "Operation" +msgstr "Действие" + +#: directorymergewindow.cpp:248 +msgid "Status" +msgstr "Состояние" + +#: directorymergewindow.cpp:271 +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "Сейчас программа работает в режиме объединения каталогов. Вы действительно хотите отменить все изменения и обновить содержание каталогов?" + +#: directorymergewindow.cpp:272 directorymergewindow.cpp:2269 +msgid "Rescan" +msgstr "Обновить" + +#: directorymergewindow.cpp:272 kdiff3.cpp:504 pdiff.cpp:1201 +msgid "Continue Merging" +msgstr "Продолжить" + +#: directorymergewindow.cpp:381 +msgid "Opening of directories failed:" +msgstr "Не удалось открыть каталоги:" + +#: directorymergewindow.cpp:384 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог A \"%1\" не существует.\n" + +#: directorymergewindow.cpp:387 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог B \"%1\" не существует.\n" + +#: directorymergewindow.cpp:390 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог C \"%1\" не существует.\n" + +#: directorymergewindow.cpp:392 +msgid "Directory Open Error" +msgstr "Ошибка чтения каталога" + +#: directorymergewindow.cpp:400 +msgid "" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" +"Check again before continuing." +msgstr "Путь к конечному каталогу не должен совпадать с A или B." + +#: directorymergewindow.cpp:402 +msgid "Parameter Warning" +msgstr "Неправильный параметр" + +#: directorymergewindow.cpp:429 +msgid "Reading Directory A" +msgstr "Чтение каталога A" + +#: directorymergewindow.cpp:451 +msgid "Reading Directory B" +msgstr "Чтение каталога B" + +#: directorymergewindow.cpp:473 +msgid "Reading Directory C" +msgstr "Чтение каталога C" + +#: directorymergewindow.cpp:499 +msgid "Some subdirectories were not readable in" +msgstr "Не удалось почитать некоторые подкаталоги в" + +#: directorymergewindow.cpp:504 +msgid "Check the permissions of the subdirectories." +msgstr "Проверьте права этих каталогов." + +#: directorymergewindow.cpp:551 +msgid "Directory Comparison Status" +msgstr "Состояние сравнения каталогов" + +#: directorymergewindow.cpp:552 +msgid "Number of subdirectories:" +msgstr "Количество подкаталогов:" + +#: directorymergewindow.cpp:553 +msgid "Number of equal files:" +msgstr "Количество одинаковых файлов:" + +#: directorymergewindow.cpp:554 +msgid "Number of different files:" +msgstr "Количество разных файлов:" + +#: directorymergewindow.cpp:557 +msgid "Number of manual merges:" +msgstr "Количество объединений вручную:" + +#: directorymergewindow.cpp:693 +msgid "This affects all merge operations." +msgstr "Это влияет на все объединения" + +#: directorymergewindow.cpp:694 +msgid "Changing All Merge Operations" +msgstr "Изменение всех объединений" + +#: directorymergewindow.cpp:694 mergeresultwindow.cpp:252 +msgid "C&ontinue" +msgstr "&Продолжить" + +#: directorymergewindow.cpp:961 +msgid "Processing " +msgstr "Обработка " + +#: directorymergewindow.cpp:1309 directorymergewindow.cpp:1316 +msgid "To do." +msgstr "Осталось сделать." + +#: directorymergewindow.cpp:1343 directorymergewindow.cpp:2284 +msgid "Copy A to B" +msgstr "Копировать A в B" + +#: directorymergewindow.cpp:1344 directorymergewindow.cpp:2285 +msgid "Copy B to A" +msgstr "Копировать B в A" + +#: directorymergewindow.cpp:1345 directorymergewindow.cpp:2286 +msgid "Delete A" +msgstr "Удалить A" + +#: directorymergewindow.cpp:1346 directorymergewindow.cpp:2287 +msgid "Delete B" +msgstr "Удалить B" + +#: directorymergewindow.cpp:1347 +msgid "Delete A & B" +msgstr "Удалить A и B" + +#: directorymergewindow.cpp:1348 directorymergewindow.cpp:2289 +#, fuzzy +msgid "Merge to A" +msgstr "Объединить в A" + +#: directorymergewindow.cpp:1349 directorymergewindow.cpp:2290 +#, fuzzy +msgid "Merge to B" +msgstr "Объединить в B" + +#: directorymergewindow.cpp:1350 +#, fuzzy +msgid "Merge to A & B" +msgstr "Объединить в A & B" + +#: directorymergewindow.cpp:1354 +msgid "Delete (if exists)" +msgstr "Удалить (если существует)" + +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +#: directorymergewindow.cpp:2280 pdiff.cpp:1076 +msgid "Merge" +msgstr "Объединить" + +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +msgid "Merge (manual)" +msgstr "Объединить (вручную)" + +#: directorymergewindow.cpp:1357 +msgid "Error: Conflicting File Types" +msgstr "Ошибка: Несовместимые типы файлов" + +#: directorymergewindow.cpp:1358 +msgid "Error: Dates are equal but files are not." +msgstr "Ошибка: Время совпадает, а содержимое файлов - нет." + +#: directorymergewindow.cpp:1382 +msgid "This operation is currently not possible." +msgstr "Пока невозможно" + +#: directorymergewindow.cpp:1382 directorymergewindow.cpp:1642 +msgid "Operation Not Possible" +msgstr "Пока невозможно" + +#: directorymergewindow.cpp:1425 +msgid "" +"This should never happen: \n" +"\n" +"mergeResultSaved: m_pMFI=0\n" +"\n" +"If you know how to reproduce this, please contact the program author." +msgstr "" +"mergeResultSaved: m_pMFI=0\n" +"\n" +"Если вы знаете в чём причина, сообщите автору." + +#: directorymergewindow.cpp:1425 +msgid "Program Error" +msgstr "Ошибка программы" + +#: directorymergewindow.cpp:1436 +msgid "An error occurred while copying.\n" +msgstr "Ошибка копирования.\n" + +#: directorymergewindow.cpp:1437 directorymergewindow.cpp:1843 +msgid "Merge Error" +msgstr "Ошибка объединения" + +#: directorymergewindow.cpp:1442 directorymergewindow.cpp:1848 +msgid "Error." +msgstr "Ошибка." + +#: directorymergewindow.cpp:1447 directorymergewindow.cpp:1739 +#: directorymergewindow.cpp:1779 +msgid "Done." +msgstr "Готово." + +#: directorymergewindow.cpp:1470 +msgid "Not saved." +msgstr "Не сохранено." + +#: directorymergewindow.cpp:1505 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Неизвестное объединение" + +#: directorymergewindow.cpp:1537 +msgid "Unknown merge operation." +msgstr "Неизвестное объединение" + +#: directorymergewindow.cpp:1552 +msgid "" +"The merge is about to begin.\n" +"\n" +"Choose \"Do it\" if you have read the instructions and know what you are " +"doing.\n" +"Choosing \"Simulate it\" will tell you what would happen.\n" +"\n" +"Be aware that this program still has beta status and there is NO WARRANTY " +"whatsoever! Make backups of your vital data!" +msgstr "" +"Сейчас начнётся объединения.\n" +"\n" +"Нажмите \"Выполнить\" после прочтения инструкций.\n" +"Нажмите \"Эмулировать\" чтобы увидеть, что должно произойти.\n" +"\n" +"Мы советуем всегда делать резервные копии данных перед объединением!" + +#: directorymergewindow.cpp:1557 +msgid "Starting Merge" +msgstr "Начало объединения" + +#: directorymergewindow.cpp:1557 +msgid "Do It" +msgstr "Выполнить" + +#: directorymergewindow.cpp:1557 +msgid "Simulate It" +msgstr "Эмулировать" + +#: directorymergewindow.cpp:1583 +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "Выделенный файл имеет разный тип в каждом каталоге. Выберите что делать." + +#: directorymergewindow.cpp:1592 +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "Даты последнего изменения файлов одинаковы, о содержимое - нет. Выберите что делать." + +#: directorymergewindow.cpp:1642 +msgid "This operation is currently not possible because dir merge currently runs." +msgstr "Сейчас выполняется объединение каталогов" + +#: directorymergewindow.cpp:1701 +msgid "" +"There was an error in the last step.\n" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" +msgstr "" +"На текущем этапе произошла ошибка.\n" +"Продолжить или пропустить?" + +#: directorymergewindow.cpp:1703 +msgid "Continue merge after an error" +msgstr "Продолжить после ошибки" + +#: directorymergewindow.cpp:1703 +msgid "Continue With Last Item" +msgstr "Продолжить" + +#: directorymergewindow.cpp:1703 +msgid "Skip Item" +msgstr "Пропустить" + +#: directorymergewindow.cpp:1739 +msgid "Skipped." +msgstr "Пропущено." + +#: directorymergewindow.cpp:1746 directorymergewindow.cpp:1972 +msgid "In progress..." +msgstr "Идёт работа..." + +#: directorymergewindow.cpp:1794 +msgid "Merge operation complete." +msgstr "Объединение завершено." + +#: directorymergewindow.cpp:1794 directorymergewindow.cpp:1797 +msgid "Merge Complete" +msgstr "Объединение завершено" + +#: directorymergewindow.cpp:1806 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Объединение завершено. Вы согласны с предлагаемыми изменениями?" + +#: directorymergewindow.cpp:1842 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Произошла ошибка. Нажмите OK для подробностей.\n" + +#: directorymergewindow.cpp:1885 +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Не удалось создать резервную копию %1." + +#: directorymergewindow.cpp:1892 +msgid "delete directory recursively( %1 )" +msgstr "удалить каталог рекурсивно(%1 )" + +#: directorymergewindow.cpp:1894 +msgid "delete( %1 )" +msgstr "удалить( %1 )" + +#: directorymergewindow.cpp:1909 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Не удалось удалить каталог" + +#: directorymergewindow.cpp:1928 +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Ошибка rmdir( %1 )." + +#: directorymergewindow.cpp:1938 +msgid "Error: delete operation failed." +msgstr "Не удалось удалить." + +#: directorymergewindow.cpp:1964 +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "объединение вручную( %1, %2, %3 -> %4)" + +#: directorymergewindow.cpp:1967 +msgid " Note: After a manual merge the user should continue via F7." +msgstr " После завершения объединения вручную нажмите F7." + +#: directorymergewindow.cpp:1990 +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Не удалось скопировать %1 в %2. Не удалось удалить существующее назначение." + +#: directorymergewindow.cpp:2000 +msgid "copyLink( %1 -> %2 )" +msgstr "символическая ссылка( %1 -> %2 )" + +#: directorymergewindow.cpp:2011 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Ошибка: Удалённые ссылки не поддерживаются." + +#: directorymergewindow.cpp:2017 +msgid "Error: copyLink failed." +msgstr "Не удалось создать ссылку." + +#: directorymergewindow.cpp:2037 +msgid "copy( %1 -> %2 )" +msgstr "копировать( %1 -> %2 )" + +#: directorymergewindow.cpp:2063 +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Не удалось переименовать %1 в%2. Не удалось удалить существующее назначение." + +#: directorymergewindow.cpp:2069 +msgid "rename( %1 -> %2 )" +msgstr "переименовать( %1 -> %2 )" + +#: directorymergewindow.cpp:2078 +msgid "Error: Rename failed." +msgstr "Не удалось переименовать" + +#: directorymergewindow.cpp:2096 +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Не удалось создать каталог %1. Не удалось удалить существующий файл." + +#: directorymergewindow.cpp:2112 +msgid "makeDir( %1 )" +msgstr "создать каталог( %1 )" + +#: directorymergewindow.cpp:2122 +msgid "Error while creating directory." +msgstr "Не удалось создать каталог" + +#: directorymergewindow.cpp:2145 directorymergewindow.cpp:2253 +msgid "Dest" +msgstr "Назначение" + +#: directorymergewindow.cpp:2149 directorymergewindow.cpp:2178 +msgid "Dir" +msgstr "Каталог" + +#: directorymergewindow.cpp:2150 +msgid "Type" +msgstr "Тип" + +#: directorymergewindow.cpp:2151 +msgid "Size" +msgstr "Размер" + +#: directorymergewindow.cpp:2152 +msgid "Attr" +msgstr "Атрибуты" + +#: directorymergewindow.cpp:2153 +msgid "Last Modification" +msgstr "Последнее изменение" + +#: directorymergewindow.cpp:2154 +msgid "Link-Destination" +msgstr "Объект ссылки" + +#: directorymergewindow.cpp:2195 +msgid "not available" +msgstr "не доступно" + +#: directorymergewindow.cpp:2215 +msgid "A (Dest): " +msgstr "A (назначение): " + +#: directorymergewindow.cpp:2218 +msgid "A (Base): " +msgstr "A (исходное): " + +#: directorymergewindow.cpp:2224 +msgid "B (Dest): " +msgstr "B (назначение): " + +#: directorymergewindow.cpp:2232 +msgid "C (Dest): " +msgstr "C (назначение): " + +#: directorymergewindow.cpp:2238 +msgid "Dest: " +msgstr "Назначение: " + +#: directorymergewindow.cpp:2263 +msgid "Start/Continue Directory Merge" +msgstr "Начать/продолжить объединение каталогов" + +#: directorymergewindow.cpp:2264 +msgid "Run Operation for Current Item" +msgstr "Выполнить для текущего пункта" + +#: directorymergewindow.cpp:2265 +msgid "Compare Selected File" +msgstr "Сравнить выделенный файл" + +#: directorymergewindow.cpp:2266 +msgid "Merge Current File" +msgstr "Объединить текущий файл" + +#: directorymergewindow.cpp:2267 +msgid "Fold All Subdirs" +msgstr "Включая все подкаталоги" + +#: directorymergewindow.cpp:2268 +msgid "Unfold All Subdirs" +msgstr "Исключая все подкаталоги" + +#: directorymergewindow.cpp:2270 +msgid "Choose A for All Items" +msgstr "Выбрать A для всех" + +#: directorymergewindow.cpp:2271 +msgid "Choose B for All Items" +msgstr "Выбрать B для всех" + +#: directorymergewindow.cpp:2272 +msgid "Choose C for All Items" +msgstr "Выбрать C для всех" + +#: directorymergewindow.cpp:2273 +msgid "Auto-Choose Operation for All Items" +msgstr "Автоматически выбирать тип действия для всех" + +#: directorymergewindow.cpp:2274 +msgid "No Operation for All Items" +msgstr "Убрать действия для всех" + +#: directorymergewindow.cpp:2276 directorymergewindow.cpp:2283 +msgid "Do Nothing" +msgstr "Ничего" + +#: directorymergewindow.cpp:2277 +msgid "A" +msgstr "A" + +#: directorymergewindow.cpp:2278 +msgid "B" +msgstr "B" + +#: directorymergewindow.cpp:2279 +msgid "C" +msgstr "C" + +#: directorymergewindow.cpp:2281 +msgid "Delete (If Exists)" +msgstr "Удалить (если существует)" + +#: directorymergewindow.cpp:2288 +msgid "Delete A and B" +msgstr "Удалить A и B" + +#: directorymergewindow.cpp:2291 +#, fuzzy +msgid "Merge to A and B" +msgstr "Объединить в A и B" + +#: fileaccess.cpp:535 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"Не удалось удалить старую резервную копию. \n" +"Файл: " + +#: fileaccess.cpp:542 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"Не удалось выполнить переименование. \n" +"Файлы: " + +#: fileaccess.cpp:564 +#, c-format +msgid "Getting file status: %1" +msgstr "Получение состояния файла: %1" + +#: fileaccess.cpp:606 +#, c-format +msgid "Reading file: %1" +msgstr "Чтение файла: %1" + +#: fileaccess.cpp:642 +#, c-format +msgid "Writing file: %1" +msgstr "Запись в файл: %1" + +#: fileaccess.cpp:670 +msgid "Out of memory" +msgstr "Вне памяти" + +#: fileaccess.cpp:705 +#, c-format +msgid "Making directory: %1" +msgstr "Создание каталога: %1" + +#: fileaccess.cpp:725 +#, c-format +msgid "Removing directory: %1" +msgstr "Удаление каталога: %1" + +#: fileaccess.cpp:740 +#, c-format +msgid "Removing file: %1" +msgstr "Удаление файла: %1" + +#: fileaccess.cpp:756 +msgid "Creating symbolic link: %1 -> %2" +msgstr "Создание символической ссылки: %1 -> %2" + +#: fileaccess.cpp:782 +msgid "Renaming file: %1 -> %2" +msgstr "Переименование файла: %1 -> %2" + +#: fileaccess.cpp:817 +msgid "Copying file: %1 -> %2" +msgstr "Копирование файла: %1 -> %2" + +#: fileaccess.cpp:831 +#, c-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "Не удалось открыть для чтения файл %1" + +#: fileaccess.cpp:837 +#, c-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "Не удалось открыть для записи файл %1" + +#: fileaccess.cpp:852 +#, c-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Не удалось прочитать файл %1" + +#: fileaccess.cpp:861 +#, c-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Не удалось записать в файл %1" + +#: fileaccess.cpp:1162 +msgid "Reading directory: " +msgstr "Чтение каталога: " + +#: fileaccess.cpp:1218 +#, c-format +msgid "Listing directory: %1" +msgstr "Вывод содержимого каталога: %1" + +#: kdiff3.cpp:125 +msgid "Option --auto used, but no output file specified." +msgstr "Ключ --auto использован, но не указаны выходные файлы." + +#: kdiff3.cpp:223 +msgid "Option --auto ignored for directory comparison." +msgstr "Ключ --auto игнорируется для каталогов" + +#: kdiff3.cpp:263 +msgid "Saving failed." +msgstr "Не удалось произвести сохранение." + +#: kdiff3.cpp:287 pdiff.cpp:1260 pdiff.cpp:1321 +msgid "Opening of these files failed:" +msgstr "Не удалось открыть файлы:" + +#: kdiff3.cpp:296 +msgid "File Open Error" +msgstr "Ошибка открытия файлов" + +#: kdiff3.cpp:315 +msgid "Opens documents for comparison..." +msgstr "Открыть файлы для сравнения..." + +#: kdiff3.cpp:317 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!" + +#: kdiff3.cpp:319 +msgid "Saves the current document as..." +msgstr "Сохранить с другим именем..." + +#: kdiff3.cpp:321 +msgid "Quits the application" +msgstr "Выйти" + +#: kdiff3.cpp:323 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Вырезать в буфер обмена" + +#: kdiff3.cpp:325 +msgid "Copies the selected section to the clipboard" +msgstr "Скопировать в буфер обмена" + +#: kdiff3.cpp:327 +msgid "Pastes the clipboard contents to actual position" +msgstr "Вставить из буфера обмена" + +#: kdiff3.cpp:329 +msgid "Search for a string" +msgstr "Искать текст" + +#: kdiff3.cpp:331 +msgid "Search again for the string" +msgstr "Продолжить поиск текста" + +#: kdiff3.cpp:333 +msgid "Enables/disables the toolbar" +msgstr "Отобразить/скрыть панель инструментов" + +#: kdiff3.cpp:335 +msgid "Enables/disables the statusbar" +msgstr "Отобразить/скрыть панель состояния" + +#: kdiff3.cpp:339 +msgid "Configure KDiff3..." +msgstr "Настроить KDiff3..." + +#: kdiff3.cpp:359 +msgid "Go to Current Delta" +msgstr "Перейти к текущему различию" + +#: kdiff3.cpp:360 +msgid "Go to First Delta" +msgstr "Перейти к первому различию" + +#: kdiff3.cpp:361 +msgid "Go to Last Delta" +msgstr "Перейти к последнему различию" + +#: kdiff3.cpp:362 +msgid "Go to Previous Delta" +msgstr "Перейти к предыдущему различию" + +#: kdiff3.cpp:363 +msgid "Go to Next Delta" +msgstr "Перейти к следующему различию" + +#: kdiff3.cpp:364 +msgid "Go to Previous Conflict" +msgstr "Перейти к предыдущему конфликту" + +#: kdiff3.cpp:365 +msgid "Go to Next Conflict" +msgstr "Перейти к следующему конфликту" + +#: kdiff3.cpp:366 +msgid "Go to Previous Unsolved Conflict" +msgstr "Перейти к предыдущему неразрешённому конфликту" + +#: kdiff3.cpp:367 +msgid "Go to Next Unsolved Conflict" +msgstr "Перейти к следующему неразрешённому конфликту" + +#: kdiff3.cpp:368 +msgid "Select Line(s) From A" +msgstr "Выбрать строки из A" + +#: kdiff3.cpp:369 +msgid "Select Line(s) From B" +msgstr "Выбрать строки из B" + +#: kdiff3.cpp:370 +msgid "Select Line(s) From C" +msgstr "Выбрать строки из C" + +#: kdiff3.cpp:371 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Перейти к следующему неразрешённому конфликту после выделения исходника" + +#: kdiff3.cpp:373 +msgid "Show Space && Tabulator Characters for Differences" +msgstr "Отображать пробелы и табуляции в различиях" + +#: kdiff3.cpp:374 +msgid "Show White Space" +msgstr "Отображать пустые промежутки" + +#: kdiff3.cpp:376 +msgid "Show Line Numbers" +msgstr "Отображать номера строк" + +#: kdiff3.cpp:377 +msgid "Choose A Everywhere" +msgstr "Выбрать A везде" + +#: kdiff3.cpp:378 +msgid "Choose B Everywhere" +msgstr "Выбрать B везде" + +#: kdiff3.cpp:379 +msgid "Choose C Everywhere" +msgstr "Выбрать C везде" + +#: kdiff3.cpp:380 +msgid "Choose A For All Unsolved Conflicts" +msgstr "Выбрать A для всех неразрешённых конфликтов" + +#: kdiff3.cpp:381 +msgid "Choose B For All Unsolved Conflicts" +msgstr "Выбрать B для всех неразрешённых конфликтов" + +#: kdiff3.cpp:382 +msgid "Choose C For All Unsolved Conflicts" +msgstr "Выбрать C для всех неразрешённых конфликтов" + +#: kdiff3.cpp:383 +msgid "Choose A For All Unsolved Whitespace Conflicts" +msgstr "Выбрать A для всех неразрешённых конфликтов пустых промежутков" + +#: kdiff3.cpp:384 +msgid "Choose B For All Unsolved Whitespace Conflicts" +msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков" + +#: kdiff3.cpp:385 +msgid "Choose C For All Unsolved Whitespace Conflicts" +msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков" + +#: kdiff3.cpp:386 +msgid "Automatically Solve Simple Conflicts" +msgstr "Разрешать простые конфликты автоматически" + +#: kdiff3.cpp:387 +msgid "Set Deltas to Conflicts" +msgstr "Определить различия как конфликты" + +#: kdiff3.cpp:389 +msgid "Show Window A" +msgstr "Отобразить окно A" + +#: kdiff3.cpp:390 +msgid "Show Window B" +msgstr "Отобразить окно B" + +#: kdiff3.cpp:391 +msgid "Show Window C" +msgstr "Отобразить окно C" + +#: kdiff3.cpp:392 kdiff3.cpp:394 +msgid "Focus Next Window" +msgstr "Активировать следующее окно" + +#: kdiff3.cpp:396 +msgid "Focus Prev Window" +msgstr "Активировать предыдущее окно" + +#: kdiff3.cpp:397 +msgid "Toggle Split Orientation" +msgstr "" + +#: kdiff3.cpp:399 +msgid "Dir && Text Split Screen View" +msgstr "" + +#: kdiff3.cpp:401 +msgid "Toggle Between Dir && Text View" +msgstr "Каталоги/текст" + +#: kdiff3.cpp:420 kdiff3.cpp:536 kdiff3.cpp:560 kdiff3.cpp:593 kdiff3.cpp:613 +#: pdiff.cpp:1278 pdiff.cpp:1340 pdiff.cpp:1361 pdiff.cpp:1377 pdiff.cpp:1408 +msgid "Ready." +msgstr "Готово." + +#: kdiff3.cpp:483 pdiff.cpp:1702 +msgid "The merge result hasn't been saved." +msgstr "Результат объединения не сохранён" + +#: kdiff3.cpp:484 +msgid "Save && Quit" +msgstr "Сохранить и выйти" + +#: kdiff3.cpp:484 +msgid "Quit Without Saving" +msgstr "Выйти без сохранения" + +#: kdiff3.cpp:492 pdiff.cpp:1711 +msgid "Saving the merge result failed." +msgstr "Не удалось сохранить результат объединения" + +#: kdiff3.cpp:503 pdiff.cpp:1200 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Остановить объединение каталогов?" + +#: kdiff3.cpp:526 +msgid "Saving file..." +msgstr "Сохранение файла..." + +#: kdiff3.cpp:542 +msgid "Saving file with a new filename..." +msgstr "Сохранение файла с новым именем..." + +#: kdiff3.cpp:566 +msgid "Exiting..." +msgstr "Выход..." + +#: kdiff3.cpp:578 +msgid "Toggling toolbar..." +msgstr "Отображение/скрытие панели инструментов..." + +#: kdiff3.cpp:598 +msgid "Toggle the statusbar..." +msgstr "Отображение/скрытие панели состояния..." + +#: kdiff3.cpp:638 +msgid "Searchtext:" +msgstr "Найти:" + +#: kdiff3.cpp:645 +msgid "Case sensitive" +msgstr "С учётом регистра" + +#: kdiff3.cpp:648 +msgid "Search A" +msgstr "Поиск в A" + +#: kdiff3.cpp:653 +msgid "Search B" +msgstr "Поиск в B" + +#: kdiff3.cpp:658 +msgid "Search C" +msgstr "Поиск в C" + +#: kdiff3.cpp:663 +msgid "Search output" +msgstr "Поиск в выводе" + +#: kdiff3.cpp:668 +msgid "&Search" +msgstr "&Искать" + +#: kdiff3_part.cpp:131 kdiff3_part.cpp:196 +msgid "Couldn't find files for comparison." +msgstr "Не удалось найти файлы для сравнения." + +#: kdiff3_part.cpp:263 +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#: kdiff3_shell.cpp:63 +msgid "" +"Could not find our part!\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" + +#: main.cpp:27 +msgid "Text Diff and Merge Tool" +msgstr "Средство сравнения и объединения" + +#: main.cpp:32 +msgid "Merge the input." +msgstr "Объединить ввод." + +#: main.cpp:34 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" + +#: main.cpp:36 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" + +#: main.cpp:37 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" + +#: main.cpp:38 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" + +#: main.cpp:39 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "" + +#: main.cpp:40 +msgid "Visible name replacement. Supply this once for every input." +msgstr "" + +#: main.cpp:42 +msgid "For compatibility with certain tools." +msgstr "Для совместимости с некоторыми средствами." + +#: main.cpp:44 +msgid "file1 to open (base, if not specified via --base)" +msgstr "" + +#: main.cpp:45 +msgid "file2 to open" +msgstr "" + +#: main.cpp:46 +msgid "file3 to open" +msgstr "" + +#: main.cpp:99 rc.cpp:3 +msgid "KDiff3" +msgstr "KDiff3" + +#: mergeresultwindow.cpp:250 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" + +#: mergeresultwindow.cpp:671 pdiff.cpp:591 +msgid "All input files are binary equal." +msgstr "" + +#: mergeresultwindow.cpp:673 pdiff.cpp:593 +msgid "All input files contain the same text." +msgstr "" + +#: mergeresultwindow.cpp:675 pdiff.cpp:595 +msgid "Files A and B are binary equal.\n" +msgstr "Файлы A и B бинарно одинаковы.\n" + +#: mergeresultwindow.cpp:676 pdiff.cpp:596 +msgid "Files A and B have equal text. \n" +msgstr "Файлы A и B содержат одинаковый текст. \n" + +#: mergeresultwindow.cpp:677 pdiff.cpp:597 +msgid "Files A and C are binary equal.\n" +msgstr "Файлы A и C бинарно одинаковы.\n" + +#: mergeresultwindow.cpp:678 pdiff.cpp:598 +msgid "Files A and C have equal text. \n" +msgstr "Файлы A и C содержат одинаковый текст. \n" + +#: mergeresultwindow.cpp:679 pdiff.cpp:599 +msgid "Files B and C are binary equal.\n" +msgstr "Файлы B и C бинарно одинаковы.\n" + +#: mergeresultwindow.cpp:680 pdiff.cpp:600 +msgid "Files B and C have equal text. \n" +msgstr "Файлы B и C содержат одинаковый текст. \n" + +#: mergeresultwindow.cpp:683 +msgid "Total number of conflicts: " +msgstr "Общее количество конфликтов: " + +#: mergeresultwindow.cpp:684 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"Количество разрешённых автоматически конфликтов: " + +#: mergeresultwindow.cpp:685 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"Количество неразрешённых конфликтов: " + +#: mergeresultwindow.cpp:687 +msgid "Conflicts" +msgstr "Конфликты" + +#: mergeresultwindow.cpp:1015 +msgid "<No src line>" +msgstr "<нет исходной строки>" + +#: mergeresultwindow.cpp:1022 +msgid "<Merge Conflict>" +msgstr "<Конфликт объединения>" + +#: mergeresultwindow.cpp:1086 +msgid "[Modified]" +msgstr "[Изменён]" + +#: mergeresultwindow.cpp:1964 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"Не все конфликты разрешены.\n" +"Файл не сохранён.\n" + +#: mergeresultwindow.cpp:1966 +msgid "Conflicts Left" +msgstr "Осталось конфликтов" + +#: mergeresultwindow.cpp:1978 +msgid "" +"\n" +"\n" +"File not saved." +msgstr "" +"\n" +"\n" +"Файл не сохранён." + +#: mergeresultwindow.cpp:1978 mergeresultwindow.cpp:2040 +msgid "File Save Error" +msgstr "Ошибка сохранения файла" + +#: mergeresultwindow.cpp:1994 +msgid "Out of memory while preparing to save." +msgstr "" + +#: mergeresultwindow.cpp:2040 +msgid "Error while writing." +msgstr "Ошибка записи" + +#: optiondialog.cpp:236 +msgid "Editor & Diff Output Font" +msgstr "Шрифт редактора и вывода различий" + +#: optiondialog.cpp:248 +msgid "Italic font for deltas" +msgstr "Различия курсивом" + +#: optiondialog.cpp:251 +msgid "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." +msgstr "Если шрифт не содержит курсива, этот параметр не работает." + +#: optiondialog.cpp:259 +msgid "Color" +msgstr "Цвет" + +#: optiondialog.cpp:259 +msgid "Colors in Editor & Diff Output" +msgstr "Цвета редактора и вывода различий" + +#: optiondialog.cpp:273 +msgid "Foreground color:" +msgstr "Цвет текста:" + +#: optiondialog.cpp:279 +msgid "Background color:" +msgstr "Цвет фона:" + +#: optiondialog.cpp:286 +msgid "Diff background color:" +msgstr "Цвет фона различий:" + +#: optiondialog.cpp:293 +msgid "Color A:" +msgstr "Цвет A:" + +#: optiondialog.cpp:300 +msgid "Color B:" +msgstr "Цвет B:" + +#: optiondialog.cpp:307 +msgid "Color C:" +msgstr "Цвет C:" + +#: optiondialog.cpp:313 +msgid "Conflict color:" +msgstr "Цвет конфликтов:" + +#: optiondialog.cpp:320 +msgid "Current range background color:" +msgstr "" + +#: optiondialog.cpp:327 +msgid "Current range diff background color:" +msgstr "" + +#: optiondialog.cpp:338 +msgid "Editor" +msgstr "Редактор" + +#: optiondialog.cpp:338 +msgid "Editor Behaviour" +msgstr "Режим редактора" + +#: optiondialog.cpp:347 +msgid "Tab inserts spaces" +msgstr "Заменять табуляцию пробелами" + +#: optiondialog.cpp:350 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A Tab-character will be inserted." +msgstr "" + +#: optiondialog.cpp:356 +msgid "Tab size:" +msgstr "Табуляция:" + +#: optiondialog.cpp:361 +msgid "Auto indentation" +msgstr "Проставлять отступы автоматически" + +#: optiondialog.cpp:364 +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "" + +#: optiondialog.cpp:368 +msgid "Auto copy selection" +msgstr "Копировать выделение в буфер обмена автоматически" + +#: optiondialog.cpp:371 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" + +#: optiondialog.cpp:376 +msgid "Use locale encoding" +msgstr "Использовать кодировку локали" + +#: optiondialog.cpp:379 +msgid "Change this if non-ascii-characters aren't displayed correctly." +msgstr "" + +#: optiondialog.cpp:389 +msgid "Diff & Merge" +msgstr "Сравнить и объединить" + +#: optiondialog.cpp:389 +msgid "Diff & Merge Settings" +msgstr "Настройки сравнения и объединения" + +#: optiondialog.cpp:399 +msgid "Preserve carriage return" +msgstr "Отображать символ перевода каретки" + +#: optiondialog.cpp:402 +msgid "" +"Show carriage return characters '\\r' if they exist.\n" +"Helps to compare files that were modified under different operating systems." +msgstr "" + +#: optiondialog.cpp:407 +msgid "Ignore numbers" +msgstr "Пропускать цифры" + +#: optiondialog.cpp:410 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" + +#: optiondialog.cpp:415 +msgid "Ignore C/C++ Comments" +msgstr "Пропускать комментарии C/C++" + +#: optiondialog.cpp:417 +msgid "Treat C/C++ comments like white space." +msgstr "Обрабатывать комментарии C/C++ как пробелы." + +#: optiondialog.cpp:421 +msgid "Convert to upper case" +msgstr "Перевести в верхний регистр" + +#: optiondialog.cpp:424 +msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +msgstr "Воспринимать нижний регистр верхним при чтении ('a'->'A')" + +#: optiondialog.cpp:428 +msgid "Preprocessor command:" +msgstr "Предварительная команда:" + +#: optiondialog.cpp:432 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Предварительная обработка, определяемая пользователем (для подробностей см. документацию)." + +#: optiondialog.cpp:435 +msgid "Line-matching preprocessor command:" +msgstr "Предварительная команда для сравнения строк:" + +#: optiondialog.cpp:439 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" + +#: optiondialog.cpp:442 +msgid "Try hard (slower)" +msgstr "Задействовать все алгоритмы (медленно)" + +#: optiondialog.cpp:445 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" + +#: optiondialog.cpp:450 +msgid "Auto advance delay (ms):" +msgstr "" + +#: optiondialog.cpp:455 +msgid "" +"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 "" + +#: optiondialog.cpp:460 +msgid "White space 2-file merge default:" +msgstr "" + +#: optiondialog.cpp:464 optiondialog.cpp:477 +msgid "Manual choice" +msgstr "Выбор вручную" + +#: optiondialog.cpp:468 optiondialog.cpp:482 +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" + +#: optiondialog.cpp:473 +msgid "White space 3-file merge default:" +msgstr "" + +#: optiondialog.cpp:492 +msgid "Directory Merge" +msgstr "Объединение каталогов" + +#: optiondialog.cpp:500 +msgid "Recursive directories" +msgstr "Рекурсия" + +#: optiondialog.cpp:502 +msgid "Whether to analyze subdirectories or not." +msgstr "" + +#: optiondialog.cpp:504 +msgid "File pattern(s):" +msgstr "Маски файлов:" + +#: optiondialog.cpp:509 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:515 +msgid "File-anti-pattern(s):" +msgstr "Пропускать файлы по маске:" + +#: optiondialog.cpp:520 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:526 +msgid "Dir-anti-pattern(s):" +msgstr "Пропускать каталоги по маске:" + +#: optiondialog.cpp:531 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:537 +msgid "Use .cvsignore" +msgstr "Использовать .cvsignore" + +#: optiondialog.cpp:540 +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\"-files this can be directory specific." +msgstr "" + +#: optiondialog.cpp:545 +msgid "Find hidden files and directories" +msgstr "" + +#: optiondialog.cpp:548 +msgid "Finds files and directories with the hidden attribute." +msgstr "" + +#: optiondialog.cpp:550 +msgid "Finds files and directories starting with '.'." +msgstr "" + +#: optiondialog.cpp:554 +msgid "Follow file links" +msgstr "Следовать по ссылкам на файлы" + +#: optiondialog.cpp:557 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" + +#: optiondialog.cpp:562 +msgid "Follow directory links" +msgstr "Следовать по ссылкам на каталоги" + +#: optiondialog.cpp:565 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" + +#: optiondialog.cpp:570 +msgid "List only deltas" +msgstr "Только различия" + +#: optiondialog.cpp:573 +msgid "Files and directories without change will not appear in the list." +msgstr "" + +#: optiondialog.cpp:576 +msgid "Trust the modification date (unsafe)" +msgstr "Сравнивать по дате изменения (неточно)" + +#: optiondialog.cpp:578 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:582 +msgid "Trust the size (unsafe)" +msgstr "Сравнивать по размеру (неточно)" + +#: optiondialog.cpp:584 +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 "" + +#: optiondialog.cpp:589 +msgid "Synchronize directories" +msgstr "Синхронизировать каталоги" + +#: optiondialog.cpp:592 +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 "" + +#: optiondialog.cpp:597 +msgid "Copy newer instead of merging (unsafe)" +msgstr "Принимать сразу новые файлы вместо объединения (небезопасно)" + +#: optiondialog.cpp:600 +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." +msgstr "" + +#: optiondialog.cpp:605 +msgid "Backup files (.orig)" +msgstr "Сохранить резервные копии (.orig)" + +#: optiondialog.cpp:608 +msgid "" +"When 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 "" + +#: optiondialog.cpp:636 +msgid "" +"You selected a variable width font.\n" +"\n" +"Because this program doesn't handle variable width fonts\n" +"correctly, you might experience problems while editing.\n" +"\n" +"Do you want to continue or do you want to select another font." +msgstr "" + +#: optiondialog.cpp:640 +msgid "Incompatible Font" +msgstr "Несовместимый шрифт" + +#: optiondialog.cpp:641 +msgid "Continue at Own Risk" +msgstr "Продолжить" + +#: optiondialog.cpp:641 +msgid "Select Another Font" +msgstr "Выбрать другой шрифт" + +#: optiondialog.cpp:669 +msgid "This resets all options. Not only those of the current topic." +msgstr "Это сбросит абсолютно все параметры, а не только текущей вкладки." + +#: pdiff.cpp:377 +msgid "" +"Running the external diff failed.\n" +"Check if the diff works, if the program can write in the temp folder or if " +"the disk is full.\n" +"The external diff option will be disabled now and the internal diff will be " +"used." +msgstr "" + +#: pdiff.cpp:443 +msgid "Loading A" +msgstr "Загрузка A" + +#: pdiff.cpp:448 +msgid "Loading B" +msgstr "Загрузка B" + +#: pdiff.cpp:459 pdiff.cpp:487 pdiff.cpp:499 +msgid "Diff: A <-> B" +msgstr "Различие: A <-> B" + +#: pdiff.cpp:467 pdiff.cpp:520 +msgid "Linediff: A <-> B" +msgstr "Построчное сравнение: A <-> B" + +#: pdiff.cpp:476 +msgid "Loading C" +msgstr "Загрузка C" + +#: pdiff.cpp:490 pdiff.cpp:502 +msgid "Diff: B <-> C" +msgstr "Различие: B <-> C" + +#: pdiff.cpp:493 pdiff.cpp:505 +msgid "Diff: A <-> C" +msgstr "Различие: A <-> C" + +#: pdiff.cpp:523 +msgid "Linediff: B <-> C" +msgstr "Построчное сравнение: B <-> C" + +#: pdiff.cpp:526 +msgid "Linediff: A <-> C" +msgstr "Построчное сравнение: A <-> C" + +#: pdiff.cpp:610 +msgid "" +"Some inputfiles don't seem to be pure textfiles.\n" +"Note that the KDiff3-merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" + +#: pdiff.cpp:1030 +msgid "A (Base):" +msgstr "A (исходное):" + +#: pdiff.cpp:1036 pdiff.cpp:1051 pdiff.cpp:1066 pdiff.cpp:1084 +msgid "File..." +msgstr "Файл..." + +#: pdiff.cpp:1038 pdiff.cpp:1053 pdiff.cpp:1068 pdiff.cpp:1086 +msgid "Dir..." +msgstr "Каталог..." + +#: pdiff.cpp:1061 +msgid "C (Optional):" +msgstr "С (необязательно):" + +#: pdiff.cpp:1079 +msgid "Output (optional):" +msgstr "Вывод (необязательно):" + +#: pdiff.cpp:1108 +msgid "Configure..." +msgstr "Настроить..." + +#: pdiff.cpp:1201 +msgid "Abort" +msgstr "Стоп" + +#: pdiff.cpp:1207 pdiff.cpp:1286 +msgid "Opening files..." +msgstr "Открытие файлов..." + +#: pdiff.cpp:1269 pdiff.cpp:1330 +msgid "File open error" +msgstr "Ошибка открытия файла" + +#: pdiff.cpp:1345 +msgid "Cutting selection..." +msgstr "Вырезание в буфер обмена..." + +#: pdiff.cpp:1366 +msgid "Copying selection to clipboard..." +msgstr "Копирование в буфер обмена..." + +#: pdiff.cpp:1382 +msgid "Inserting clipboard contents..." +msgstr "Вставка из буфера обмена..." + +#: pdiff.cpp:1703 +msgid "Save && Continue" +msgstr "Сохранить и продолжить" + +#: pdiff.cpp:1703 +msgid "Continue Without Saving" +msgstr "Продолжить без сохранения" + +#: pdiff.cpp:1908 +msgid "Search complete." +msgstr "Поиск завершён." + +#: pdiff.cpp:1908 +msgid "Search Complete" +msgstr "Поиск завершён" + +#: rc.cpp:1 +msgid "&KDiff3" +msgstr "&KDiff3" + +#: rc.cpp:2 +msgid "Configure KDiff3" +msgstr "Настроить KDiff3" + +#: rc.cpp:5 +msgid "&Directory" +msgstr "&Каталог" + +#: rc.cpp:6 +msgid "Current Item Merge Operation" +msgstr "" + +#: rc.cpp:7 +msgid "Current Item Sync Operation" +msgstr "" + +#: rc.cpp:8 +msgid "&Movement" +msgstr "&Перемещение" + +#: rc.cpp:9 +msgid "&Merge" +msgstr "&Объединение" + +#: rc.cpp:10 +msgid "&Window" +msgstr "&Окно" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/po/ta.po Sun Mar 07 10:05:41 2004 +0000 @@ -0,0 +1,2194 @@ +# translation of kdiff3.po to Tamil +# Copyright (C) 2004 Free Software Foundation, Inc. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"POT-Creation-Date: 2004-01-09 01:37+0100\n" +"PO-Revision-Date: 2004-01-05 16:59+0530\n" +"Last-Translator: \n" +"Language-Team: Tamil <en@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "உங்கள் பெயர்" + +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "" +"மொழிப்பெயர்ப்பாளரின் " +"மின்அஞ்சல்/உங்களது " +"மின்அஞ்சள். " + +#: diff.cpp:472 +msgid "From Clipboard" +msgstr "கிளிப் போர்டிளிருந்து." + +#: diff.cpp:1096 diff.cpp:1110 +msgid "" +"Data loss error:\n" +"If it is reproducable please contact the author.\n" +msgstr "" +"தகவல் தவறானது.\n" +" மீண்டும் உற்பத்தியானால் " +"ஆசிரியரை அனுகவும்.\n" + +#: diff.cpp:1098 diff.cpp:1112 +msgid "Severe Internal Error" +msgstr "கடுமையான உள்சார்ந்த தவறு." + +#: difftextwindow.cpp:790 +#, c-format +msgid "Topline %1" +msgstr "" + +#: difftextwindow.cpp:792 +msgid "End" +msgstr "" + +#: directorymergewindow.cpp:113 +msgid "Mix of links and normal files." +msgstr "" +"இனைப்புகள் மற்றும் " +"கோப்புகள் கலந்துயுள்ளன." + +#: directorymergewindow.cpp:120 +msgid "Link: " +msgstr "இணைப்பு." + +#: directorymergewindow.cpp:128 +msgid "Size. " +msgstr "அளவு." + +#: directorymergewindow.cpp:141 +msgid "Date & Size: " +msgstr "தேதி மற்றும் அளவு." + +#: directorymergewindow.cpp:150 directorymergewindow.cpp:156 +msgid "Creating temp copy of %1 failed." +msgstr "" +"வார்ப்புரு படயெடு " +"உருவாக்குவது %1 இயலவில்லை." + +#: directorymergewindow.cpp:167 directorymergewindow.cpp:175 +msgid "Opening %1 failed." +msgstr "திரப்பதற்க்கு %1 இயலவில்லை." + +#: directorymergewindow.cpp:191 directorymergewindow.cpp:197 +#, fuzzy, c-format +msgid "Error reading from %1" +msgstr "" +"படிக்கும் போழது ஒரு சதவிதம் " +"பினழ" + +#: directorymergewindow.cpp:243 +msgid "Name" +msgstr "பெயர்." + +#: directorymergewindow.cpp:247 +msgid "Operation" +msgstr "இயக்கம்." + +#: directorymergewindow.cpp:248 +msgid "Status" +msgstr "நிலை." + +#: directorymergewindow.cpp:271 +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" +"நீங்கள் தற்பொழுது ஒன்றாக " +"சேர்க்கப்பட்ட அடைவை " +"பயன்படுத்திக் " +"கொண்டிருக்கிறீர்கள்.நீங்கள" +"் நிச்சயமாக ஒன்று சேர்ப்பதை " +"நிறுத்திவிட்டு அடைவை " +"மறுவருட விரும்புகிறீர்களா?" + +#: directorymergewindow.cpp:272 directorymergewindow.cpp:2269 +msgid "Rescan" +msgstr "மருவருடு" + +#: directorymergewindow.cpp:272 kdiff3.cpp:504 pdiff.cpp:1201 +msgid "Continue Merging" +msgstr "தொடர்ந்து ஒன்றாக சேர்." + +#: directorymergewindow.cpp:381 +msgid "Opening of directories failed:" +msgstr "அடைவு திறக்க இயலவில்லை:" + +#: directorymergewindow.cpp:384 +msgid "" +"Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "" +"அடைவு எ \"%1\" இல்லை அல்லது அது " +"ஒரு அடைவு இல்லை.\n" + +#: directorymergewindow.cpp:387 +msgid "" +"Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "" +"அடைவு B \"%1\" உபயோகத்தில் இல்லை " +"(அ) அது ஒரு அடைவே அல்ல.\n" + +#: directorymergewindow.cpp:390 +msgid "" +"Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "" +"அடைவு C \"%1\" உபயோகத்தில் இல்லை " +"(அ) அது ஒரு அடைவே அல்ல.\n" + +#: directorymergewindow.cpp:392 +msgid "Directory Open Error" +msgstr "திறந்த தகவல் தளம் தவறு." + +#: directorymergewindow.cpp:400 +msgid "" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" +"Check again before continuing." +msgstr "" +"மூன்று அடைவுகள் ஒன்று " +"சேரும்பொழுது, சேரும் அடைவு A " +"(அ) B போன்று இருக்கக் கூடாது.\n" +" தொடர்வதற்குமுன் மீண்டும் " +"சரிபார்க்கவும்." + +#: directorymergewindow.cpp:402 +msgid "Parameter Warning" +msgstr "அளவுருக்கள் எச்சிரிகை." + +#: directorymergewindow.cpp:429 +msgid "Reading Directory A" +msgstr "தகவல் தளம் 'அ'வை படிக்கவும்." + +#: directorymergewindow.cpp:451 +msgid "Reading Directory B" +msgstr "தகவல் தளம் 'ப'ஐ படிக்கவும்." + +#: directorymergewindow.cpp:473 +msgid "Reading Directory C" +msgstr "தகவல் தளம் 'சி'ஐ படிக்கவும்." + +#: directorymergewindow.cpp:499 +msgid "Some subdirectories were not readable in" +msgstr "" +"சில துணைஅடைவுகளை படிக்க " +"இயலவில்லை" + +#: directorymergewindow.cpp:504 +msgid "Check the permissions of the subdirectories." +msgstr "" +"துணை அடைவுகளின் அனுமதிகளை " +"சரிபார்க்கவும்." + +#: directorymergewindow.cpp:551 +msgid "Directory Comparison Status" +msgstr "அடைவு ஒப்பிடும் நிலை" + +#: directorymergewindow.cpp:552 +msgid "Number of subdirectories:" +msgstr "உப அடைவுகளின் எண்ணிக்கை:" + +#: directorymergewindow.cpp:553 +msgid "Number of equal files:" +msgstr "சம கோப்புகளின் எண்ணிக்கை:" + +#: directorymergewindow.cpp:554 +msgid "Number of different files:" +msgstr "" +"வெரு விதமான கோப்புகளின் " +"எண்ணிக்கை:" + +#: directorymergewindow.cpp:557 +msgid "Number of manual merges:" +msgstr "" +"கைமுறை ஒன்று சேர்க்கையின் " +"எண்ணிக்கை:" + +#: directorymergewindow.cpp:693 +msgid "This affects all merge operations." +msgstr "" +"இது அனைத்து ஒன்றுசேர் " +"இயக்கங்களை பாதிக்கிறது." + +#: directorymergewindow.cpp:694 +msgid "Changing All Merge Operations" +msgstr "" +"அனைத்து ஒன்றுசேர் " +"இயக்கங்களை " +"மாற்றிக்கொண்டிருக்கிறது" + +#: directorymergewindow.cpp:694 mergeresultwindow.cpp:252 +msgid "C&ontinue" +msgstr "தொடர்தல்" + +#: directorymergewindow.cpp:961 +msgid "Processing " +msgstr "செயலாக்குதல்" + +#: directorymergewindow.cpp:1309 directorymergewindow.cpp:1316 +msgid "To do." +msgstr "அதை செய்." + +#: directorymergewindow.cpp:1343 directorymergewindow.cpp:2284 +msgid "Copy A to B" +msgstr "படியெடு 'அ'&'பி'." + +#: directorymergewindow.cpp:1344 directorymergewindow.cpp:2285 +msgid "Copy B to A" +msgstr "படியெடு 'பி'&'அ'." + +#: directorymergewindow.cpp:1345 directorymergewindow.cpp:2286 +msgid "Delete A" +msgstr "நீக்கு அ." + +#: directorymergewindow.cpp:1346 directorymergewindow.cpp:2287 +msgid "Delete B" +msgstr "நீக்கு அ." + +#: directorymergewindow.cpp:1347 +msgid "Delete A & B" +msgstr "நீக்கு 'அ'&'பி'." + +#: directorymergewindow.cpp:1348 directorymergewindow.cpp:2289 +msgid "Merge to A" +msgstr " 'அ' வை ஒன்றாகச் சேர்." + +#: directorymergewindow.cpp:1349 directorymergewindow.cpp:2290 +msgid "Merge to B" +msgstr " 'பி' ஐ ஒன்றாகச் சேர்." + +#: directorymergewindow.cpp:1350 +msgid "Merge to A & B" +msgstr "'அ'&'பி'ஐ ஒன்றாகச் சேர்." + +#: directorymergewindow.cpp:1354 +msgid "Delete (if exists)" +msgstr "நீக்கு." + +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +#: directorymergewindow.cpp:2280 pdiff.cpp:1076 +msgid "Merge" +msgstr "ஒன்றாகச் சேர்." + +#: directorymergewindow.cpp:1355 directorymergewindow.cpp:1356 +msgid "Merge (manual)" +msgstr "ஒன்றாகச் சேர்." + +#: directorymergewindow.cpp:1357 +msgid "Error: Conflicting File Types" +msgstr "பிழை: குழப்ப கோப்பு வகைகள்" + +#: directorymergewindow.cpp:1358 +msgid "Error: Dates are equal but files are not." +msgstr "" +"பிழை: தேதிகள் சமம் ஆனால் " +"கோப்புகள் இல்லை." + +#: directorymergewindow.cpp:1382 +msgid "This operation is currently not possible." +msgstr "" +"இந்த இயக்கம் தற்போது " +"சாதியமில்லை." + +#: directorymergewindow.cpp:1382 directorymergewindow.cpp:1642 +msgid "Operation Not Possible" +msgstr "இயக்கம் சாதியமில்லை" + +#: directorymergewindow.cpp:1425 +msgid "" +"This should never happen: \n" +"\n" +"mergeResultSaved: m_pMFI=0\n" +"\n" +"If you know how to reproduce this, please contact the program author." +msgstr "" +"இது எப்போழுதும் " +"நிகழக்கூடாது: \n" +"\n" +"ஒன்றுசேர் விளைவு " +"சேகரிக்கப்பட்டது: m_pMFI=0\n" +"\n" +"இதை மறு ஆக்கம் செய்யத் " +"தெரிந்தால், நிரல் எழுதியவரை " +"அணுகவும்." + +#: directorymergewindow.cpp:1425 +msgid "Program Error" +msgstr "நிரல் பிழை" + +#: directorymergewindow.cpp:1436 +msgid "" +"An error occurred while copying.\n" +msgstr "" +"நகலெடுக்கும்போது பிழை " +"ஏற்பட்டுள்ளது.\n" + +#: directorymergewindow.cpp:1437 directorymergewindow.cpp:1843 +msgid "Merge Error" +msgstr "ஒன்றுசேர் பிழை" + +#: directorymergewindow.cpp:1442 directorymergewindow.cpp:1848 +msgid "Error." +msgstr "பிழை." + +#: directorymergewindow.cpp:1447 directorymergewindow.cpp:1739 +#: directorymergewindow.cpp:1779 +msgid "Done." +msgstr "முடிந்த." + +#: directorymergewindow.cpp:1470 +msgid "Not saved." +msgstr "கோப்பு" + +#: directorymergewindow.cpp:1505 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "" +"தெரியாத ஒன்றுசேர் இயக்கம்.( " +"இது ஒருபோதும் நிகழக்கூடாது)" + +#: directorymergewindow.cpp:1537 +msgid "Unknown merge operation." +msgstr "தெரியாத ஒன்றுசேர் இயக்கம்." + +#: directorymergewindow.cpp:1552 +msgid "" +"The merge is about to begin.\n" +"\n" +"Choose \"Do it\" if you have read the instructions and know what you are " +"doing.\n" +"Choosing \"Simulate it\" will tell you what would happen.\n" +"\n" +"Be aware that this program still has beta status and there is NO WARRANTY " +"whatsoever! Make backups of your vital data!" +msgstr "" +"ஒன்றுசேர்ப்பு தொடங்கப்பட " +"உள்ளது.\n" +"\n" +"நீங்கள் நெறிமுறைகளைப் " +"படித்து என்ன செய்கிறீர்கள் " +"என்பதை அறிந்தால், \"இதை " +"செய்க\" என்பதை " +"தேர்ந்தெடுக்க.\n" +"\"இதை போன்று நட\" என்பதை " +"தேர்வு செய்தால் " +"நிகழவிருப்பதை கூரும்.\n" +"\n" +"இந்த நிரல் இன்னும் பீடா " +"நிலையில்தான் உள்ளது என்பதை " +"கவனத்தில் கொள்க; மேலும் " +"இதற்கு எந்தவித " +"உத்திரவாதமும் கிடையாது! " +"தங்களது இன்றியமையாத " +"தகவல்களுக்கு பின்னணி " +"அமைக்க! " + +#: directorymergewindow.cpp:1557 +msgid "Starting Merge" +msgstr "ஒன்றுசேர்ப்பைத் துவக்குதல்" + +#: directorymergewindow.cpp:1557 +msgid "Do It" +msgstr "இதை செய்க" + +#: directorymergewindow.cpp:1557 +msgid "Simulate It" +msgstr "இதை போன்று நட" + +#: directorymergewindow.cpp:1583 +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" +"பலவிதமான அடைவுகளில் " +"பலவகையாக தனிப்படுத்தப்பட்ட " +"விவரம் உள்ளது.எதை " +"செய்வதென்பதை தேர்ந்தெடுக்க." + +#: directorymergewindow.cpp:1592 +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"கோப்புகளின் திருத்திய " +"தேதிகள் ஒன்றாக உள்ளது, ஆனால் " +"கோப்புகள் இல்லை.எதை " +"செய்வதென்பதை " +"தேர்ந்தெடுக்க. " + +#: directorymergewindow.cpp:1642 +#, fuzzy +msgid "This operation is currently not possible because dir merge currently runs." +msgstr "" +"இந்த இயக்கம் தற்போது " +"சாதியமில்லை, ஏனெனில் diff " +"ஒன்றுசேர் தற்போது " +"இயங்கிக்கொண்டிருக்கின்றது." + +#: directorymergewindow.cpp:1701 +msgid "" +"There was an error in the last step.\n" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" +msgstr "" +"கடைசி அடியில் பிழை " +"இருந்தது.\n" +"இந்த பிழையை ஏற்படுத்திய " +"விவரத்துடன் தொடர " +"விரும்புகிறீர்களா அல்லது " +"அதை தவிர்க்க " +"விரும்புகிறீர்களா?" + +#: directorymergewindow.cpp:1703 +msgid "Continue merge after an error" +msgstr "" +"பிழைக்குப் பிறகு " +"ஒன்றுசேர்த்தலை தொடர்க" + +#: directorymergewindow.cpp:1703 +msgid "Continue With Last Item" +msgstr "கடைசி விவரத்துடன் தொடர்க" + +#: directorymergewindow.cpp:1703 +msgid "Skip Item" +msgstr "விவரத்தை தவிர்க்க" + +#: directorymergewindow.cpp:1739 +msgid "Skipped." +msgstr "தவிர்த்தது." + +#: directorymergewindow.cpp:1746 directorymergewindow.cpp:1972 +msgid "In progress..." +msgstr "செயல்பாட்டில் உள்ளது..." + +#: directorymergewindow.cpp:1794 +msgid "Merge operation complete." +msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" + +#: directorymergewindow.cpp:1794 directorymergewindow.cpp:1797 +msgid "Merge Complete" +msgstr "ஒன்றுசேர்ப்பு முடிந்தது" + +#: directorymergewindow.cpp:1806 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" +"போலியான ஒன்றுசேர்ப்பு " +"முடிந்தது: முன்மொழிந்த " +"இயக்கங்களுடன் நீங்கள் " +"ஒத்துப்போகிறீர்களா என்பதை " +"சரிபார்க்கவும்." + +#: directorymergewindow.cpp:1842 +msgid "" +"An error occurred. Press OK to see detailed information.\n" +msgstr "" +"பிழை ஏற்பட்டுள்ளது. விரிவான " +"விவரங்களுக்கு சரி என்பதை " +"அழுத்துக.\n" + +#: directorymergewindow.cpp:1885 +msgid "Error: While deleting %1: Creating backup failed." +msgstr "" +"பிழை: %1 நீக்கும்போது: பின்னணி " +"உருவாக்கம் தோல்வியடைந்தது." + +#: directorymergewindow.cpp:1892 +#, fuzzy +msgid "delete directory recursively( %1 )" +msgstr "மீண்டும் அடைவை நீக்கு(%)" + +#: directorymergewindow.cpp:1894 +msgid "delete( %1 )" +msgstr "நீக்கு( %1 )" + +#: directorymergewindow.cpp:1909 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" +"பிழை: அடைவை படிக்கும்போது " +"நீக்க இயலவில்லை." + +#: directorymergewindow.cpp:1928 +msgid "Error: rmdir( %1 ) operation failed." +msgstr " rmdir( %1 } பிழை: இயக்க இயலவில்லை" + +#: directorymergewindow.cpp:1938 +msgid "Error: delete operation failed." +msgstr "" +"பிழை: நீக்கும் இயக்கம் " +"தோல்வியடைந்தது." + +#: directorymergewindow.cpp:1964 +#, fuzzy +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "கைம்முறை இணைப்பு( %1, %2,%3 -> %4)" + +#: directorymergewindow.cpp:1967 +#, fuzzy +msgid " Note: After a manual merge the user should continue via F7." +msgstr "" +"குறிப்பு: கையிருப்பு " +"இணைப்புக்குப் பிறகு " +"பயன்படுத்துபவர் F5 வழியாக " +"தொடரவேண்டும்." + +#: directorymergewindow.cpp:1990 +#, fuzzy +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"ிழை:படிவம் " +"தோல்வியுற்றது.தற்போதைய " +"சேருமிட அழிப்பு தோல்வி " +"அடைந்தது" + +#: directorymergewindow.cpp:2000 +msgid "copyLink( %1 -> %2 )" +msgstr "நகல் இணை( %1 -> %2 )" + +#: directorymergewindow.cpp:2011 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" +"பிழை:தொடர்புப் படியெடு " +"தோல்வியடைந்தது:தூரத் " +"தொடர்பு இன்னும் " +"ஆதரிக்கப்படவில்லை" + +#: directorymergewindow.cpp:2017 +msgid "Error: copyLink failed." +msgstr "" +"பிழை: நகல் இணை " +"தோல்வியடைந்தது." + +#: directorymergewindow.cpp:2037 +msgid "copy( %1 -> %2 )" +msgstr "நகல்( %1 -> %2 )" + +#: directorymergewindow.cpp:2063 +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" +"மறுபெயரிடும்போது பிழை( %1 -> %2 ): " +"தற்போதுள்ள சேருமிடத்தை " +"நீக்க இயலாது." + +#: directorymergewindow.cpp:2069 +msgid "rename( %1 -> %2 )" +msgstr "மறுபெயர்( %1 -> %2 )" + +#: directorymergewindow.cpp:2078 +msgid "Error: Rename failed." +msgstr "" +"பிழை: மறுபெயர் தோல்வி " +"அடைந்தது." + +#: directorymergewindow.cpp:2096 +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" +"%1அடைவை உருவாக்கும் போது " +"பிழை: தற்போதைய கோப்பை நீக்க " +"இயலாது." + +#: directorymergewindow.cpp:2112 +msgid "makeDir( %1 )" +msgstr "( %1 )அடைவை உருவாக்கு" + +#: directorymergewindow.cpp:2122 +msgid "Error while creating directory." +msgstr "அடைவை உருவாக்கும் போது பிழை" + +#: directorymergewindow.cpp:2145 directorymergewindow.cpp:2253 +msgid "Dest" +msgstr "சேருமிடம்" + +#: directorymergewindow.cpp:2149 directorymergewindow.cpp:2178 +msgid "Dir" +msgstr "அடைவு" + +#: directorymergewindow.cpp:2150 +msgid "Type" +msgstr "விதம்" + +#: directorymergewindow.cpp:2151 +msgid "Size" +msgstr "அளவு" + +#: directorymergewindow.cpp:2152 +msgid "Attr" +msgstr "தன்மை" + +#: directorymergewindow.cpp:2153 +msgid "Last Modification" +msgstr "கடைசி திருத்தம்" + +#: directorymergewindow.cpp:2154 +msgid "Link-Destination" +msgstr "இணை-சேருமிடம்" + +#: directorymergewindow.cpp:2195 +msgid "not available" +msgstr "கிடைக்கவில்லை" + +#: directorymergewindow.cpp:2215 +msgid "A (Dest): " +msgstr "A (சேருமிடம்): " + +#: directorymergewindow.cpp:2218 +msgid "A (Base): " +msgstr "A (அடித்தளம்):" + +#: directorymergewindow.cpp:2224 +msgid "B (Dest): " +msgstr "B (சேருமிடம்): " + +#: directorymergewindow.cpp:2232 +msgid "C (Dest): " +msgstr "C (சேருமிடம்):" + +#: directorymergewindow.cpp:2238 +msgid "Dest: " +msgstr "சேருமிடம்: " + +#: directorymergewindow.cpp:2263 +msgid "Start/Continue Directory Merge" +msgstr "அடைவை சேர்க்கத் துவங்கு" + +#: directorymergewindow.cpp:2264 +#, fuzzy +msgid "Run Operation for Current Item" +msgstr "" +"எல்லா விவரங்களுக்கும் " +"இயக்கமில்லை" + +#: directorymergewindow.cpp:2265 +msgid "Compare Selected File" +msgstr "" +"தேர்ந்தெடுத்த கோப்பை " +"ஒப்பிடு" + +#: directorymergewindow.cpp:2266 +msgid "Merge Current File" +msgstr "தற்போதைய கோப்பை ஒன்றுசேர்" + +#: directorymergewindow.cpp:2267 +msgid "Fold All Subdirs" +msgstr "அனைத்து உபஅடைவுகளையும் மடி" + +#: directorymergewindow.cpp:2268 +msgid "Unfold All Subdirs" +msgstr "அனைத்து உபஅடைவுகளையும் பிரி" + +#: directorymergewindow.cpp:2270 +msgid "Choose A for All Items" +msgstr "" +"எல்லா விவரங்களுக்கும் Aவைத் " +"தேர்ந்தெடு" + +#: directorymergewindow.cpp:2271 +msgid "Choose B for All Items" +msgstr "" +"எல்லா விவரங்களுக்கும் Bவைத் " +"தேர்ந்தெடு" + +#: directorymergewindow.cpp:2272 +msgid "Choose C for All Items" +msgstr "" +"எல்லா விவரங்களுக்கும் Cவைத் " +"தேர்ந்தெடு" + +#: directorymergewindow.cpp:2273 +msgid "Auto-Choose Operation for All Items" +msgstr "" +"எல்லா விவரங்களுக்கும் " +"தானியக்கத்தேர்வு" + +#: directorymergewindow.cpp:2274 +msgid "No Operation for All Items" +msgstr "" +"எல்லா விவரங்களுக்கும் " +"இயக்கமில்லை" + +#: directorymergewindow.cpp:2276 directorymergewindow.cpp:2283 +msgid "Do Nothing" +msgstr "ஒன்றும் செய்யாதே" + +#: directorymergewindow.cpp:2277 +msgid "A" +msgstr "" + +#: directorymergewindow.cpp:2278 +msgid "B" +msgstr "" + +#: directorymergewindow.cpp:2279 +msgid "C" +msgstr "" + +#: directorymergewindow.cpp:2281 +#, fuzzy +msgid "Delete (If Exists)" +msgstr "நீக்கு." + +#: directorymergewindow.cpp:2288 +#, fuzzy +msgid "Delete A and B" +msgstr "நீக்கு 'அ'&'பி'." + +#: directorymergewindow.cpp:2291 +#, fuzzy +msgid "Merge to A and B" +msgstr "'அ'&'பி'ஐ ஒன்றாகச் சேர்." + +#: fileaccess.cpp:535 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"ஒரு பின்கோப்பை உருவாக்க " +"முயற்சிக்கும்போது,பழைய " +"பின்கோப்பை நீக்க " +"முடியவில்லை.\n" +" கோப்புப் பெயர்கள்:" + +#: fileaccess.cpp:542 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"ஒரு பின்கோப்பை உருவாக்க " +"முயற்சிக்கும்போது,பெயர் " +"மாற்றம் செய்யப்படவில்லை.\n" +" கோப்புப் பெயர்கள்:" + +#: fileaccess.cpp:564 +#, c-format +msgid "Getting file status: %1" +msgstr "" + +#: fileaccess.cpp:606 +#, fuzzy, c-format +msgid "Reading file: %1" +msgstr "அடைவை படித்தல்:" + +#: fileaccess.cpp:642 +#, c-format +msgid "Writing file: %1" +msgstr "" + +#: fileaccess.cpp:670 +msgid "Out of memory" +msgstr "நினைவில் இல்லை" + +#: fileaccess.cpp:705 +#, fuzzy, c-format +msgid "Making directory: %1" +msgstr "அடைவை வருடல்:%1" + +#: fileaccess.cpp:725 +#, fuzzy, c-format +msgid "Removing directory: %1" +msgstr "அடைவை படித்தல்:" + +#: fileaccess.cpp:740 +#, c-format +msgid "Removing file: %1" +msgstr "" + +#: fileaccess.cpp:756 +msgid "Creating symbolic link: %1 -> %2" +msgstr "" + +#: fileaccess.cpp:782 +#, fuzzy +msgid "Renaming file: %1 -> %2" +msgstr "மறுபெயர்( %1 -> %2 )" + +#: fileaccess.cpp:817 +#, fuzzy +msgid "Copying file: %1 -> %2" +msgstr "நகல் இணை( %1 -> %2 )" + +#: fileaccess.cpp:831 +#, c-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "" +"கோப்புப் படிவின்போது பிழை " +"ஏற்பட்டுள்ளது.படிப்பதற்க்க" +"ான கோப்புத் " +"திறக்கப்படவில்லை.கோப்பின் " +"பெயர்:%1" + +#: fileaccess.cpp:837 +#, c-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "" +"கோப்புப் படிவின்போது பிழை " +"ஏற்பட்டுள்ளது.எழுதுவதற்க்க" +"ான கோப்புத் " +"திறக்கப்படவில்லை.கோப்பின் " +"பெயர்:%1" + +#: fileaccess.cpp:852 +#, c-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" +"கோப்புப் படிவின்போது பிழை " +"ஏற்பட்டுள்ளதுகோப்பை படிக்க " +"இயலவில்லை.கோப்பின் பெயர்:%1" + +#: fileaccess.cpp:861 +#, c-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "" +"கோப்புப் படிவின்போது பிழை " +"ஏற்பட்டுள்ளதுகோப்பில் எழுத " +"இயலவில்லை.கோப்பின் பெயர்:%1" + +#: fileaccess.cpp:1162 +msgid "Reading directory: " +msgstr "அடைவை படித்தல்:" + +#: fileaccess.cpp:1218 +#, fuzzy, c-format +msgid "Listing directory: %1" +msgstr "அடைவை வருடல்:%1" + +#: kdiff3.cpp:125 +msgid "Option --auto used, but no output file specified." +msgstr "" +"தேர்வு தானே " +"உபயோகிக்கப்பட்டுள்ளது " +"ஆனால் வெளியீட்டுக் கோப்பு " +"குறிப்பிடபடவில்லை" + +#: kdiff3.cpp:223 +msgid "Option --auto ignored for directory comparison." +msgstr "" +"அடைவு ஒப்பீிட்டுக்காக " +"தேர்வு தானே " +"மறுக்கப்பட்டுள்ளது" + +#: kdiff3.cpp:263 +msgid "Saving failed." +msgstr "சேகரிப்பு தோல்வியடைந்தது." + +#: kdiff3.cpp:287 pdiff.cpp:1260 pdiff.cpp:1321 +msgid "Opening of these files failed:" +msgstr "" +"இந்த கோப்புகளின் திறப்பு " +"தோல்வியடைந்தது:" + +#: kdiff3.cpp:296 +msgid "File Open Error" +msgstr "கோப்பு திறப்பில் பிழை" + +#: kdiff3.cpp:315 +msgid "Opens documents for comparison..." +msgstr "" +"ஒப்பிடுதலுக்கு ஆவணங்களைத் " +"திறக்க..." + +#: kdiff3.cpp:317 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "" +"ஒன்றுசேர் முடிவை சேகரி. " +"அனைத்து குழப்பங்களும் தீர " +"வேண்டும்." + +#: kdiff3.cpp:319 +msgid "Saves the current document as..." +msgstr "தற்போதைய ஆவணத்தை ....வாக சேமி " + +#: kdiff3.cpp:321 +msgid "Quits the application" +msgstr "பயன்பாட்டை முறிக்க" + +#: kdiff3.cpp:323 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "" +"தேர்வு செய்த பகுதியை " +"எடுத்து கிளிப் போர்டில் " +"செலுத்துகிறது" + +#: kdiff3.cpp:325 +msgid "Copies the selected section to the clipboard" +msgstr "" +"தேர்வு செய்த பகுதியை கிளிப் " +"போர்டை படிவு செய்கிறது." + +#: kdiff3.cpp:327 +msgid "Pastes the clipboard contents to actual position" +msgstr "" +"கிளிப் போர்டின் " +"உள்ளடக்கங்களைஉரிய இடத்தில் " +"சேர்க்கிறது" + +#: kdiff3.cpp:329 +msgid "Search for a string" +msgstr "தொடர்ச்சிகளை தேடு" + +#: kdiff3.cpp:331 +msgid "Search again for the string" +msgstr "சரத்தை மீண்டும் தேடு" + +#: kdiff3.cpp:333 +msgid "Enables/disables the toolbar" +msgstr "" +"கருவிப்பட்டியை " +"செயல்படுத்து/நீக்கு" + +#: kdiff3.cpp:335 +msgid "Enables/disables the statusbar" +msgstr "" +"நிலைப்பட்டியை " +"செயல்படுத்து/நீக்கு " + +#: kdiff3.cpp:339 +msgid "Configure KDiff3..." +msgstr "KDiff3யை அமை" + +#: kdiff3.cpp:359 +msgid "Go to Current Delta" +msgstr "" +"தற்போதைய டெல்டாவிற்குச் " +"செல்க" + +#: kdiff3.cpp:360 +msgid "Go to First Delta" +msgstr "முதல் டெல்டாவிற்குச் செல்க" + +#: kdiff3.cpp:361 +msgid "Go to Last Delta" +msgstr "கடைசி டெல்டாவிற்குச் செல்க" + +#: kdiff3.cpp:362 +msgid "Go to Previous Delta" +msgstr "" +"முந்தைய டெல்டாவிற்குச் " +"செல்க" + +#: kdiff3.cpp:363 +msgid "Go to Next Delta" +msgstr "அடுத்த டெல்டாவிற்குச் செல்க" + +#: kdiff3.cpp:364 +msgid "Go to Previous Conflict" +msgstr "" +"முந்தைய குழப்பத்திற்குச் " +"செல்க" + +#: kdiff3.cpp:365 +msgid "Go to Next Conflict" +msgstr "" +"அடுத்த குழப்பத்திற்குச் " +"செல்க" + +#: kdiff3.cpp:366 +msgid "Go to Previous Unsolved Conflict" +msgstr "" +"முந்தைய தீர்க்காத " +"குழப்பத்திற்குச் செல்க" + +#: kdiff3.cpp:367 +msgid "Go to Next Unsolved Conflict" +msgstr "" +"அடுத்த தீர்க்காத " +"குழப்பத்திற்குச் செல்க" + +#: kdiff3.cpp:368 +msgid "Select Line(s) From A" +msgstr "" +"Aவிலிருந்து வரி(களை) " +"தேர்ந்தெடு" + +#: kdiff3.cpp:369 +msgid "Select Line(s) From B" +msgstr "" +"Bவிலிருந்து வரி(களை) " +"தேர்ந்தெடு" + +#: kdiff3.cpp:370 +msgid "Select Line(s) From C" +msgstr "" +"Cவிலிருந்து வரி(களை) " +"தேர்ந்தெடு" + +#: kdiff3.cpp:371 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "" +"மூலத்தை தேர்வு செய்த பிறகு " +"தானாகவே அடுத்த " +"தீர்க்கப்படாத குழப்பதற்கு " +"செல் " + +#: kdiff3.cpp:373 +msgid "Show Space && Tabulator Characters for Differences" +msgstr "" +"இடைவெளியை காட்டி மற்றும் " +"வேறுபாட்டிற்க்காக " +"பட்டியலிடுவான் " +"எழுத்துக்கள்" + +#: kdiff3.cpp:374 +#, fuzzy +msgid "Show White Space" +msgstr "இடத்தை ஒதுக்கு" + +#: kdiff3.cpp:376 +msgid "Show Line Numbers" +msgstr "வரி எண்களை காட்டு" + +#: kdiff3.cpp:377 +msgid "Choose A Everywhere" +msgstr "" +"எல்லா இடத்திலும் Aவைத் " +"தேர்ந்தெடு" + +#: kdiff3.cpp:378 +msgid "Choose B Everywhere" +msgstr "" +"எல்லா இடத்திலும் Bவைத் " +"தேர்ந்தெடு" + +#: kdiff3.cpp:379 +msgid "Choose C Everywhere" +msgstr "" +"எல்லா இடத்திலும் Cவைத் " +"தேர்ந்தெடு" + +#: kdiff3.cpp:380 +#, fuzzy +msgid "Choose A For All Unsolved Conflicts" +msgstr "" +"அடுத்த தீர்க்காத " +"குழப்பத்திற்குச் செல்க" + +#: kdiff3.cpp:381 +#, fuzzy +msgid "Choose B For All Unsolved Conflicts" +msgstr "" +"அடுத்த தீர்க்காத " +"குழப்பத்திற்குச் செல்க" + +#: kdiff3.cpp:382 +#, fuzzy +msgid "Choose C For All Unsolved Conflicts" +msgstr "" +"அடுத்த தீர்க்காத " +"குழப்பத்திற்குச் செல்க" + +#: kdiff3.cpp:383 +msgid "Choose A For All Unsolved Whitespace Conflicts" +msgstr "" + +#: kdiff3.cpp:384 +msgid "Choose B For All Unsolved Whitespace Conflicts" +msgstr "" + +#: kdiff3.cpp:385 +msgid "Choose C For All Unsolved Whitespace Conflicts" +msgstr "" + +#: kdiff3.cpp:386 +msgid "Automatically Solve Simple Conflicts" +msgstr "" +"தானாகவே எளிய குழப்பங்களை " +"தீர்க்க." + +#: kdiff3.cpp:387 +msgid "Set Deltas to Conflicts" +msgstr " Delta வை குழப்பத்திற்கு அமை" + +#: kdiff3.cpp:389 +msgid "Show Window A" +msgstr "A சாளரத்தைக் காட்டு" + +#: kdiff3.cpp:390 +msgid "Show Window B" +msgstr "B சாளரத்தைக் காட்டு" + +#: kdiff3.cpp:391 +msgid "Show Window C" +msgstr "C சாளரத்தைக் காட்டு" + +#: kdiff3.cpp:392 kdiff3.cpp:394 +msgid "Focus Next Window" +msgstr "அடுத்த சாளரத்தை நோக்கு" + +#: kdiff3.cpp:396 +msgid "Focus Prev Window" +msgstr "முந்தைய சாளரத்தை நோக்கு" + +#: kdiff3.cpp:397 +msgid "Toggle Split Orientation" +msgstr "பிரிப்பு திசையை மாற்று" + +#: kdiff3.cpp:399 +msgid "Dir && Text Split Screen View" +msgstr "" +"அடைவு மற்றும் உரையின் " +"பிளவின் திரைப் பார்வை" + +#: kdiff3.cpp:401 +msgid "Toggle Between Dir && Text View" +msgstr "" +"அடைவுக்கும் உரை " +"பார்வைக்கும் இடையே மாற்றுக" + +#: kdiff3.cpp:420 kdiff3.cpp:536 kdiff3.cpp:560 kdiff3.cpp:593 kdiff3.cpp:613 +#: pdiff.cpp:1278 pdiff.cpp:1340 pdiff.cpp:1361 pdiff.cpp:1377 pdiff.cpp:1408 +msgid "Ready." +msgstr "தயார்." + +#: kdiff3.cpp:483 pdiff.cpp:1702 +msgid "The merge result hasn't been saved." +msgstr "" +"ஒன்றுசேர் முடிவு " +"சேகரிக்கப்படவில்லை." + +#: kdiff3.cpp:484 +msgid "Save && Quit" +msgstr "சேகரித்து முடி" + +#: kdiff3.cpp:484 +msgid "Quit Without Saving" +msgstr "சேகரிக்காமல் மூடு" + +#: kdiff3.cpp:492 pdiff.cpp:1711 +msgid "Saving the merge result failed." +msgstr "" +"ஒன்றுசேர் முடிவை " +"சேகரித்தல் தோல்வியடைந்தது." + +#: kdiff3.cpp:503 pdiff.cpp:1200 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "" +"நீங்கள் தற்போது அடைவுகளை " +"சேர்த்துக்கொண்டிருக்கிறீர" +"்கள்.நிறுத்த " +"விரும்புகிறீர்களா?" + +#: kdiff3.cpp:526 +msgid "Saving file..." +msgstr "கோப்பு சேகரித்தல்..." + +#: kdiff3.cpp:542 +msgid "Saving file with a new filename..." +msgstr "" +"புதிய கோப்புப்பெயருடன் " +"கோப்பை சேகரித்தல்..." + +#: kdiff3.cpp:566 +msgid "Exiting..." +msgstr "வெளியேருதல்..." + +#: kdiff3.cpp:578 +msgid "Toggling toolbar..." +msgstr "" +"கருவிப்பட்டி " +"மாற்றப்படுகறது" + +#: kdiff3.cpp:598 +msgid "Toggle the statusbar..." +msgstr "நிலைப்பட்டியை மாற்று" + +#: kdiff3.cpp:638 +msgid "Searchtext:" +msgstr "உரையைத் தேடு:" + +#: kdiff3.cpp:645 +msgid "Case sensitive" +msgstr "எழுத்து வகை உணரக்கூடிய" + +#: kdiff3.cpp:648 +msgid "Search A" +msgstr "Aவைத் தேடு" + +#: kdiff3.cpp:653 +msgid "Search B" +msgstr "Bவைத் தேடு" + +#: kdiff3.cpp:658 +msgid "Search C" +msgstr "Cவைத் தேடு" + +#: kdiff3.cpp:663 +msgid "Search output" +msgstr "வெளியீீட்டைத் தேடு" + +#: kdiff3.cpp:668 +msgid "&Search" +msgstr "தேடு" + +#: kdiff3_part.cpp:131 kdiff3_part.cpp:196 +msgid "Couldn't find files for comparison." +msgstr "" +"ஒப்பிடுதலுக்கு கோப்புகள் " +"கிடைக்கவில்லை." + +#: kdiff3_part.cpp:263 +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#: kdiff3_shell.cpp:63 +msgid "" +"Could not find our part!\n" +"This usually happens due to an installation problem. Please read the " +"README-file in the source package for details." +msgstr "" +"உங்கள் பகுதியை காணவில்லை.\n" +"நிறுவும்போது இப்படிப்பட்ட " +"பிரர்ச்சனை " +"ஏற்படும்விவரங்களுக்கு README " +"தொகுப்பைப் படிக்கவும்" + +#: main.cpp:27 +msgid "Text Diff and Merge Tool" +msgstr "" +"உரை வேறுபாடு மற்றும் கருவி " +"சேர்க்கை" + +#: main.cpp:32 +msgid "Merge the input." +msgstr "உள்ளீட்டை ஒன்றுசேர்." + +#: main.cpp:34 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" +"தெளிவான அடித்தளக் கோப்பை " +"சில கருவிகளுடன் " +"பொருத்துவதற்கு" + +#: main.cpp:36 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr " வெளியீடு கோப்பு" + +#: main.cpp:37 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" +"மறுபடியும் கோப்பை " +"வெளியீடு(சில கருவிகளுடன் " +"பொருத்துவதற்கு)" + +#: main.cpp:38 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" +"எல்லா குழப்பங்களையும் " +"தானாகவே நீங்குமானால் GUI " +"தேவையில்லை" + +#: main.cpp:39 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "" +"தாமாகவே தீராத குழப்பங்கள் (For " +"compatibility...)" + +#: main.cpp:40 +msgid "Visible name replacement. Supply this once for every input." +msgstr "" +"தெரியும் பெயரை மாற்றி " +"அமைக்க.ஒவ்வொரு " +"உள்ளீட்டுக்கும் இதை மாற்றி " +"அமைக்க." + +#: main.cpp:42 +msgid "For compatibility with certain tools." +msgstr "சில கருவிகளுடன் பொருந்துதல்" + +#: main.cpp:44 +msgid "file1 to open (base, if not specified via --base)" +msgstr "" +"கோப்பு1 யை திற(அடித்தளம் " +"அல்லது via அடித்தளம்)" + +#: main.cpp:45 +msgid "file2 to open" +msgstr "கோப்பு2 திற" + +#: main.cpp:46 +msgid "file3 to open" +msgstr "கோப்பு 3ன்றை திற" + +#: main.cpp:99 rc.cpp:3 +msgid "KDiff3" +msgstr "KDiff3" + +#: mergeresultwindow.cpp:250 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"வெளீயிடு " +"மாற்றப்பட்டுள்ளதுநீங்கள் " +"தொடர்ந்தால் மாற்றங்களை " +"இழந்து விடுவீர்கள்" + +#: mergeresultwindow.cpp:671 pdiff.cpp:591 +msgid "All input files are binary equal." +msgstr "" +"அணைத்து உள்ளிடு " +"கோப்புகளும் இருநிலை சமம்" + +#: mergeresultwindow.cpp:673 pdiff.cpp:593 +msgid "All input files contain the same text." +msgstr "" +"அனைத்து உள்ளீட்டுக் " +"கோப்புகளும் ஒரே உரையைக் " +"கொண்டன." + +#: mergeresultwindow.cpp:675 pdiff.cpp:595 +msgid "" +"Files A and B are binary equal.\n" +msgstr "" +"கோப்புகள் A மற்றும் B இருநிலை " +"சமம் உடையன.\n" + +#: mergeresultwindow.cpp:676 pdiff.cpp:596 +msgid "" +"Files A and B have equal text. \n" +msgstr "" +"கோப்புகள் A மற்றும் B சம உரை " +"உடையன.\n" + +#: mergeresultwindow.cpp:677 pdiff.cpp:597 +msgid "" +"Files A and C are binary equal.\n" +msgstr "" +"கோப்புகள் A மற்றும் C இருநிலை " +"சமம் உடையன.\n" + +#: mergeresultwindow.cpp:678 pdiff.cpp:598 +msgid "" +"Files A and C have equal text. \n" +msgstr "" +"கோப்புகள் A மற்றும் C சம உரை " +"உடையன.\n" + +#: mergeresultwindow.cpp:679 pdiff.cpp:599 +msgid "" +"Files B and C are binary equal.\n" +msgstr "" +"கோப்புகள் B மற்றும் C இருநிலை " +"சமம் உடையன.\n" + +#: mergeresultwindow.cpp:680 pdiff.cpp:600 +msgid "" +"Files B and C have equal text. \n" +msgstr "" +"கோப்புகள் B மற்றும் C சம உரை " +"உடையன.\n" + +#: mergeresultwindow.cpp:683 +msgid "Total number of conflicts: " +msgstr "" +"மொத்த குழப்பங்களின் " +"எண்ணிக்கை:" + +#: mergeresultwindow.cpp:684 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"தாமாகவே தீர்ந்த " +"குழப்பங்களின் எண்ணிகை" + +#: mergeresultwindow.cpp:685 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"தீர்க்கப்படாத " +"குழப்பங்களின் எண்ணிகை" + +#: mergeresultwindow.cpp:687 +msgid "Conflicts" +msgstr "குழப்பங்கள்" + +#: mergeresultwindow.cpp:1015 +msgid "<No src line>" +msgstr "<No src line>" + +#: mergeresultwindow.cpp:1022 +msgid "<Merge Conflict>" +msgstr "<ஒன்றுசேர் குழப்பம்>" + +#: mergeresultwindow.cpp:1086 +msgid "[Modified]" +msgstr "[திருத்தப்பட்டது]" + +#: mergeresultwindow.cpp:1964 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"அணைத்து குழப்பங்களும் " +"இன்னும் தீரவில்லை.\n" +"கோப்பை சேமிக்கவில்லை \n" + +#: mergeresultwindow.cpp:1966 +msgid "Conflicts Left" +msgstr "குழப்பமான இடது" + +#: mergeresultwindow.cpp:1978 +msgid "" +"\n" +"\n" +"File not saved." +msgstr "" +"\n" +"\n" +"கோப்பையை சேமிக்கவில்லை" + +#: mergeresultwindow.cpp:1978 mergeresultwindow.cpp:2040 +msgid "File Save Error" +msgstr "கோப்பை சேமிப்பு பிழை" + +#: mergeresultwindow.cpp:1994 +msgid "Out of memory while preparing to save." +msgstr "" +"சேமிக்கும் தருவாயில் " +"நினைவு தவறியது" + +#: mergeresultwindow.cpp:2040 +msgid "Error while writing." +msgstr "எழுதும் பொழுது பிழை" + +#: optiondialog.cpp:236 +msgid "Editor & Diff Output Font" +msgstr "" +"திருத்துபவரும் வித்யாசமான " +"வெளியீட்டு எழுத்துகளூம்" + +#: optiondialog.cpp:248 +msgid "Italic font for deltas" +msgstr "" +"deltaவிற்கான இத்தாலிய " +"எழுத்துரு" + +#: optiondialog.cpp:251 +msgid "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." +msgstr "" +"வித்தியாசங்களுக்காக " +"இத்தாலிய பதிவை " +"தேர்ந்தெடுக்கவும்.\n" +"If the font doesn't support italic characters, then this does nothing." + +#: optiondialog.cpp:259 +msgid "Color" +msgstr "வர்ணம்" + +#: optiondialog.cpp:259 +msgid "Colors in Editor & Diff Output" +msgstr "" +"திருத்துபவரின் வண்ணமும் " +"வித்யாசமான வெளியீடும்" + +#: optiondialog.cpp:273 +msgid "Foreground color:" +msgstr "முன்னனி நிறம்" + +#: optiondialog.cpp:279 +msgid "Background color:" +msgstr "பின்னனி நிறம்" + +#: optiondialog.cpp:286 +msgid "Diff background color:" +msgstr "வேறுபட்ட பின்னனி நிறம்" + +#: optiondialog.cpp:293 +msgid "Color A:" +msgstr "வர்ணம் A:" + +#: optiondialog.cpp:300 +msgid "Color B:" +msgstr "வர்ணம் B:" + +#: optiondialog.cpp:307 +msgid "Color C:" +msgstr "வர்ணம் C:" + +#: optiondialog.cpp:313 +msgid "Conflict color:" +msgstr "குழப்பமான நிறம்" + +#: optiondialog.cpp:320 +msgid "Current range background color:" +msgstr "" +"பின்னனி நிறத்தீன் தற்பொதைய " +"வரம்பு " + +#: optiondialog.cpp:327 +msgid "Current range diff background color:" +msgstr "" +"பின்னனி நிறத்தீன் " +"வேறுப்பட்ட தற்பொதைய வரம்பு " + +#: optiondialog.cpp:338 +msgid "Editor" +msgstr "திருத்தியவர்" + +#: optiondialog.cpp:338 +msgid "Editor Behaviour" +msgstr "திருத்துபவரின் செயல்பாடு" + +#: optiondialog.cpp:347 +msgid "Tab inserts spaces" +msgstr "தத்தல் இடைவெளியை சொருகும்" + +#: optiondialog.cpp:350 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A Tab-character will be inserted." +msgstr "" +"On:தத்தலை அழுத்தும் போது " +"தேவையான இடைவெளி " +"உருவாகிறதுOff:ஒர் தத்தல் " +"எழுத்து சொருகப்படும்" + +#: optiondialog.cpp:356 +msgid "Tab size:" +msgstr "Tab அளவு" + +#: optiondialog.cpp:361 +msgid "Auto indentation" +msgstr "தானிட ஒதுக்கி" + +#: optiondialog.cpp:364 +msgid "" +"On: The indentation of the previous line is used for a new line.\n" +msgstr "" +"முந்தைய வரியில் " +"பயன்படுத்தப்பட்ட நகர்ப்பு " +"புதிய வரியிலும் " +"பயன்படுத்தப்படுகிறது\n" + +#: optiondialog.cpp:368 +msgid "Auto copy selection" +msgstr "" +"தானாகவே " +"தேர்ந்தெடுக்கப்பட்ட படிவு" + +#: optiondialog.cpp:371 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"எந்த ஒரு தேர்வையும் " +"உடனடியாக கிளிப் போர்டுக்கு " +"எழுதவும்.\n" +"நீங்கள் வெளிப்படையாக படிவு " +"செய்" + +#: optiondialog.cpp:376 +msgid "Use locale encoding" +msgstr "" + +#: optiondialog.cpp:379 +msgid "Change this if non-ascii-characters aren't displayed correctly." +msgstr "" + +#: optiondialog.cpp:389 +msgid "Diff & Merge" +msgstr "வேறுபாடு & சேர்த்திடு" + +#: optiondialog.cpp:389 +msgid "Diff & Merge Settings" +msgstr "" +"வேறுபாடு & சேர்த்திடு " +"அமைப்புகள்" + +#: optiondialog.cpp:399 +msgid "Preserve carriage return" +msgstr " carriage return யை பராமரி" + +#: optiondialog.cpp:402 +msgid "" +"Show carriage return characters '\\r' if they exist.\n" +"Helps to compare files that were modified under different operating systems." +msgstr "carriage return எழுத்துக்களை காட்டு" + +#: optiondialog.cpp:407 +msgid "Ignore numbers" +msgstr "சொர்களை ஒதுக்கு" + +#: optiondialog.cpp:410 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"வரி பொருத்துதலின் போது எண் " +"எழுத்துக்களை நிராகரி." + +#: optiondialog.cpp:415 +msgid "Ignore C/C++ Comments" +msgstr "" + +#: optiondialog.cpp:417 +msgid "Treat C/C++ comments like white space." +msgstr "" + +#: optiondialog.cpp:421 +msgid "Convert to upper case" +msgstr "பெரிய எழுத்தாக மாற்றுக " + +#: optiondialog.cpp:424 +msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +msgstr "" +"படிக்கும் பொழுது சிறிய " +"எழுத்துக்களை பெரிய " +"எழுத்துக்களை மாற்று (e.g.: 'a'->'A')" + +#: optiondialog.cpp:428 +msgid "Preprocessor command:" +msgstr "முன் செயலாக்க கட்டளை" + +#: optiondialog.cpp:432 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" +"உபயோகிப்பாளரால் " +"அறுதியிடப்பட்ட " +"முன்-செயலாக்கி" + +#: optiondialog.cpp:435 +msgid "Line-matching preprocessor command:" +msgstr "" +"வரி-பொருத்து முன்-செயலாக்கி " +" கட்டளை" + +#: optiondialog.cpp:439 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"முன்-செயலாக்கி " +"வரி-பொருத்துதலின் போது " +"பயன்ப்படுத்தப்படுகிறது" + +#: optiondialog.cpp:442 +#, fuzzy +msgid "Try hard (slower)" +msgstr "கடின முயற்சி(மெதுவாக)" + +#: optiondialog.cpp:445 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" + +#: optiondialog.cpp:450 +msgid "Auto advance delay (ms):" +msgstr "தானாக முன்னேறிய தாமதம் (ms):" + +#: optiondialog.cpp:455 +msgid "" +"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 "" + +#: optiondialog.cpp:460 +msgid "White space 2-file merge default:" +msgstr "" + +#: optiondialog.cpp:464 optiondialog.cpp:477 +msgid "Manual choice" +msgstr "" + +#: optiondialog.cpp:468 optiondialog.cpp:482 +msgid "" +"Allow the merge algorithm to automatically select an input for " +"white-space-only changes." +msgstr "" + +#: optiondialog.cpp:473 +msgid "White space 3-file merge default:" +msgstr "" + +#: optiondialog.cpp:492 +msgid "Directory Merge" +msgstr "அடைவுச் சேர்க்கை" + +#: optiondialog.cpp:500 +msgid "Recursive directories" +msgstr "திரும்ப நிகழும் அடைவுகள்" + +#: optiondialog.cpp:502 +msgid "Whether to analyze subdirectories or not." +msgstr "" +"உபஅடைவுகளை பரிசோதிக்க " +"வேண்டுமா?" + +#: optiondialog.cpp:504 +msgid "File pattern(s):" +msgstr "கோப்பு வடிவங்கள்:" + +#: optiondialog.cpp:509 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"பரிசோதனையிலிருந்து " +"வெளியேற்ற பட வேண்டிய " +"கொப்புகளின் வடிவங்கள்.Wildcards ';' " +"உபயோகித்து பல்வேறு " +"வடிவங்களை குறிப்பிடலாம்" + +#: optiondialog.cpp:515 +msgid "File-anti-pattern(s):" +msgstr " வடிவற்ற கோப்பு" + +#: optiondialog.cpp:520 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"பரிசோதனையிலிருந்து " +"வெளியேற்ற பட வேண்டிய " +"கொப்புகளின் வடிவங்கள்.Wildcards ';' " +"உபயோகித்து பல்வேறு " +"வடிவங்களை குறிப்பிடலாம்" + +#: optiondialog.cpp:526 +msgid "Dir-anti-pattern(s):" +msgstr "வடிவற்ற அடைவு" + +#: optiondialog.cpp:531 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"பரிசோதனையிலிருந்து " +"வெளியேற்ற பட வேண்டிய " +"கொப்புகளின் வடிவங்கள்.Wildcards ';' " +"உபயோகித்து பல்வேறு " +"வடிவங்களை குறிப்பிடலாம்" + +#: optiondialog.cpp:537 +msgid "Use .cvsignore" +msgstr ".cvsignore உபயோகி" + +#: optiondialog.cpp:540 +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\"-files this can be directory specific." +msgstr "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\"-files this can be directory specific." + +#: optiondialog.cpp:545 +msgid "Find hidden files and directories" +msgstr "" +"மறைந்த கோப்புகளையும் " +"அடைவுகளையும் தேடு" + +#: optiondialog.cpp:548 +msgid "Finds files and directories with the hidden attribute." +msgstr "" +"கோப்புகளையும் அடைவுகளையும் " +"மறைந்த குணங்களுடன் " +"தேர்ந்தெடு " + +#: optiondialog.cpp:550 +msgid "Finds files and directories starting with '.'." +msgstr "" +"'.'. தொடங்கும் கோப்புகளும் " +"அடைவுகளும் தேடு" + +#: optiondialog.cpp:554 +msgid "Follow file links" +msgstr "கோப்பு இனைப்பை பின்பற்று" + +#: optiondialog.cpp:557 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"கோப்பை இனைப்பு கூறியோடு " +"ஒப்பிடு இனைப்பை ஒப்பிடு" + +#: optiondialog.cpp:562 +msgid "Follow directory links" +msgstr "அடைவை இணைப்பை பின்பற்று" + +#: optiondialog.cpp:565 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"On:அடைவை இனைப்பு கூறியோடு " +"ஒப்பிடுOffஇனைப்பை ஒப்பிடு" + +#: optiondialog.cpp:570 +msgid "List only deltas" +msgstr "மாற்றம் மட்டும் பட்டியலிடு" + +#: optiondialog.cpp:573 +msgid "Files and directories without change will not appear in the list." +msgstr "" +"கோப்புகளும் அடைவுகளும் " +"மாற்றப்படாமல் பட்டியலில் " +"இடம் பெறாது" + +#: optiondialog.cpp:576 +msgid "Trust the modification date (unsafe)" +msgstr "" +"மாற்றிய தேதியை " +"நம்பு(பாதுகாப்பில்லை)" + +#: optiondialog.cpp:578 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Useful for big directories or slow networks." +msgstr "" +"மாற்றிய தேதியும் கோப்பு " +"நீளமும் சமமாக இருந்தால் " +"எல்லா கோப்புகளும் சமம் என " +"எண்ணலாம்.இது பெரிய " +"அடைவுகளுக்கு அல்லது " +"மெதுவான இனைப்புகளுக்கு " +"உதவும்" + +#: optiondialog.cpp:582 +#, fuzzy +msgid "Trust the size (unsafe)" +msgstr "" +"மாற்றிய தேதியை " +"நம்பு(பாதுகாப்பில்லை)" + +#: optiondialog.cpp:584 +#, fuzzy +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 "" +"மாற்றிய தேதியும் கோப்பு " +"நீளமும் சமமாக இருந்தால் " +"எல்லா கோப்புகளும் சமம் என " +"எண்ணலாம்.இது பெரிய " +"அடைவுகளுக்கு அல்லது " +"மெதுவான இனைப்புகளுக்கு " +"உதவும்" + +#: optiondialog.cpp:589 +msgid "Synchronize directories" +msgstr "ஒத்தியக்கு அடைவை" + +#: optiondialog.cpp:592 +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 "" +"இரண்டு அடைவிலும் கோப்புகளை " +"சேமிப்பதற்கு " +"அனுமதிப்பதால், இரண்டு " +"அடைவுகளும் பின்னர் " +"ஒன்றாகவே இருக்கும் .இரண்டு " +"அடைவுகளையும் சேருமிடம் " +"கூறிப்பிடாமல் ஒத்திடிம் " +"பொழுதுதான் வேலை செய்யும் " + +#: optiondialog.cpp:597 +msgid "Copy newer instead of merging (unsafe)" +msgstr "" +"ஒன்றாக சேர்ப்பதற்கு பதிலாக " +"புதியவரை " +"பதியெடு(பாதுகாப்பில்லை)" + +#: optiondialog.cpp:600 +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." +msgstr "" +"உள்ளே பார்க்காதே புதிய " +"கோப்பையை மட்டும் எடு.(நீ " +"செய்வது என்ன என்று " +"தெரிந்தால் மட்டுமே இதை " +"உபயோகப்படுத்து)இரண்டு " +"அடைவுகளை ஒத்திடும் போது " +"மட்டுமே விளைவுகள் ஏற்படும்" + +#: optiondialog.cpp:605 +msgid "Backup files (.orig)" +msgstr "பின்னனி கோப்புகள்(.orig)" + +#: optiondialog.cpp:608 +msgid "" +"When 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 "" +"பழைய கோப்பில் ஒரு கோப்பை " +"சேமிக்கும் பொழுது, பழைய " +"கோப்பில் மூலநீட்டுதலுடன் " +"பெயர் " +"மாறும்,நீக்கபடுவதற்கு " +"பதிலாக. " + +#: optiondialog.cpp:636 +msgid "" +"You selected a variable width font.\n" +"\n" +"Because this program doesn't handle variable width fonts\n" +"correctly, you might experience problems while editing.\n" +"\n" +"Do you want to continue or do you want to select another font." +msgstr "" +"நீங்கள் மாற்றக்கூடிய அகல " +"எழுத்துருவை " +"தேர்தெடுத்துள்ளீர்கள்\n" +"இதற்கு காரணம் இந்த நிரல் " +"மாற்றக்கூடிய அகலமான " +"எழுத்துருவை " +"கையாலாது.திருத்தங்கள் " +"செய்யும் பொழுதுப் " +"பிரச்சனைகளை " +"சந்தித்ருக்கலாம்,சரியாகநீங" +"்கள் தொடர வேண்டுமா " +"அல்லது,வேறு எழுத்துருவை " +"தேர்தெடுக்கிறீர்களா" + +#: optiondialog.cpp:640 +msgid "Incompatible Font" +msgstr "கச்சிதமில்லாத எழுத்துரு" + +#: optiondialog.cpp:641 +msgid "Continue at Own Risk" +msgstr "" +"உங்களுடைய சொந்த ஆபத்தில் " +"தொடரு" + +#: optiondialog.cpp:641 +msgid "Select Another Font" +msgstr "" +"மற்றொரு எழுத்துருவை " +"தேர்தெடு" + +#: optiondialog.cpp:669 +msgid "This resets all options. Not only those of the current topic." +msgstr "" +" இது அனைத்து தேர்வுகளையும் " +"மாற்றியமைக்கும்.தற்பொழுதுள" +"்ள தலைப்பு மட்டுமல்ல" + +#: pdiff.cpp:377 +msgid "" +"Running the external diff failed.\n" +"Check if the diff works, if the program can write in the temp folder or if " +"the disk is full.\n" +"The external diff option will be disabled now and the internal diff will be " +"used." +msgstr "" + +#: pdiff.cpp:443 +msgid "Loading A" +msgstr "A ஏற்றுதல்" + +#: pdiff.cpp:448 +msgid "Loading B" +msgstr " B ஏற்றுதல்" + +#: pdiff.cpp:459 pdiff.cpp:487 pdiff.cpp:499 +msgid "Diff: A <-> B" +msgstr "வித்தியாசம் A <-> B" + +#: pdiff.cpp:467 pdiff.cpp:520 +msgid "Linediff: A <-> B" +msgstr "வரி வித்தியாசம் : A <->B" + +#: pdiff.cpp:476 +msgid "Loading C" +msgstr " C ஏற்றுதல்" + +#: pdiff.cpp:490 pdiff.cpp:502 +msgid "Diff: B <-> C" +msgstr "வித்தியாசம் B <-> C" + +#: pdiff.cpp:493 pdiff.cpp:505 +msgid "Diff: A <-> C" +msgstr "வித்தியாசம் A <-> C" + +#: pdiff.cpp:523 +msgid "Linediff: B <-> C" +msgstr "வரி வித்தியாசம் B <-> C" + +#: pdiff.cpp:526 +msgid "Linediff: A <-> C" +msgstr "வரி வித்தியாசம் : A <-> C" + +#: pdiff.cpp:610 +msgid "" +"Some inputfiles don't seem to be pure textfiles.\n" +"Note that the KDiff3-merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"சில உள்ளீடுகோப்புகள் " +"தூய்மையான உரை கோப்புகளாக " +"இல்லை . KDiff3 " +"ஒன்றாகச்சேர்ப்பது தகவலை " +"கூறிப்பது அல்ல.உங்களுடைய " +"சொந்த ஆபத்தில் தொடரு" + +#: pdiff.cpp:1030 +msgid "A (Base):" +msgstr "A (அடிப்படை)" + +#: pdiff.cpp:1036 pdiff.cpp:1051 pdiff.cpp:1066 pdiff.cpp:1084 +msgid "File..." +msgstr "கோப்பு" + +#: pdiff.cpp:1038 pdiff.cpp:1053 pdiff.cpp:1068 pdiff.cpp:1086 +msgid "Dir..." +msgstr "அடைவு" + +#: pdiff.cpp:1061 +msgid "C (Optional):" +msgstr "C (விருப்பங்கள்)" + +#: pdiff.cpp:1079 +msgid "Output (optional):" +msgstr "வெளீயிடு (விருப்பங்கள்)" + +#: pdiff.cpp:1108 +msgid "Configure..." +msgstr "அமை" + +#: pdiff.cpp:1201 +msgid "Abort" +msgstr "விடுதல்" + +#: pdiff.cpp:1207 pdiff.cpp:1286 +msgid "Opening files..." +msgstr "திறந்த கோப்புகள்" + +#: pdiff.cpp:1269 pdiff.cpp:1330 +msgid "File open error" +msgstr "கோப்பு திறப்பு பிழை" + +#: pdiff.cpp:1345 +msgid "Cutting selection..." +msgstr "அறுத்தல் தேர்தெடு" + +#: pdiff.cpp:1366 +msgid "Copying selection to clipboard..." +msgstr "" +"தேர்தெடுக்ப்பட்டதை " +"கிளிப்போர்டிற்கு நகலேடுக்க" + +#: pdiff.cpp:1382 +msgid "Inserting clipboard contents..." +msgstr "" +"கிளிப்போர்டு உள்ளடக்கத்தை " +"சொருகு" + +#: pdiff.cpp:1703 +msgid "Save && Continue" +msgstr "சேமி தொடரு" + +#: pdiff.cpp:1703 +msgid "Continue Without Saving" +msgstr "சேமிக்காமல் தொடரு" + +#: pdiff.cpp:1908 +msgid "Search complete." +msgstr "தேடல் முடிவடைந்தது" + +#: pdiff.cpp:1908 +msgid "Search Complete" +msgstr "தேடல் முடிவடைந்தது" + +#: rc.cpp:1 +msgid "&KDiff3" +msgstr "&KDiff3" + +#: rc.cpp:2 +msgid "Configure KDiff3" +msgstr "அமை KDiff3" + +#: rc.cpp:5 +msgid "&Directory" +msgstr "அடைவு" + +#: rc.cpp:6 +#, fuzzy +msgid "Current Item Merge Operation" +msgstr "" +"அனைத்து ஒன்றுசேர் " +"இயக்கங்களை " +"மாற்றிக்கொண்டிருக்கிறது" + +#: rc.cpp:7 +msgid "Current Item Sync Operation" +msgstr "" + +#: rc.cpp:8 +msgid "&Movement" +msgstr "நகர்த்துவது " + +#: rc.cpp:9 +msgid "&Merge" +msgstr "ஒன்றாகச்சேர்" + +#: rc.cpp:10 +msgid "&Window" +msgstr "சாளரங்கள்" + +#~ msgid "Delete A && B" +#~ msgstr "நீக்கு அ&பி." + +#~ msgid "Merge to A && B" +#~ msgstr "'அ'&'பி' ஐ ஒன்றாகச் சேர்." + +#~ msgid "In progress ..." +#~ msgstr "செயல்பாட்டில் உள்ளது..." + +#~ msgid "" +#~ "On: Text that differs only in white space will match and\n" +#~ "be shown on the same line in the different output windows.\n" +#~ "Off is useful when whitespace is very important.\n" +#~ "On is good for C/C++ and similar languages." +#~ msgstr "இடைவெளியில் உள்ள உரைகள் மட்டுமே மாறும்" + +#~ msgid "Use external diff" +#~ msgstr "வெளிவேறுபாட்டை உபயோகி" + +#~ msgid "Ignore trivial matches" +#~ msgstr "அர்த்தமற்ற பொருத்துங்களை நிராகரி" + +#~ msgid "Max search length:" +#~ msgstr "அதிகப்படியான தேடல் அளவு"