Index: trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,42 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Vít Pelčák , 2010, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2011-06-22 14:26+0200\n" +"Last-Translator: Vít Pelčák \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 1.2\n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Rozhraní pro Diff/Patch" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" Index: trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._json_.po =================================================================== --- trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._json_.po (nonexistent) +++ trunk/l10n-support/cs/summit/messages/kdereview/kdiff3._json_.po (revision 1522187) @@ -0,0 +1,21 @@ +# Vit Pelcak , 2018. +msgid "" +msgstr "" +"Project-Id-Version: json files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2018-04-03 14:53+0100\n" +"Last-Translator: Vit Pelcak \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "Porovnávejte/slučujte soubory/adresáře pomocí KDiff3" Index: trunk/l10n-support/cs/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/cs/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/cs/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4066 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Vít Pelčák , 2010, 2011, 2013, 2014, 2015, 2017, 2018. +# Tomáš Chvátal , 2012, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: trunk_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-07 09:31+0200\n" +"PO-Revision-Date: 2018-07-11 16:11+0100\n" +"Last-Translator: Vit Pelcak \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Zdeněk Pech" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "dom.toretto@seznam.cz" + +#. +> trunk5 +#: diff.cpp:258 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "Zápis dat schránky do dočasného souboru selhal." + +#. +> trunk5 +#: diff.cpp:262 +#, kde-format +msgid "From Clipboard" +msgstr "Ze schránky" + +#. +> trunk5 +#: diff.cpp:563 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Očekávána mezera po ukončující uvozovce." + +#. +> trunk5 +#: diff.cpp:566 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Nebyly nalezeny odpovídající uvozovky." + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Neočekávaný apostrof uvnitř argumentu." + +#. +> trunk5 +#: diff.cpp:595 +#, kde-format +msgid "No program specified." +msgstr "Nebyl zadán program." + +#. +> trunk5 +#: diff.cpp:710 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Předběžné zpracování zřejmě selhalo. Zkontrolujte příkaz:\n" +"\n" +" %1\n" +"\n" +"Příkaz předběžného zpracování bude nyní vypnut." + +#. +> trunk5 +#: diff.cpp:757 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Předběžné zpracování shody řádku zřejmě selhalo. Zkontrolujte příkaz:\n" +"\n" +" %1\n" +"\n" +"Příkaz předběžného zpracování shody řádku bude nyní vypnut." + +#. +> trunk5 +#: diff.cpp:784 +#, fuzzy, kde-format +#| msgid "Failed to load processed image." +msgid "File %1 too large to process. Skipping." +msgstr "Načítání obrázků ke zpracování se nezdařilo." + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "Soubor %1: Řádek %2" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, kde-format +msgid "File %1: Line not available" +msgstr "Soubor %1: Řádek není dostupný" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, kde-format +msgid "Encoding:" +msgstr "Kódování:" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 +#, kde-format +msgid "Line end style:" +msgstr "Styl konce řádku:" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 +#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 +#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 +#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 +#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 +#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 +#: smalldialogs.cpp:126 smalldialogs.cpp:129 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 +#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 +#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 +#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 +#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 +#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 +#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 +#: smalldialogs.cpp:127 smalldialogs.cpp:130 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 +#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 +#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 +#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 +#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 +#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: difftextwindow.cpp:1858 +#, fuzzy, kde-format +#| msgid "A (Base):" +msgid "A (Base)" +msgstr "A (základní):" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, kde-format +msgid "Encoding: %1" +msgstr "Kódování: %1" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, kde-format +msgid "Line end style: %1" +msgstr "Styl konce řádku: %1" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "Horní řádek" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, kde-format +msgid "End" +msgstr "Konec" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, kde-format +msgid "Open File" +msgstr "Otevřít soubor" + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, kde-format +msgid "Other" +msgstr "Jiné" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "Nevyřešeno" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "Vyřešeno" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "Nebílý" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "Bílá" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "Zkopírovat A do B" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "Zkopírovat B do A" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "Smazat A" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "Smazat B" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Smazat A a B" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "Sloučit do A" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "Sloučit do B" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Sloučit do A a B" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "Smazat (pokud existuje)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Sloučení" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Sloučit (ručně)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Chyba: Konflikt typů souborů" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Chyba: Změněno a smazáno" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Chyba: Data jsou shodná, ale soubory nikoliv." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, kde-format +msgid "Done" +msgstr "Hotovo" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "Chyba" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Přeskočeno." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Neuloženo." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "Probíhá..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "Udělat." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "Jméno" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "Operace" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "Stav" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Směs odkazů a běžných souborů." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Odkaz: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Velikost" + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Datum a velikost: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Vytváření dočasné kopie %1 selhalo." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Otevření %1 selhalo." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Porovnávám soubory..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Chyba načítání z %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" +"Právě probíhá slučování adresářů. Opravdu si přejete slučování ukončit a " +"znovu prohledat adresář?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 +#, kde-format +msgid "Warning" +msgstr "Varování" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "Znovu prohledat" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1030 +#, kde-format +msgid "Continue Merging" +msgstr "Pokračovat se slučováním" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Otevírání adresářů selhalo:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář A \"%1\" neexistuje nebo není adresářem.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář B \"%1\" neexistuje nebo není adresářem.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář C \"%1\" neexistuje nebo není adresářem.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Chyba otvírání adresáře" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" +"Check again before continuing." +msgstr "" +"Cílový adresář nesmí být při slučování tří adresářů shodný s A nebo B.\n" +"Před pokračováním proveďte kontrolu." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Varování - parametr" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Prohledávání adresářů..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Načítání adresáře A" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Načítání adresáře B" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Načítání adresáře C" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Některé podadresáře byly nečitelné v" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Zkontrolujte oprávnění podadresářů." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 +#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 +#, kde-format +msgid "Ready." +msgstr "Připraven." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, kde-format +msgid "Number of manual merges: %1" +msgstr "Počet ručních sloučení: %1" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "Toto ovlivňuje všechny operace slučování." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Změna všech operací sloučení" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, kde-format +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "" +"Zpracovává se soubor %1 / %2\n" +"%3" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Tuto operaci nelze nyní provést." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "Operaci nelze provést" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, kde-format +msgid "An error occurred while copying." +msgstr "Během kopírování došlo k chybě." + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "Chyba slučování" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát.)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "Neznámá slučovací operace." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" +"Sloučení může začít.\n" +"\n" +"Zvolte \"Provést\" pokud jste si přečetli instrukce a máte dělat.\n" +"Zvolením \"Simulovat\" vám bude sděleno, co by se mělo stát.\n" +"\n" +"Uvědomte si, že tento program je stále ve stavu beta a proto není vůbec " +"žádná ZÁRUKA vaše důležitá data si zazálohujte." + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "Spouští se sloučení" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "Provést" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "Simulovat" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "Zvýrazněná položka je jiného typu v jiném adresáři. Zvolte co udělat." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "Datum změny souboru je shodné, soubory však nikoliv. Zvolte co udělat." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "" +"The highlighted item was changed in one directory and deleted in the other. " +"Select what to do." +msgstr "" +"Zvýrazněná položka byla pozměněna v jednom adresáři a v druhém byla smazána. " +"Zvolte co udělat." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "" +"This operation is currently not possible because directory merge is " +"currently running." +msgstr "" +"Tato operace není nyní možná, protože slučování adresáře právě probíhá." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" +"V posledním kroku došlo k chybě.\n" +"Přejete si pokračovat s položkou, která chybu způsobila, nebo si přejete " +"položku přeskočit?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "Pokračovat se slučováním po chybě" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "Pokračovat s poslední položkou" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "Přeskočit položku" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "Operace sloučení dokončena." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "Slučování dokončeno" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "" +"Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" +"Simulované sloučení dokončeno: Ověřte si, zda souhlasíte s navrženými " +"operacemi." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, kde-format +msgid "An error occurred. Press OK to see detailed information." +msgstr "Vyskytla se chyba. Podrobné informace uvidíte po stisknutí OK." + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Chyba: při mazání %1: Vytvoření zálohy selhalo." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "smazat adresář rekurzivně( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "odstranit( %1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Chyba: operace mazání adresáře selhala při pokusu načítání adresáře." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Chyba: operace smazat adresář( %1 ) selhala." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Chyba: operace mazání selhala." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "ručně sloučit( %1, %2, %3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid "" +" Note: After a manual merge the user should continue by pressing F7." +msgstr "Pozn.: Po ručním slučování by měl uživatel pokračovat stiskem F7." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"Chyba: Kopírování ( %1 -> %2 ) selhalo. Existující cíl nelze odstranit." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "Kopírovat odkaz ( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" +"Chyba: kopírování odkazu selhalo: Vzdálené odkazy nejsou nyní podporovány." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Chyba: kopírování odkazu selhalo." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "kopírovat( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Chyba při přejmenování ( %1 -> %2 ): Existující cíl nelze odstranit." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "přejmenovat( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "Chyba: Přejmenování selhalo." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Chyba při vytvoření adresáře %1. Nelze odstranit existující soubor." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "Vytvořit adresář ( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "Chyba při vytvoření adresáře." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "Cíl" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "Adresář" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "Typ" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "Velikost" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "Atributy" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "Poslední změna" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "Cíl odkazu" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "Soubor" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +#| msgid "Link" +msgid "-Link" +msgstr "Odkaz" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "nedostupný" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (cíl): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (základní): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (cíl): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (cíl): " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "Cíl: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Uložit stav sloučení adresáře jako..." + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Spustit / pokračovat ve sloučení adresářů" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Spustit operaci pro aktuální položku" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "Porovnat vybraný soubor" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "Sloučit aktuální soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Sloučit\n" +"Soubor" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Sbalit všechny podadresáře" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Rozbalit všechny podadresáře" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "Zvolit A pro všechny položky" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "Zvolit B pro všechny položky" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "Zvolit C pro všechny položky" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Automaticky zvolit operaci pro všechny položky" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "Žádná operace pro všechny položky" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "Zobrazit identické soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"Shodné\n" +"Soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "Zobrazit rozdílné soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "Zobrazit soubory pouze v A" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"Soubory\n" +"pouze v A" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "Zobrazit soubory pouze v B" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"Soubory\n" +"pouze v B" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "Zobrazit soubory pouze v C" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"Soubory\n" +"pouze v C" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Porovnat výlučně vybrané soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Sloučit výlučně vybrané soubory" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "Nedělat nic" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "Smazat A a B" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "Sloučit do A a B" + +#. +> trunk5 +#: fileaccess.cpp:885 +#, kde-format +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"Při pokusu o vytvoření zálohy selhalo odstraňování staré zálohy. \n" +"Název souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:892 +#, kde-format +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"Při pokusu o vytvoření zálohy selhalo přejmenování. \n" +"Název souboru: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:916 +#, kde-format +msgid "Getting file status: %1" +msgstr "Získávám stav souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:958 +#, kde-format +msgid "Reading file: %1" +msgstr "Načítám soubor: %1" + +#. +> trunk5 +#: fileaccess.cpp:996 +#, kde-format +msgid "Writing file: %1" +msgstr "Zapisuji soubor: %1" + +#. +> trunk5 +#: fileaccess.cpp:1029 +#, kde-format +msgid "Out of memory" +msgstr "Nedostatek paměti" + +#. +> trunk5 +#: fileaccess.cpp:1064 +#, kde-format +msgid "Making directory: %1" +msgstr "Vytvářím adresář: %1" + +#. +> trunk5 +#: fileaccess.cpp:1084 +#, kde-format +msgid "Removing directory: %1" +msgstr "Odstraňuji adresář: %1" + +#. +> trunk5 +#: fileaccess.cpp:1099 +#, kde-format +msgid "Removing file: %1" +msgstr "Odstraňuji soubor: %1" + +#. +> trunk5 +#: fileaccess.cpp:1115 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Vytvářím symbolický odkaz: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1143 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Přejmenovávám soubor: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1175 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Kopíruji soubor: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1189 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "" +"Chyba při operaci kopírování souboru: Otevírání souboru pro čtení selhalo. " +"Název souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:1195 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "" +"Chyba při operaci kopírování souboru: Otevírání souboru pro zápis selhalo. " +"Název souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:1207 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" +"Chyba při operaci kopírování souboru: Načítání selhalo. Název souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:1216 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Chyba při operaci kopírování souboru: Zápis selhal. Název souboru: %1" + +#. +> trunk5 +#: fileaccess.cpp:1499 +#, kde-format +msgid "Reading directory: %1" +msgstr "Načítám adresář: %1" + +#. +> trunk5 +#: fileaccess.cpp:1618 +#, kde-format +msgid "Listing directory: %1" +msgstr "Výpis adresáře: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "Aktuální nastavení:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "Chyba volby nastavení:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "Je použit parametr --auto, ale není zadán výstupní soubor." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "Parametr --auto je při porovnávání adresářů ignorován." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "Ukládání selhalo." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Otevření těchto souborů selhalo:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "Chyba otevírání souboru" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Otevře dokumenty pro porovnání..." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "Obnovit" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Uloží výsledek sloučení. Musí být vyřešeny všechny konflikty." + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "Uloží aktuální dokument jako..." + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "Vytisknout rozdíly" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "Ukončí aplikaci" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Vyjme současný výběr a umístí jej do schránky" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Zkopíruje vybranou sekci do schránky" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Vloží současný obsah schránky na aktuální pozici" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "Vybrat vše v aktuálním okně" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "Hledání řetězce" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "Další hledání řetězce" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Povolí/zakáže stavový panel" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "Nastavit: KDiff3..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "Přejít na aktuální rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Aktuální\n" +"rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "Přejít na první rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"První\n" +"rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "Přejít na poslední rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Poslední\n" +"rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" +"(Přeskočí rozdíly v mezerách pokud je vypnuta volba \"Zobrazit mezery\".)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "" +"(Does not skip white space differences even when \"Show White Space\" is " +"disabled.)" +msgstr "" +"(Nepřeskočí rozdíly v mezerách ani pokud je vypnuta volba \"Zobrazit mezery" +"\".)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Přejít na předchozí rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Předchozí\n" +"rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "Přejít na následující rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Následující\n" +"rozdíl" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Přejít na předchozí konflikt" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Předchozí\n" +"Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Přejít na následující konflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Následující\n" +"Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Přejít na předchozí nevyřešený konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Předchozí\n" +"Nevyřešeno" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Přejít na následující nevyřešený konflikt" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Následující\n" +"Nevyřešeno" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Vybrat řádky z A" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Zvolit\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Vybrat řádky z B" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Zvolit\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Vybrat řádky z C" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Zvolit\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Po výběru zdroje automaticky přejít na následující nevyřešený konflikt" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Automaticky\n" +"Následující" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "Show Space && Tabulator Characters" +msgstr "Zobrazit znaky mezer a tabulátorů" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"Bílé\n" +"znaky" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "Zobrazit mezery" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"Mezery\n" +"rozdíly" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "Zobrazit čísla řádků" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Řádky\n" +"čísla" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Všude zvolit A" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Všude zvolit B" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Všude zvolit C" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Zvolit A pro všechny nevyřešené konflikty" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Zvolit B pro všechny nevyřešené konflikty" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Zvolit C pro všechny nevyřešené konflikty" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Zvolit A pro všechny nevyřešené konflikty s mezerami" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Zvolit B pro všechny nevyřešené konflikty s mezerami" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Zvolit C pro všechny nevyřešené konflikty s mezerami" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Automaticky vyřešit jednoduché konflikty" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Všechny rozdíly považovat za konflikty" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Spustit regulární výraz automatického sloučení" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Automaticky vyřešit historii konfliktů" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Rozdělit rozdíl ve výběru" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Sloučit vybrané rozdíly" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "Zobrazit okno A" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "Zobrazit okno B" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "Zobrazit okno C" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "Normální přehled" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "Přehled A proti B" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "Přehled A proti C" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "Přehled B proti C" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Zalamovat řádky v porovnávacích oknech" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Ručně přidat zarovnání" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Odstranit všechna ručně přidaná zarovnání" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "Zaměřit následující okno" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "Zaostřit předchozí okno" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Přepnout orientaci rozdělení" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Zobrazit rozdělení obrazovky na adresáře a text" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Přepnout mezi zobrazením adresáře textu" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1928 +#, kde-format +msgid "The merge result has not been saved." +msgstr "Výsledek sloučení nebyl uložen." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "Uložit a ukončit" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "Ukončit bez uložení" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1939 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Uložení výsledku sloučení selhalo." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1027 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Právě probíhá sloučení adresářů. Opravdu si jej přejete ukončit?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "Ukládám soubor..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Ukládám soubor pod jiným názvem..." + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "Uložit jako..." + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "Tisk neimplementován" + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "Tisknu..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "Tisknu stránku %1 z %2" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, kde-format +msgid " (Selection)" +msgstr " (Výběr)" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "Tisk dokončen." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "Tisk přerušen." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "Ukončuji..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "Přepínání panelu nástrojů..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "Přepnout stavový panel..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, kde-format +msgid "KDiff3 Part" +msgstr "Komponenta KDiff3" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "Komponenta k zobrazování SVG obrázků" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "Copyright 2007, Aurélien Gâteau " + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, kde-format +msgid "Could not find files for comparison." +msgstr "Nelze nalézt soubory k porovnání." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "Nastavit: KDiff3" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:113 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" +"Nelze inicializovat úlohu KDiff3.\n" +"To je obvykle způsobeno problémem při instalaci. Podrobnosti si prosím " +"přečtěte v souboru README v balíčku se zdroji." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "S&oubor" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "&Adresář" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Operace sloučení aktuální položky" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Operace synchronizace aktuální položky" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, kde-format +msgid "M&ovement" +msgstr "P&ohyb" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "&Zobrazit rozdíly" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, kde-format +msgid "M&erge" +msgstr "Slouč&ení" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "O&kno" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Hlavní panel nástrojů" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Ignorováno (Nastaveno uživatelem)" + +#. +> trunk5 +#: main.cpp:117 +#, fuzzy, kde-format +#| msgid "64 bit" +msgid " (64 bit)" +msgstr "64 bit" + +#. +> trunk5 +#: main.cpp:119 +#, fuzzy, kde-format +#| msgid "32 bit" +msgid " (32 bit)" +msgstr "32 bit" + +#. +> trunk5 +#: main.cpp:120 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" + +#. +> trunk5 +#: main.cpp:121 +#, fuzzy, kde-format +#| msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve port do KF5/Qt5" + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Merge the input." +msgstr "Sloučit vstup." + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Výhradně základní soubor. Pro kompatibilitu s některými nástroji." + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Název výstupního souboru. Např.: -o novysoubor.txt" + +#. +> trunk5 +#: main.cpp:143 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Výstupní soubor znovu. (Kvůli kompatibilitě s určitými nástroji.)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" +"Nezobrazovat GUI, pokud jsou všechny konflikty řešitelné automaticky. " +"(Potřebuje -o soubor)" + +#. +> trunk5 +#: main.cpp:145 +#, kde-format +msgid "Do not solve conflicts automatically." +msgstr "Neřešit problémy automaticky." + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "Náhradní název pro vstupní soubor 1 (základní)." + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "Náhradní název pro vstupní soubor 2." + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "Náhradní název pro vstupní soubor 3." + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Alternativa náhradního názvu. Tato možnost se nabízí pro každý vstup." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "" +"Override a config setting. Use once for every setting. E.g.: --cs " +"\"AutoAdvance=1\"" +msgstr "" +"Přepsat konfiguraci. Použít pro každé nastavení. Např.: --cs " +"\"AutoAdvance=1\"" + +#. +> trunk5 +#: main.cpp:151 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "Zobrazit seznam všech nastavení a aktuálních hodnot." + +#. +> trunk5 +#: main.cpp:152 +#, kde-format +msgid "Use a different config file." +msgstr "Použít rozdílný konfigurační soubor." + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "první soubor k otevření (základní, pokud není zadáno pomocí --base)" + +#. +> trunk5 +#: main.cpp:156 +#, kde-format +msgid "file2 to open" +msgstr "druhý soubor k otevření" + +#. +> trunk5 +#: main.cpp:157 +#, kde-format +msgid "file3 to open" +msgstr "třetí soubor k otevření" + +#. +> trunk5 +#: main.cpp:168 +#, fuzzy, kde-format +#| msgctxt "@info:tooltip" +#| msgid "Probe for supported VBE resolutions." +msgid "See kdiff3 --help for supported options." +msgstr "Sondovat podporovaná rozlišení VBE." + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "" +"Počet zbývajících nevyřešených konfliktů: %1 (z nichž počet mezer je %2)" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Výstup byl pozměněn.\n" +"Pokud budete pokračovat, vaše změny budou ztraceny." + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:771 +#, kde-format +msgid "All input files are binary equal." +msgstr "Všechny vstupní soubory jsou binárně shodné." + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "Všechny vstupní soubory obsahují shodný text." + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Soubor %1 a %2 je binárně shodný.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Soubory %1 a %2 mají shodný text.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, kde-format +msgid "Conflicts" +msgstr "Konflikty" + +#. +> trunk5 +#: mergeresultwindow.cpp:1840 +#, kde-format +msgid "" +msgstr "<Žádný řádek ve frontě>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2934 +#, kde-format +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"Všechny konflikty nejsou vyřešeny.\n" +"Soubor nebyl uložen." + +#. +> trunk5 +#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 +#, kde-format +msgid "Conflicts Left" +msgstr "Zbývající konflikty" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, kde-format +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved." +msgstr "" +"Konflikt druhu konce řádku. Zvolte prosím druh konce řádku ručně.\n" +"Soubor nebyl uložen." + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Vytvoření zálohy selhalo. Soubor nebyl uložen." + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 +#, kde-format +msgid "File Save Error" +msgstr "Chyba ukládání souboru" + +#. +> trunk5 +#: mergeresultwindow.cpp:3005 +#, kde-format +msgid "Error while writing." +msgstr "Chyba při zápisu." + +#. +> trunk5 +#: mergeresultwindow.cpp:3365 +#, kde-format +msgid "Output:" +msgstr "Výstup:" + +#. +> trunk5 +#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 +#, kde-format +msgid "[Modified]" +msgstr "[Pozměněno]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3384 +#, kde-format +msgid "Encoding for saving:" +msgstr "Kódování pro uložení:" + +#. +> trunk5 +#: mergeresultwindow.cpp:3484 +#, kde-format +msgid "Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: mergeresultwindow.cpp:3516 +#, kde-format +msgid "Codec from A: %1" +msgstr "Kodek od A: %1" + +#. +> trunk5 +#: mergeresultwindow.cpp:3518 +#, kde-format +msgid "Codec from B: %1" +msgstr "Kodek od B: %1" + +#. +> trunk5 +#: mergeresultwindow.cpp:3520 +#, kde-format +msgid "Codec from C: %1" +msgstr "Kodek od C: %1" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "Změnit písmo" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" +"Písmo: %1, %2, %3\n" +"\n" +"Příklad:" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "" +"Pokud nejsou jiné než ASCII znaky správně zobrazeny, změňte tuto hodnotu." + +#. +> trunk5 +#: optiondialog.cpp:613 +#, kde-format +msgid "Configure" +msgstr "Nastavit" + +#. +> trunk5 +#: optiondialog.cpp:690 +#, kde-format +msgid "Font" +msgstr "Písmo" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Výstupní písmo editoru & porovnávání" + +#. +> trunk5 +#: optiondialog.cpp:710 +#, kde-format +msgid "Application font" +msgstr "Písmo aplikace" + +#. +> trunk5 +#: optiondialog.cpp:714 +#, kde-format +msgid "File view font" +msgstr "Písmo pro prohlížení souborů" + +#. +> trunk5 +#: optiondialog.cpp:732 +#, kde-format +msgid "Color" +msgstr "Barva" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Colors Settings" +msgstr "Nastavení barev" + +#. +> trunk5 +#: optiondialog.cpp:750 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Zobrazení editoru a porovnávání:" + +#. +> trunk5 +#: optiondialog.cpp:758 +#, kde-format +msgid "Foreground color:" +msgstr "Barva popředí:" + +#. +> trunk5 +#: optiondialog.cpp:765 +#, kde-format +msgid "Background color:" +msgstr "Barva pozadí:" + +#. +> trunk5 +#: optiondialog.cpp:774 +#, kde-format +msgid "Diff background color:" +msgstr "Barva pozadí rozdílů:" + +#. +> trunk5 +#: optiondialog.cpp:782 +#, kde-format +msgid "Color A:" +msgstr "Barva A:" + +#. +> trunk5 +#: optiondialog.cpp:790 +#, kde-format +msgid "Color B:" +msgstr "Barva B:" + +#. +> trunk5 +#: optiondialog.cpp:798 +#, kde-format +msgid "Color C:" +msgstr "Barva C:" + +#. +> trunk5 +#: optiondialog.cpp:805 +#, kde-format +msgid "Conflict color:" +msgstr "Barva konfliktů:" + +#. +> trunk5 +#: optiondialog.cpp:813 +#, kde-format +msgid "Current range background color:" +msgstr "Barva pozadí rozdílů v aktuální oblasti:" + +#. +> trunk5 +#: optiondialog.cpp:821 +#, kde-format +msgid "Current range diff background color:" +msgstr "Barva pozadí aktuální oblasti:" + +#. +> trunk5 +#: optiondialog.cpp:828 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Barva pro ručně upravené rozdíly oblasti:" + +#. +> trunk5 +#: optiondialog.cpp:834 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Zobrazení porovnání adresářů:" + +#. +> trunk5 +#: optiondialog.cpp:840 +#, kde-format +msgid "Newest file color:" +msgstr "Barva nejnovějšího souboru:" + +#. +> trunk5 +#: optiondialog.cpp:844 +#, kde-format +msgid "" +"Changing this color will only be effective when starting the next directory " +"comparison." +msgstr "" +"Změna této barvy je účinná pouze při spuštění porovnávání následujícího " +"adresáře." + +#. +> trunk5 +#: optiondialog.cpp:849 +#, kde-format +msgid "Oldest file color:" +msgstr "Barva nejstaršího souboru:" + +#. +> trunk5 +#: optiondialog.cpp:857 +#, kde-format +msgid "Middle age file color:" +msgstr "Barva středně starého souboru:" + +#. +> trunk5 +#: optiondialog.cpp:865 +#, kde-format +msgid "Color for missing files:" +msgstr "Barva chybějících souborů:" + +#. +> trunk5 +#: optiondialog.cpp:878 +#, kde-format +msgid "Editor" +msgstr "Editor" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor Behavior" +msgstr "Chování editoru" + +#. +> trunk5 +#: optiondialog.cpp:892 +#, kde-format +msgid "Tab inserts spaces" +msgstr "Tabulátor vloží mezery" + +#. +> trunk5 +#: optiondialog.cpp:895 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Vyp: Stisknutí tabulátoru vygeneruje příslušný počet míst.\n" +"Vyp: Bude vložen znak tabulátoru." + +#. +> trunk5 +#: optiondialog.cpp:900 +#, kde-format +msgid "Tab size:" +msgstr "Velikost tabulátoru:" + +#. +> trunk5 +#: optiondialog.cpp:906 +#, kde-format +msgid "Auto indentation" +msgstr "Automaticky odsadit" + +#. +> trunk5 +#: optiondialog.cpp:909 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Zap: Odsazení z předchozího řádku bude použito pro nový řádek.\n" + +#. +> trunk5 +#: optiondialog.cpp:912 +#, kde-format +msgid "Auto copy selection" +msgstr "Automaticky zkopírovat výběr" + +#. +> trunk5 +#: optiondialog.cpp:915 +#, fuzzy, kde-format +#| msgid "" +#| "On: Any selection is immediately written to the clipboard.\n" +#| "Off: You must explicitely copy e.g. via Ctrl-C." +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" +"Zap: Celý výběr je ihned vložen do schránky.\n" +"Vyp: Výběr musíte zkopírovat např.: pomocí Ctrl-C." + +#. +> trunk5 +#: optiondialog.cpp:929 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Zvolte kódování konce řádku při uložení editovaného souboru.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:939 +#, kde-format +msgid "Diff" +msgstr "Porovnávání" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff Settings" +msgstr "Nastavení porovnávání" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:964 +#, kde-format +msgid "Ignore numbers (treat as white space)" +msgstr "Ignorovat čísla (zacházet jako s prázdným místem)" + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Během průběhu srovnávání řádků ignoruje číselné znaky. (Podobné jako " +"Ignorovat prázdná místa.)\n" +"Může pomoci porovnávat soubory s číselnými znaky." + +#. +> trunk5 +#: optiondialog.cpp:971 +#, kde-format +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "Ignorovat komentáře C-C++ (zacházet jako s prázdným místem)" + +#. +> trunk5 +#: optiondialog.cpp:973 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Považuje komentáře C/C++ za prázdné místo." + +#. +> trunk5 +#: optiondialog.cpp:976 +#, kde-format +msgid "Ignore case (treat as white space)" +msgstr "Ignorovat velikost písmen (zacházet jako s prázdným místem)" + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" +"Nakládá s rozdíly malých a VELKÝCH písmen jako se změnami prázdných míst. " +"('a'<=>'A')" + +#. +> trunk5 +#: optiondialog.cpp:982 +#, kde-format +msgid "Preprocessor command:" +msgstr "Příkaz předběžného zpracování:" + +#. +> trunk5 +#: optiondialog.cpp:986 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" +"Uživatelsky nastavené předběžné zpracování. (Podrobnosti získáte v " +"dokumentaci.)" + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "Příkaz předběžného zpracování shody řádku:" + +#. +> trunk5 +#: optiondialog.cpp:993 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Toto předběžné zpracování je použito pouze při shodě řádku.\n" +"(Podrobnosti získáte v dokumentaci.)" + +#. +> trunk5 +#: optiondialog.cpp:996 +#, kde-format +msgid "Try hard (slower)" +msgstr "Důkladné hledání (pomalejší)" + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Pro externí porovnávání přidá parametr --minimal.\n" +"Analýza velkých souborů bude mnohem pomalejší." + +#. +> trunk5 +#: optiondialog.cpp:1003 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Přizpůsobit B a C pro 3 vstupní soubory" + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Zkusí přizpůsobit B a C při porovnávání nebo slučování třech vstupních " +"souborů.\n" +"Pro slučování se nedoporučuje, protože sloučení může způsobit více " +"komplikací.\n" +"(Výchozí ve vypnuto.)" + +#. +> trunk5 +#: optiondialog.cpp:1018 +#, kde-format +msgid "Merge Settings" +msgstr "Nastavení sloučení" + +#. +> trunk5 +#: optiondialog.cpp:1032 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Zpoždění pro automatický posun:" + +#. +> trunk5 +#: optiondialog.cpp:1037 +#, kde-format +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 "" +"V režimu automatického posunu bude před přechodem na následující konflikt \n" +"zobrazen aktuální výběr po zadaný počet sekund. Rozsah: 0-2000ms" + +#. +> trunk5 +#: optiondialog.cpp:1041 +#, kde-format +msgid "Show info dialogs" +msgstr "Zobrazit informační dialogy" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Zobrazí dialog s informacemi o počtu konfliktů." + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "Výchozí (hodnota) pro mezery při sloučení dvou souborů:" + +#. +> trunk5 +#: optiondialog.cpp:1050 optiondialog.cpp:1062 +#, kde-format +msgid "Manual Choice" +msgstr "Zvolit ručně" + +#. +> trunk5 +#: optiondialog.cpp:1054 optiondialog.cpp:1067 +#, kde-format +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" +"Umožní slučovacímu algoritmu automaticky zvolit vstup pouze pro změny " +"prázdných míst." + +#. +> trunk5 +#: optiondialog.cpp:1058 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "Výchozí (hodnota) pro mezery při sloučení třech souborů:" + +#. +> trunk5 +#: optiondialog.cpp:1071 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "Automatické sloučení regulárních výrazů" + +#. +> trunk5 +#: optiondialog.cpp:1079 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "Automaticky sloučit regulární výraz:" + +#. +> trunk5 +#: optiondialog.cpp:1083 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one " +"source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Regulární výraz pro řádky, kde by měl KDiff3 automaticky zvolit zdroj.\n" +"Pokud řádek s konfliktem odpovídá regulárnímu výrazu, pak bude vybrán C,\n" +"pokud je dostupný, v opačném případě B." + +#. +> trunk5 +#: optiondialog.cpp:1089 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "Spustit regulární výraz automatického sloučení při spuštění sloučení" + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Spustí automatické sloučení regulárních výrazů\n" +"ihned při spuštění sloučení.\n" + +#. +> trunk5 +#: optiondialog.cpp:1096 +#, kde-format +msgid "Version Control History Merging" +msgstr "Sloučení historie správy verzí" + +#. +> trunk5 +#: optiondialog.cpp:1104 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "Historie spuštění regulárních výrazů:" + +#. +> trunk5 +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Regulární výraz pro spuštění záznamů historie správy verzí.\n" +"Obvykle tento řádek obsahuje klíčové slovo \"$Log$\".\n" +"Výchozí hodnota: \".*\\$Log.*\\$.*\"" + +#. +> trunk5 +#: optiondialog.cpp:1114 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "Regulární výraz pro záznamy historie spouštění:" + +#. +> trunk5 +#: optiondialog.cpp:1126 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading " +"comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" +"See the documentation for details." +msgstr "" +"Záznamy historie správy verzí se skládají z několika řádků.\n" +"Zadejte regulární výraz k rozeznání prvního řádku (bez úvodního komentáře).\n" +"Pro seskupení klíčů, které zvolíte k setřídění použijte závorky.\n" +"Pokud zůstane prázdné, předpokládá KDiff3, že prázdné řádky oddělují záznamy " +"historie.\n" +"Podrobnosti získáte v dokumentaci." + +#. +> trunk5 +#: optiondialog.cpp:1134 +#, kde-format +msgid "History merge sorting" +msgstr "Seřadit historii sloučení" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "Sort version control history by a key." +msgstr "Seřadit historii správy verzí podle klíče." + +#. +> trunk5 +#: optiondialog.cpp:1146 +#, kde-format +msgid "History entry start sort key order:" +msgstr "Klíč k setřídění záznamů historie spuštění:" + +#. +> trunk5 +#: optiondialog.cpp:1150 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history " +"start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Každý pár závorek použitých v regulárním výrazu pro záznam historie " +"spuštění\n" +"seskupuje klíč, který lze použít pro setřídění.\n" +"Zadejte seznam klíčů (číslovaný dle počtu výskytů začínající od 1)\n" +" oddělený ',' (např. \"4,5,6,1,2,3,7\").\n" +"Pokud zůstane prázdné, potom k setřídění nedojde.\n" +"Podrobnosti získáte v dokumentaci." + +#. +> trunk5 +#: optiondialog.cpp:1161 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "Při spuštění sloučení sloučit historii správy verzí" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "" +"Při spuštění sloučení spustí automatické sloučení historie správy verzí." + +#. +> trunk5 +#: optiondialog.cpp:1167 +#, kde-format +msgid "Max number of history entries:" +msgstr "Maximální počet záznamů historie:" + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Po zadaném čísle odstřihnout. Číslo -1 znamená nekonečno položek." + +#. +> trunk5 +#: optiondialog.cpp:1174 +#, kde-format +msgid "Test your regular expressions" +msgstr "Vyzkoušet vaše regulární výrazy" + +#. +> trunk5 +#: optiondialog.cpp:1179 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "Příkaz při irelevantním sloučení:" + +#. +> trunk5 +#: optiondialog.cpp:1183 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Při zvolení bude po automatickém sloučení spuštěn tento skript,\n" +"pokud nebudou zjištěny další relevantní změny.\n" +"Voláno s parametry: NázevSouboru1 NázevSouboru3 NázevSouboru3" + +#. +> trunk5 +#: optiondialog.cpp:1188 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "Automaticky uložit a ukončit při sloučení bez konfliktů" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Pokud je KDiff3 pro sloučení souboru spuštěn z příkazového řádku a všechny\n" +"konflikty jsou vyřešeny bez zásahu uživatele, pak bude uložení a ukončení " +"automatické.\n" +"(Podobně jako volba příkazového řádku \"--auto\".)" + +#. +> trunk5 +#: optiondialog.cpp:1202 optiondialog.cpp:1203 +#, kde-format +msgid "Directory" +msgstr "Adresář" + +#. +> trunk5 +#: optiondialog.cpp:1215 +#, kde-format +msgid "Recursive directories" +msgstr "Rekurzivní adresáře" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Zda analyzovat podadresáře, nebo nikoliv." + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "File pattern(s):" +msgstr "Maska souborů:" + +#. +> trunk5 +#: optiondialog.cpp:1224 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Maska souborů, které mají být analyzovány.\n" +"Zástupné znaky: '*' a '?'\n" +" Více šablon lze zadat při použití oddělovače: ';'" + +#. +> trunk5 +#: optiondialog.cpp:1229 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "Anti-maska souborů:" + +#. +> trunk5 +#: optiondialog.cpp:1234 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Maska souborů, které mají být vyřazeny z analýzy.\n" +"Zástupné znaky: '*' a '?'\n" +" Více šablon lze zadat při použití oddělovače: ';'" + +#. +> trunk5 +#: optiondialog.cpp:1239 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "Anti-maska adresářů:" + +#. +> trunk5 +#: optiondialog.cpp:1244 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Maska adresářů, které mají být vyřazeny z analýzy.\n" +"Zástupné znaky: '*' a '?'\n" +" Více šablon lze zadat při použití oddělovače: ';'" + +#. +> trunk5 +#: optiondialog.cpp:1249 +#, kde-format +msgid "Use .cvsignore" +msgstr "Použít .cvsignore" + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Rozšiřuje anti-masku na vše co by CVS ignoroval.\n" +"Pomocí souborů \".cvsignore\" může být zvolen adresář." + +#. +> trunk5 +#: optiondialog.cpp:1256 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Prohledat skryté soubory a adresáře" + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Prohledá soubory a adresáře s atributem Skrytý." + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Prohledá soubory a adresáře začínající tečkou." + +#. +> trunk5 +#: optiondialog.cpp:1265 +#, kde-format +msgid "Follow file links" +msgstr "Sledovat odkazy souborů" + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Zap: Porovná soubor na který odkaz ukazuje.\n" +"Vyp: Porovná odkazy." + +#. +> trunk5 +#: optiondialog.cpp:1272 +#, kde-format +msgid "Follow directory links" +msgstr "Sledovat odkazy adresářů" + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Zap: Porovná adresář na který odkaz ukazuje.\n" +"Vyp: Porovná odkazy." + +#. +> trunk5 +#: optiondialog.cpp:1290 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Při porovnávání rozlišovat VELKÁ/malá písmena v názvu souboru" + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names " +"match.\n" +"Set this option if the case of the names must match. (Default for Windows is " +"off, otherwise on.)" +msgstr "" +"Porovnávání adresářů bude porovnávat soubory a adresáře v případě, že se " +"jejich názvy shodují.\n" +"Volbu nastavte, pokud se názvy musí shodovat. (Výchozí pro Windows je Vyp., " +"v ostatních případech Zap.)" + +#. +> trunk5 +#: optiondialog.cpp:1297 +#, kde-format +msgid "Unfold all subdirectories on load" +msgstr "Rozbalit při načtení všechny podsložky" + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1304 +#, kde-format +msgid "Skip directory status report" +msgstr "Přeskočit hlášení stavu adresáře" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1311 +#, kde-format +msgid "File Comparison Mode" +msgstr "Režim porovnávání souborů" + +#. +> trunk5 +#: optiondialog.cpp:1316 +#, kde-format +msgid "Binary comparison" +msgstr "Binární porovnávání" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Binárně porovnává každý soubor. (Výchozí)" + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, kde-format +msgid "Full analysis" +msgstr "Důkladná analýza" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Provede důkladnou analýzu a zobrazí statistické informace ve zvláštních " +"sloupcích.\n" +"(Pomalejší než binární porovnávání, mnohem pomalejší pro binární soubory.)" + +#. +> trunk5 +#: optiondialog.cpp:1325 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Důvěřovat velikosti a datu změny (nejisté)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Předpokládá se, že soubory jsou shodné, pokud se shoduje jejich datum změny " +"a velikost.\n" +"Soubory se stejným obsahem, ale rozdílným datumem změny. budou považovány za " +"rozdílné.\n" +"Vhodné pro velké adresáře, nebo pomalé sítě." + +#. +> trunk5 +#: optiondialog.cpp:1331 +#, kde-format +msgid "" +"Trust the size and date, but use binary comparison if date does not match " +"(unsafe)" +msgstr "" +"Důvěřovat velikosti a datu, ale pokud se datum neshoduje, porovnat binárně " +"(nejisté)" + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Předpokládá se, že soubory jsou shodné, pokud se shoduje jejich délka a " +"datum změny.\n" +"Pokud se datumy neshodují, ale velikost ano, bude použito binární " +"porovnávání.\n" +"Vhodné pro velké adresáře, nebo pomalé sítě." + +#. +> trunk5 +#: optiondialog.cpp:1337 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Důvěřovat velikosti (nejisté)" + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during " +"download." +msgstr "" +"Předpokládá se, že soubory jsou shodné, pokud je shodná jejich délka.\n" +"Vhodné pro velké adresáře, nebo pomalé sítě, pokud bude datum upraven při " +"stahování." + +#. +> trunk5 +#: optiondialog.cpp:1345 +#, kde-format +msgid "Synchronize directories" +msgstr "Synchronizovat adresáře" + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Nabízí uložení souborů v obou adresářích,\n" +"takže jsou potom oba adresáře stejné.\n" +"Funguje pouze při porovnávání dvou adresářů bez určení cíle." + +#. +> trunk5 +#: optiondialog.cpp:1354 +#, kde-format +msgid "White space differences considered equal" +msgstr "Při rozdílech v mezerách pokládat za shodné" + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Pokud se soubory liší pouze v mezerách, považují se za shodné.\n" +"Aktivní pouze pokud je vybrána volba Důkladná analýza." + +#. +> trunk5 +#: optiondialog.cpp:1363 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Kopírovat novější namísto sloučení (nejisté)" + +#. +> trunk5 +#: optiondialog.cpp:1366 +#, kde-format +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"Nedívat se dovnitř souboru, ale použít novější soubor.\n" +"(Použít jen pokud víte co děláte.)\n" +"Účinné pouze při porovnávání dvou adresářů." + +#. +> trunk5 +#: optiondialog.cpp:1371 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Zálohovat soubory (.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Pokud by byl soubor uložen přes starý soubor, pak bude původní soubor\n" +"uložen s příponou '.orig' místo toho, aby byl smazán." + +#. +> trunk5 +#: optiondialog.cpp:1450 optiondialog.cpp:1451 +#, kde-format +msgid "Regional Settings" +msgstr "Místní nastavení" + +#. +> trunk5 +#: optiondialog.cpp:1465 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Použít stejné kódování pro všechny:" + +#. +> trunk5 +#: optiondialog.cpp:1468 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Zapnout, pokud si přejete změnit všechna kódování pouze podle změny " +"prvního.\n" +"Vypnout, pokud je požadováno rozdílné nastavení." + +#. +> trunk5 +#: optiondialog.cpp:1472 +#, kde-format +msgid "Note: Local Encoding is \"%1\"" +msgstr "Pozn.: Místní kódování je \"%1\"" + +#. +> trunk5 +#: optiondialog.cpp:1476 +#, kde-format +msgid "File Encoding for A:" +msgstr "Kódování souboru A:" + +#. +> trunk5 +#: optiondialog.cpp:1482 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as " +"fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Pokud je volba zapnuta, bude rozeznáno kódování Unicode (UTF-16 a UTF-8).\n" +"Pokud není soubor Unicode, pak bude vybrané kódování použito jako náhradní.\n" +"(Detekce Unicode závisí na prvním bajtu souboru.)" + +#. +> trunk5 +#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Automaticky rozeznat Unicode" + +#. +> trunk5 +#: optiondialog.cpp:1490 +#, kde-format +msgid "File Encoding for B:" +msgstr "Kódování souboru B:" + +#. +> trunk5 +#: optiondialog.cpp:1499 +#, kde-format +msgid "File Encoding for C:" +msgstr "Kódování souboru C:" + +#. +> trunk5 +#: optiondialog.cpp:1508 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Kódování souboru pro výstup sloučení a uložení:" + +#. +> trunk5 +#: optiondialog.cpp:1512 +#, kde-format +msgid "Auto Select" +msgstr "Automaticky vybrat" + +#. +> trunk5 +#: optiondialog.cpp:1515 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for " +"saving." +msgstr "" +"Pokud je volba zapnuta, bude použito kódování ze vstupního souboru.\n" +"V nejasných případech bude uživatel dotázán dialogem na výběr kódování pro " +"uložení." + +#. +> trunk5 +#: optiondialog.cpp:1518 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Kódování souboru pro soubory předběžného zpracování:" + +#. +> trunk5 +#: optiondialog.cpp:1529 +#, kde-format +msgid "Right To Left Language" +msgstr "Jazyky čtené zprava doleva" + +#. +> trunk5 +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Některé jazyky se čtou zprava doleva.\n" +"Tato volba podle toho upraví prohlížeč a editor." + +#. +> trunk5 +#: optiondialog.cpp:1542 +#, kde-format +msgid "Integration" +msgstr "Integrace" + +#. +> trunk5 +#: optiondialog.cpp:1543 +#, kde-format +msgid "Integration Settings" +msgstr "Nastavení integrace" + +#. +> trunk5 +#: optiondialog.cpp:1556 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Ignorovat volby příkazového řádku:" + +#. +> trunk5 +#: optiondialog.cpp:1561 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by " +"other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Seznam voleb příkazového řádku, které by měly být ignorovány, pokud je " +"KDiff3 používán jinými nástroji.\n" +"Může být použito několik hodnot pokud jsou odděleny ';'\n" +"Tímto bude potlačena chyba \"Unknown option\"." + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Ukončit také klávesou Escape" + +#. +> trunk5 +#: optiondialog.cpp:1569 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Rychlý způsob ukončení.\n" +"Pro ty, kteří jsou zvyklí používat klávesu Escape." + +#. +> trunk5 +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "Budou obnovena všechna nastavení. Nikoliv pouze aktuální téma." + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Chyba ztráty dat:\n" +"Pokud lze chybu reprodukovat, kontaktujte autora.\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "Závažná interní chyba" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Příkaz předběžného zpracování: " + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "Následující vámi vybraná volba může změnit data:\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Pravděpodobně není během slučování požadováno.\n" +"Přejete si toto nastavení vypnout, nebo pokračovat s tímto nastavením " +"aktivním?" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Volba je pro slučování nejistá" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Použít tuto volbu během slučování" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Zakázat nebezpečné volby" + +#. +> trunk5 +#: pdiff.cpp:170 +#, kde-format +msgid "Loading A" +msgstr "Načítám A" + +#. +> trunk5 +#: pdiff.cpp:177 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file A." +msgstr "Při zpracovávání fronty nastala chyba.\n" + +#. +> trunk5 +#: pdiff.cpp:181 +#, kde-format +msgid "Loading B" +msgstr "Načítám B" + +#. +> trunk5 +#: pdiff.cpp:188 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file B." +msgstr "Při zpracovávání fronty nastala chyba.\n" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Rozdíly: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Rozdíly řádků: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:223 +#, kde-format +msgid "Loading C" +msgstr "Načítám C" + +#. +> trunk5 +#: pdiff.cpp:230 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file C." +msgstr "Při zpracovávání fronty nastala chyba.\n" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Rozdíly: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Rozdíly: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Rozdíly řádků: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Rozdíly řádků: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:773 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "" +"Všechny vstupní soubory obsahují stejný text, ale nejsou binárně shodné." + +#. +> trunk5 +#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Soubor %1 a %2 obsahuje stejný text, ale není binárně shodný. \n" + +#. +> trunk5 +#: pdiff.cpp:797 +#, kde-format +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"Některé vstupní soubory nevypadají jako čistě textové soubory.\n" +"Vezměte na vědomí, že slučování v KDiff3 nebylo myšleno pro binární data.\n" +"Pokračování na vlastní riziko." + +#. +> trunk5 +#: pdiff.cpp:807 +#, fuzzy, kde-format +#| msgid ", " +msgid ", B" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:809 +#, fuzzy, kde-format +#| msgid ", " +msgid ", C" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:811 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Některé vstupní znaky nemohly být převedeny do platného unicode.\n" +"Možná používáte špatný převodník (např. UTF-8 pro soubory v ne-UTF-8).\n" +"Neukládejte výsledek, pokud si nejste jisti. Pokračujte na vlastní riziko.\n" +"Dotčené vstupní soubory jsou v %1." + +#. +> trunk5 +#: pdiff.cpp:1029 +#, kde-format +msgid "Abort" +msgstr "Přerušit" + +#. +> trunk5 +#: pdiff.cpp:1035 pdiff.cpp:1123 +#, kde-format +msgid "Opening files..." +msgstr "Otevírám soubory..." + +#. +> trunk5 +#: pdiff.cpp:1100 pdiff.cpp:1171 +#, kde-format +msgid "File open error" +msgstr "Chyba otevírání souboru" + +#. +> trunk5 +#: pdiff.cpp:1210 +#, kde-format +msgid "Cutting selection..." +msgstr "Vyjímám výběr..." + +#. +> trunk5 +#: pdiff.cpp:1231 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Kopíruji výběr do schránky..." + +#. +> trunk5 +#: pdiff.cpp:1247 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Vkládám obsah schránky..." + +#. +> trunk5 +#: pdiff.cpp:1718 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1719 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "Počítám maximální šířku pro vodorovný posuvník" + +#. +> trunk5 +#: pdiff.cpp:1930 +#, kde-format +msgid "Save && Continue" +msgstr "Uložit a pokračovat" + +#. +> trunk5 +#: pdiff.cpp:1931 +#, kde-format +msgid "Continue Without Saving" +msgstr "Pokračovat bez ukládání" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search complete." +msgstr "Vyhledávání dokončeno." + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search Complete" +msgstr "Vyhledávání dokončeno" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Není nic vybráno v žádném vstupním okně rozdílů." + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Chyba ručního přidávání rozsahu k porovnání" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "Z&rušit" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (základní):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "Soubor..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Adresář..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (nepovinné):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, kde-format +msgid "Swap/Copy Names..." +msgstr "Prohodit/kopírovat názvy ..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Prohodit %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Kopírovat %1->Výstup" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Prohodit %1<->Výstup" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Výstup (nepovinné):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Nastavit..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, kde-format +msgid "Open Directory" +msgstr "Otevřít adresář" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format +msgid "Select Output File" +msgstr "Vyberte výstupní soubor" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Hledat text:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Rozlišovat VELKÁ/malá" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Prohledat A" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Prohledat B" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Prohledat C" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Prohledat výstup" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Hledat" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Testovat regulární výraz" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Příklad řádku automatického sloučení:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "" +"Pro vyzkoušení automatického sloučení zkopírujte řádek z vašeho souboru." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Výsledek shody:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Příklad počátečního řádku historie (včetně úvodního komentáře):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Zkopírujte úvodní řádek historie z vašeho souboru\n" +"včetně úvodního komentáře." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Klíč k setřídění historie:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "Příklad počátečního řádku záznamů historie (bez úvodního komentáře):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Zkopírujte úvodní řádek záznamů historie z vašeho souboru,\n" +"avšak vynechte úvodní komentář." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "Výsledek klíče k setřídění:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Shoda úspěšná." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Shoda selhala." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Levé a pravé závorky se do regulárního výrazu nehodí." Index: trunk/l10n-support/cs/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/cs/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/cs/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,108 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Vít Pelčák , 2011, 2013, 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2018-06-11 12:45+0100\n" +"Last-Translator: Vit Pelcak \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 2.0\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, kde-format +msgid "KDiff3..." +msgstr "KDiff3..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Porovnat s %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Sloučit s %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Uložit '%1' na později" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "Trojcestné sloučení se základem" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, kde-format +msgid "Compare with..." +msgstr "Porovnat s..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Vymazat seznam" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Porovnat" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "Trojcestné porovnání" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, kde-format +msgid "About KDiff3 menu plugin..." +msgstr "O modulu nabídky KDiff3..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, kde-format +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It " +"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " +"the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and " +"choose \"3-way merge with base\" on the other branch which will be used as " +"destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "" Index: trunk/l10n-support/cs/summit/messages/kdereview/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/cs/summit/messages/kdereview/org.kde.kdiff3.appdata.po (nonexistent) +++ trunk/l10n-support/cs/summit/messages/kdereview/org.kde.kdiff3.appdata.po (revision 1522187) @@ -0,0 +1,86 @@ +# Vit Pelcak , 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2018-07-11 09:18+0200\n" +"PO-Revision-Date: 2018-07-11 16:13+0100\n" +"Last-Translator: Vit Pelcak \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 2.0\n" + +#. (itstool) path: component/name +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:6 +msgid "KDiff3" +msgstr "KDiff3" + +#. (itstool) path: component/summary +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:7 +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" + +#. (itstool) path: description/p +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:11 +msgid "KDiff3 is a file and directory diff and merge tool which" +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:13 +msgid "compares and merges two or three text input files or directories," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:14 +msgid "shows the differences line by line and character by character(!)," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:15 +msgid "provides an automatic merge-facility," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:16 +msgid "has an editor for comfortable solving of merge-conflicts," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:17 +msgid "provides network transparency via KIO," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:18 +msgid "has options to highlight or hide changes in white-space or comments," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:19 +msgid "supports Unicode, UTF-8 and other file encodings," +msgstr "podporuje Unicode, UTF-8 a další kódování souborů." + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:20 +msgid "prints differences," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:21 +msgid "supports version control keyword and history merging." +msgstr "" Index: trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4066 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2013, 2014, 2015, 2017, 2018. -# Tomáš Chvátal , 2012, 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: trunk_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-07 09:31+0200\n" -"PO-Revision-Date: 2018-07-11 16:11+0100\n" -"Last-Translator: Vit Pelcak \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Zdeněk Pech" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "dom.toretto@seznam.cz" - -#. +> trunk5 -#: diff.cpp:258 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "Zápis dat schránky do dočasného souboru selhal." - -#. +> trunk5 -#: diff.cpp:262 -#, kde-format -msgid "From Clipboard" -msgstr "Ze schránky" - -#. +> trunk5 -#: diff.cpp:563 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Očekávána mezera po ukončující uvozovce." - -#. +> trunk5 -#: diff.cpp:566 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Nebyly nalezeny odpovídající uvozovky." - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Neočekávaný apostrof uvnitř argumentu." - -#. +> trunk5 -#: diff.cpp:595 -#, kde-format -msgid "No program specified." -msgstr "Nebyl zadán program." - -#. +> trunk5 -#: diff.cpp:710 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Předběžné zpracování zřejmě selhalo. Zkontrolujte příkaz:\n" -"\n" -" %1\n" -"\n" -"Příkaz předběžného zpracování bude nyní vypnut." - -#. +> trunk5 -#: diff.cpp:757 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Předběžné zpracování shody řádku zřejmě selhalo. Zkontrolujte příkaz:\n" -"\n" -" %1\n" -"\n" -"Příkaz předběžného zpracování shody řádku bude nyní vypnut." - -#. +> trunk5 -#: diff.cpp:784 -#, fuzzy, kde-format -#| msgid "Failed to load processed image." -msgid "File %1 too large to process. Skipping." -msgstr "Načítání obrázků ke zpracování se nezdařilo." - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line %2" -msgstr "Soubor %1: Řádek %2" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, kde-format -msgid "File %1: Line not available" -msgstr "Soubor %1: Řádek není dostupný" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, kde-format -msgid "Encoding:" -msgstr "Kódování:" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 -#, kde-format -msgid "Line end style:" -msgstr "Styl konce řádku:" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 -#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 -#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 -#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 -#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 -#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 -#: smalldialogs.cpp:126 smalldialogs.cpp:129 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 -#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 -#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 -#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 -#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 -#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 -#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 -#: smalldialogs.cpp:127 smalldialogs.cpp:130 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 -#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 -#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 -#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 -#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 -#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: difftextwindow.cpp:1858 -#, fuzzy, kde-format -#| msgid "A (Base):" -msgid "A (Base)" -msgstr "A (základní):" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, kde-format -msgid "Encoding: %1" -msgstr "Kódování: %1" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, kde-format -msgid "Line end style: %1" -msgstr "Styl konce řádku: %1" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "Horní řádek" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, kde-format -msgid "End" -msgstr "Konec" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, kde-format -msgid "Open File" -msgstr "Otevřít soubor" - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 bit" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, kde-format -msgid "Other" -msgstr "Jiné" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "Nevyřešeno" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "Vyřešeno" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "Nebílý" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "Bílá" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "Zkopírovat A do B" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "Zkopírovat B do A" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "Smazat A" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "Smazat B" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Smazat A a B" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "Sloučit do A" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "Sloučit do B" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Sloučit do A a B" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "Smazat (pokud existuje)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Sloučení" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Sloučit (ručně)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Chyba: Konflikt typů souborů" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Chyba: Změněno a smazáno" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Chyba: Data jsou shodná, ale soubory nikoliv." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, kde-format -msgid "Done" -msgstr "Hotovo" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "Chyba" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Přeskočeno." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Neuloženo." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "Probíhá..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "Udělat." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "Jméno" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "Operace" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "Stav" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Směs odkazů a běžných souborů." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Odkaz: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Velikost" - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Datum a velikost: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Vytváření dočasné kopie %1 selhalo." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Otevření %1 selhalo." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Porovnávám soubory..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Chyba načítání z %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort " -"the merge and rescan the directory?" -msgstr "" -"Právě probíhá slučování adresářů. Opravdu si přejete slučování ukončit a " -"znovu prohledat adresář?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 -#, kde-format -msgid "Warning" -msgstr "Varování" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "Znovu prohledat" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1030 -#, kde-format -msgid "Continue Merging" -msgstr "Pokračovat se slučováním" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Otevírání adresářů selhalo:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Adresář A \"%1\" neexistuje nebo není adresářem.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Adresář B \"%1\" neexistuje nebo není adresářem.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Adresář C \"%1\" neexistuje nebo není adresářem.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Chyba otvírání adresáře" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three " -"directories are merged.\n" -"Check again before continuing." -msgstr "" -"Cílový adresář nesmí být při slučování tří adresářů shodný s A nebo B.\n" -"Před pokračováním proveďte kontrolu." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Varování - parametr" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Prohledávání adresářů..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Načítání adresáře A" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Načítání adresáře B" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Načítání adresáře C" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Některé podadresáře byly nečitelné v" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Zkontrolujte oprávnění podadresářů." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 -#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 -#, kde-format -msgid "Ready." -msgstr "Připraven." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, kde-format -msgid "Number of manual merges: %1" -msgstr "Počet ručních sloučení: %1" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "Toto ovlivňuje všechny operace slučování." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Změna všech operací sloučení" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, kde-format -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "" -"Zpracovává se soubor %1 / %2\n" -"%3" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Tuto operaci nelze nyní provést." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "Operaci nelze provést" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, kde-format -msgid "An error occurred while copying." -msgstr "Během kopírování došlo k chybě." - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "Chyba slučování" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát.)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "Neznámá slučovací operace." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" -"Sloučení může začít.\n" -"\n" -"Zvolte \"Provést\" pokud jste si přečetli instrukce a máte dělat.\n" -"Zvolením \"Simulovat\" vám bude sděleno, co by se mělo stát.\n" -"\n" -"Uvědomte si, že tento program je stále ve stavu beta a proto není vůbec " -"žádná ZÁRUKA vaše důležitá data si zazálohujte." - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "Spouští se sloučení" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "Provést" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "Simulovat" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "" -"The highlighted item has a different type in the different directories. " -"Select what to do." -msgstr "Zvýrazněná položka je jiného typu v jiném adresáři. Zvolte co udělat." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "" -"The modification dates of the file are equal but the files are not. Select " -"what to do." -msgstr "Datum změny souboru je shodné, soubory však nikoliv. Zvolte co udělat." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "" -"The highlighted item was changed in one directory and deleted in the other. " -"Select what to do." -msgstr "" -"Zvýrazněná položka byla pozměněna v jednom adresáři a v druhém byla smazána. " -"Zvolte co udělat." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "" -"This operation is currently not possible because directory merge is " -"currently running." -msgstr "" -"Tato operace není nyní možná, protože slučování adresáře právě probíhá." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" -"V posledním kroku došlo k chybě.\n" -"Přejete si pokračovat s položkou, která chybu způsobila, nebo si přejete " -"položku přeskočit?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "Pokračovat se slučováním po chybě" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "Pokračovat s poslední položkou" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "Přeskočit položku" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "Operace sloučení dokončena." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "Slučování dokončeno" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" -"Simulované sloučení dokončeno: Ověřte si, zda souhlasíte s navrženými " -"operacemi." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, kde-format -msgid "An error occurred. Press OK to see detailed information." -msgstr "Vyskytla se chyba. Podrobné informace uvidíte po stisknutí OK." - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Chyba: při mazání %1: Vytvoření zálohy selhalo." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "smazat adresář rekurzivně( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "odstranit( %1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Chyba: operace mazání adresáře selhala při pokusu načítání adresáře." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Chyba: operace smazat adresář( %1 ) selhala." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Chyba: operace mazání selhala." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "ručně sloučit( %1, %2, %3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid "" -" Note: After a manual merge the user should continue by pressing F7." -msgstr "Pozn.: Po ručním slučování by měl uživatel pokračovat stiskem F7." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"Chyba: Kopírování ( %1 -> %2 ) selhalo. Existující cíl nelze odstranit." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "Kopírovat odkaz ( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" -"Chyba: kopírování odkazu selhalo: Vzdálené odkazy nejsou nyní podporovány." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Chyba: kopírování odkazu selhalo." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "kopírovat( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Chyba při přejmenování ( %1 -> %2 ): Existující cíl nelze odstranit." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "přejmenovat( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "Chyba: Přejmenování selhalo." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Chyba při vytvoření adresáře %1. Nelze odstranit existující soubor." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "Vytvořit adresář ( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "Chyba při vytvoření adresáře." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "Cíl" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "Adresář" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "Typ" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "Velikost" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "Atributy" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "Poslední změna" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "Cíl odkazu" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "Soubor" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -#| msgid "Link" -msgid "-Link" -msgstr "Odkaz" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "nedostupný" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (cíl): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (základní): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (cíl): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (cíl): " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "Cíl: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Uložit stav sloučení adresáře jako..." - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Spustit / pokračovat ve sloučení adresářů" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Spustit operaci pro aktuální položku" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "Porovnat vybraný soubor" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "Sloučit aktuální soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Sloučit\n" -"Soubor" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Sbalit všechny podadresáře" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Rozbalit všechny podadresáře" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "Zvolit A pro všechny položky" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "Zvolit B pro všechny položky" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "Zvolit C pro všechny položky" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Automaticky zvolit operaci pro všechny položky" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "Žádná operace pro všechny položky" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "Zobrazit identické soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"Shodné\n" -"Soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "Zobrazit rozdílné soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "Zobrazit soubory pouze v A" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"Soubory\n" -"pouze v A" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "Zobrazit soubory pouze v B" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"Soubory\n" -"pouze v B" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "Zobrazit soubory pouze v C" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"Soubory\n" -"pouze v C" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Porovnat výlučně vybrané soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Sloučit výlučně vybrané soubory" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "Nedělat nic" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "Smazat A a B" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "Sloučit do A a B" - -#. +> trunk5 -#: fileaccess.cpp:885 -#, kde-format -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"Při pokusu o vytvoření zálohy selhalo odstraňování staré zálohy. \n" -"Název souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:892 -#, kde-format -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"Při pokusu o vytvoření zálohy selhalo přejmenování. \n" -"Název souboru: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:916 -#, kde-format -msgid "Getting file status: %1" -msgstr "Získávám stav souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:958 -#, kde-format -msgid "Reading file: %1" -msgstr "Načítám soubor: %1" - -#. +> trunk5 -#: fileaccess.cpp:996 -#, kde-format -msgid "Writing file: %1" -msgstr "Zapisuji soubor: %1" - -#. +> trunk5 -#: fileaccess.cpp:1029 -#, kde-format -msgid "Out of memory" -msgstr "Nedostatek paměti" - -#. +> trunk5 -#: fileaccess.cpp:1064 -#, kde-format -msgid "Making directory: %1" -msgstr "Vytvářím adresář: %1" - -#. +> trunk5 -#: fileaccess.cpp:1084 -#, kde-format -msgid "Removing directory: %1" -msgstr "Odstraňuji adresář: %1" - -#. +> trunk5 -#: fileaccess.cpp:1099 -#, kde-format -msgid "Removing file: %1" -msgstr "Odstraňuji soubor: %1" - -#. +> trunk5 -#: fileaccess.cpp:1115 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Vytvářím symbolický odkaz: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1143 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Přejmenovávám soubor: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1175 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Kopíruji soubor: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1189 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: " -"%1" -msgstr "" -"Chyba při operaci kopírování souboru: Otevírání souboru pro čtení selhalo. " -"Název souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:1195 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: " -"%1" -msgstr "" -"Chyba při operaci kopírování souboru: Otevírání souboru pro zápis selhalo. " -"Název souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:1207 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" -"Chyba při operaci kopírování souboru: Načítání selhalo. Název souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:1216 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Chyba při operaci kopírování souboru: Zápis selhal. Název souboru: %1" - -#. +> trunk5 -#: fileaccess.cpp:1499 -#, kde-format -msgid "Reading directory: %1" -msgstr "Načítám adresář: %1" - -#. +> trunk5 -#: fileaccess.cpp:1618 -#, kde-format -msgid "Listing directory: %1" -msgstr "Výpis adresáře: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "Aktuální nastavení:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "Chyba volby nastavení:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "Je použit parametr --auto, ale není zadán výstupní soubor." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "Parametr --auto je při porovnávání adresářů ignorován." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "Ukládání selhalo." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Otevření těchto souborů selhalo:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "Chyba otevírání souboru" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Otevře dokumenty pro porovnání..." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "Obnovit" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Uloží výsledek sloučení. Musí být vyřešeny všechny konflikty." - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "Uloží aktuální dokument jako..." - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "Vytisknout rozdíly" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "Ukončí aplikaci" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Vyjme současný výběr a umístí jej do schránky" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Zkopíruje vybranou sekci do schránky" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Vloží současný obsah schránky na aktuální pozici" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "Vybrat vše v aktuálním okně" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "Hledání řetězce" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "Další hledání řetězce" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Povolí/zakáže stavový panel" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "Nastavit: KDiff3..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "Přejít na aktuální rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Aktuální\n" -"rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "Přejít na první rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"První\n" -"rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "Přejít na poslední rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Poslední\n" -"rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" -"(Přeskočí rozdíly v mezerách pokud je vypnuta volba \"Zobrazit mezery\".)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "" -"(Does not skip white space differences even when \"Show White Space\" is " -"disabled.)" -msgstr "" -"(Nepřeskočí rozdíly v mezerách ani pokud je vypnuta volba \"Zobrazit mezery" -"\".)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Přejít na předchozí rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Předchozí\n" -"rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "Přejít na následující rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Následující\n" -"rozdíl" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Přejít na předchozí konflikt" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Předchozí\n" -"Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Přejít na následující konflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Následující\n" -"Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Přejít na předchozí nevyřešený konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Předchozí\n" -"Nevyřešeno" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Přejít na následující nevyřešený konflikt" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Následující\n" -"Nevyřešeno" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Vybrat řádky z A" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Zvolit\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Vybrat řádky z B" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Zvolit\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Vybrat řádky z C" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Zvolit\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Po výběru zdroje automaticky přejít na následující nevyřešený konflikt" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Automaticky\n" -"Následující" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "Show Space && Tabulator Characters" -msgstr "Zobrazit znaky mezer a tabulátorů" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"Bílé\n" -"znaky" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "Zobrazit mezery" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"Mezery\n" -"rozdíly" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "Zobrazit čísla řádků" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Řádky\n" -"čísla" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Všude zvolit A" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Všude zvolit B" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Všude zvolit C" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Zvolit A pro všechny nevyřešené konflikty" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Zvolit B pro všechny nevyřešené konflikty" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Zvolit C pro všechny nevyřešené konflikty" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Zvolit A pro všechny nevyřešené konflikty s mezerami" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Zvolit B pro všechny nevyřešené konflikty s mezerami" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Zvolit C pro všechny nevyřešené konflikty s mezerami" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Automaticky vyřešit jednoduché konflikty" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Všechny rozdíly považovat za konflikty" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Spustit regulární výraz automatického sloučení" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Automaticky vyřešit historii konfliktů" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Rozdělit rozdíl ve výběru" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Sloučit vybrané rozdíly" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "Zobrazit okno A" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "Zobrazit okno B" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "Zobrazit okno C" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "Normální přehled" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "Přehled A proti B" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "Přehled A proti C" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "Přehled B proti C" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Zalamovat řádky v porovnávacích oknech" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Ručně přidat zarovnání" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Odstranit všechna ručně přidaná zarovnání" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "Zaměřit následující okno" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "Zaostřit předchozí okno" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Přepnout orientaci rozdělení" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Zobrazit rozdělení obrazovky na adresáře a text" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Přepnout mezi zobrazením adresáře textu" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1928 -#, kde-format -msgid "The merge result has not been saved." -msgstr "Výsledek sloučení nebyl uložen." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "Uložit a ukončit" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "Ukončit bez uložení" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1939 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Uložení výsledku sloučení selhalo." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1027 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Právě probíhá sloučení adresářů. Opravdu si jej přejete ukončit?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "Ukládám soubor..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Ukládám soubor pod jiným názvem..." - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "Uložit jako..." - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "Tisk neimplementován" - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "Tisknu..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "Tisknu stránku %1 z %2" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, kde-format -msgid " (Selection)" -msgstr " (Výběr)" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "Tisk dokončen." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "Tisk přerušen." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "Ukončuji..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "Přepínání panelu nástrojů..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "Přepnout stavový panel..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, kde-format -msgid "KDiff3 Part" -msgstr "Komponenta KDiff3" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "Komponenta k zobrazování SVG obrázků" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "Copyright 2007, Aurélien Gâteau " - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, kde-format -msgid "Could not find files for comparison." -msgstr "Nelze nalézt soubory k porovnání." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "Nastavit: KDiff3" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:113 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-" -"file in the source package for details." -msgstr "" -"Nelze inicializovat úlohu KDiff3.\n" -"To je obvykle způsobeno problémem při instalaci. Podrobnosti si prosím " -"přečtěte v souboru README v balíčku se zdroji." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "S&oubor" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "&Adresář" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Operace sloučení aktuální položky" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Operace synchronizace aktuální položky" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, kde-format -msgid "M&ovement" -msgstr "P&ohyb" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "&Zobrazit rozdíly" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, kde-format -msgid "M&erge" -msgstr "Slouč&ení" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "O&kno" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Hlavní panel nástrojů" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Ignorováno (Nastaveno uživatelem)" - -#. +> trunk5 -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "64 bit" -msgid " (64 bit)" -msgstr "64 bit" - -#. +> trunk5 -#: main.cpp:119 -#, fuzzy, kde-format -#| msgid "32 bit" -msgid " (32 bit)" -msgstr "32 bit" - -#. +> trunk5 -#: main.cpp:120 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" - -#. +> trunk5 -#: main.cpp:121 -#, fuzzy, kde-format -#| msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve port do KF5/Qt5" - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Merge the input." -msgstr "Sloučit vstup." - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Výhradně základní soubor. Pro kompatibilitu s některými nástroji." - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Název výstupního souboru. Např.: -o novysoubor.txt" - -#. +> trunk5 -#: main.cpp:143 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Výstupní soubor znovu. (Kvůli kompatibilitě s určitými nástroji.)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" -"Nezobrazovat GUI, pokud jsou všechny konflikty řešitelné automaticky. " -"(Potřebuje -o soubor)" - -#. +> trunk5 -#: main.cpp:145 -#, kde-format -msgid "Do not solve conflicts automatically." -msgstr "Neřešit problémy automaticky." - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "Náhradní název pro vstupní soubor 1 (základní)." - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "Náhradní název pro vstupní soubor 2." - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "Náhradní název pro vstupní soubor 3." - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Alternativa náhradního názvu. Tato možnost se nabízí pro každý vstup." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "" -"Override a config setting. Use once for every setting. E.g.: --cs " -"\"AutoAdvance=1\"" -msgstr "" -"Přepsat konfiguraci. Použít pro každé nastavení. Např.: --cs " -"\"AutoAdvance=1\"" - -#. +> trunk5 -#: main.cpp:151 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "Zobrazit seznam všech nastavení a aktuálních hodnot." - -#. +> trunk5 -#: main.cpp:152 -#, kde-format -msgid "Use a different config file." -msgstr "Použít rozdílný konfigurační soubor." - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "první soubor k otevření (základní, pokud není zadáno pomocí --base)" - -#. +> trunk5 -#: main.cpp:156 -#, kde-format -msgid "file2 to open" -msgstr "druhý soubor k otevření" - -#. +> trunk5 -#: main.cpp:157 -#, kde-format -msgid "file3 to open" -msgstr "třetí soubor k otevření" - -#. +> trunk5 -#: main.cpp:168 -#, fuzzy, kde-format -#| msgctxt "@info:tooltip" -#| msgid "Probe for supported VBE resolutions." -msgid "See kdiff3 --help for supported options." -msgstr "Sondovat podporovaná rozlišení VBE." - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" -"Počet zbývajících nevyřešených konfliktů: %1 (z nichž počet mezer je %2)" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Výstup byl pozměněn.\n" -"Pokud budete pokračovat, vaše změny budou ztraceny." - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:771 -#, kde-format -msgid "All input files are binary equal." -msgstr "Všechny vstupní soubory jsou binárně shodné." - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "Všechny vstupní soubory obsahují shodný text." - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Soubor %1 a %2 je binárně shodný.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Soubory %1 a %2 mají shodný text.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, kde-format -msgid "Conflicts" -msgstr "Konflikty" - -#. +> trunk5 -#: mergeresultwindow.cpp:1840 -#, kde-format -msgid "" -msgstr "<Žádný řádek ve frontě>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2934 -#, kde-format -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"Všechny konflikty nejsou vyřešeny.\n" -"Soubor nebyl uložen." - -#. +> trunk5 -#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 -#, kde-format -msgid "Conflicts Left" -msgstr "Zbývající konflikty" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, kde-format -msgid "" -"There is a line end style conflict. Please choose the line end style " -"manually.\n" -"File not saved." -msgstr "" -"Konflikt druhu konce řádku. Zvolte prosím druh konce řádku ručně.\n" -"Soubor nebyl uložen." - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Vytvoření zálohy selhalo. Soubor nebyl uložen." - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 -#, kde-format -msgid "File Save Error" -msgstr "Chyba ukládání souboru" - -#. +> trunk5 -#: mergeresultwindow.cpp:3005 -#, kde-format -msgid "Error while writing." -msgstr "Chyba při zápisu." - -#. +> trunk5 -#: mergeresultwindow.cpp:3365 -#, kde-format -msgid "Output:" -msgstr "Výstup:" - -#. +> trunk5 -#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 -#, kde-format -msgid "[Modified]" -msgstr "[Pozměněno]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3384 -#, kde-format -msgid "Encoding for saving:" -msgstr "Kódování pro uložení:" - -#. +> trunk5 -#: mergeresultwindow.cpp:3484 -#, kde-format -msgid "Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: mergeresultwindow.cpp:3516 -#, kde-format -msgid "Codec from A: %1" -msgstr "Kodek od A: %1" - -#. +> trunk5 -#: mergeresultwindow.cpp:3518 -#, kde-format -msgid "Codec from B: %1" -msgstr "Kodek od B: %1" - -#. +> trunk5 -#: mergeresultwindow.cpp:3520 -#, kde-format -msgid "Codec from C: %1" -msgstr "Kodek od C: %1" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "Změnit písmo" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" -"Písmo: %1, %2, %3\n" -"\n" -"Příklad:" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" -"Pokud nejsou jiné než ASCII znaky správně zobrazeny, změňte tuto hodnotu." - -#. +> trunk5 -#: optiondialog.cpp:613 -#, kde-format -msgid "Configure" -msgstr "Nastavit" - -#. +> trunk5 -#: optiondialog.cpp:690 -#, kde-format -msgid "Font" -msgstr "Písmo" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Výstupní písmo editoru & porovnávání" - -#. +> trunk5 -#: optiondialog.cpp:710 -#, kde-format -msgid "Application font" -msgstr "Písmo aplikace" - -#. +> trunk5 -#: optiondialog.cpp:714 -#, kde-format -msgid "File view font" -msgstr "Písmo pro prohlížení souborů" - -#. +> trunk5 -#: optiondialog.cpp:732 -#, kde-format -msgid "Color" -msgstr "Barva" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Colors Settings" -msgstr "Nastavení barev" - -#. +> trunk5 -#: optiondialog.cpp:750 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Zobrazení editoru a porovnávání:" - -#. +> trunk5 -#: optiondialog.cpp:758 -#, kde-format -msgid "Foreground color:" -msgstr "Barva popředí:" - -#. +> trunk5 -#: optiondialog.cpp:765 -#, kde-format -msgid "Background color:" -msgstr "Barva pozadí:" - -#. +> trunk5 -#: optiondialog.cpp:774 -#, kde-format -msgid "Diff background color:" -msgstr "Barva pozadí rozdílů:" - -#. +> trunk5 -#: optiondialog.cpp:782 -#, kde-format -msgid "Color A:" -msgstr "Barva A:" - -#. +> trunk5 -#: optiondialog.cpp:790 -#, kde-format -msgid "Color B:" -msgstr "Barva B:" - -#. +> trunk5 -#: optiondialog.cpp:798 -#, kde-format -msgid "Color C:" -msgstr "Barva C:" - -#. +> trunk5 -#: optiondialog.cpp:805 -#, kde-format -msgid "Conflict color:" -msgstr "Barva konfliktů:" - -#. +> trunk5 -#: optiondialog.cpp:813 -#, kde-format -msgid "Current range background color:" -msgstr "Barva pozadí rozdílů v aktuální oblasti:" - -#. +> trunk5 -#: optiondialog.cpp:821 -#, kde-format -msgid "Current range diff background color:" -msgstr "Barva pozadí aktuální oblasti:" - -#. +> trunk5 -#: optiondialog.cpp:828 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Barva pro ručně upravené rozdíly oblasti:" - -#. +> trunk5 -#: optiondialog.cpp:834 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Zobrazení porovnání adresářů:" - -#. +> trunk5 -#: optiondialog.cpp:840 -#, kde-format -msgid "Newest file color:" -msgstr "Barva nejnovějšího souboru:" - -#. +> trunk5 -#: optiondialog.cpp:844 -#, kde-format -msgid "" -"Changing this color will only be effective when starting the next directory " -"comparison." -msgstr "" -"Změna této barvy je účinná pouze při spuštění porovnávání následujícího " -"adresáře." - -#. +> trunk5 -#: optiondialog.cpp:849 -#, kde-format -msgid "Oldest file color:" -msgstr "Barva nejstaršího souboru:" - -#. +> trunk5 -#: optiondialog.cpp:857 -#, kde-format -msgid "Middle age file color:" -msgstr "Barva středně starého souboru:" - -#. +> trunk5 -#: optiondialog.cpp:865 -#, kde-format -msgid "Color for missing files:" -msgstr "Barva chybějících souborů:" - -#. +> trunk5 -#: optiondialog.cpp:878 -#, kde-format -msgid "Editor" -msgstr "Editor" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor Behavior" -msgstr "Chování editoru" - -#. +> trunk5 -#: optiondialog.cpp:892 -#, kde-format -msgid "Tab inserts spaces" -msgstr "Tabulátor vloží mezery" - -#. +> trunk5 -#: optiondialog.cpp:895 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Vyp: Stisknutí tabulátoru vygeneruje příslušný počet míst.\n" -"Vyp: Bude vložen znak tabulátoru." - -#. +> trunk5 -#: optiondialog.cpp:900 -#, kde-format -msgid "Tab size:" -msgstr "Velikost tabulátoru:" - -#. +> trunk5 -#: optiondialog.cpp:906 -#, kde-format -msgid "Auto indentation" -msgstr "Automaticky odsadit" - -#. +> trunk5 -#: optiondialog.cpp:909 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "Zap: Odsazení z předchozího řádku bude použito pro nový řádek.\n" - -#. +> trunk5 -#: optiondialog.cpp:912 -#, kde-format -msgid "Auto copy selection" -msgstr "Automaticky zkopírovat výběr" - -#. +> trunk5 -#: optiondialog.cpp:915 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" -"Zap: Celý výběr je ihned vložen do schránky.\n" -"Vyp: Výběr musíte zkopírovat např.: pomocí Ctrl-C." - -#. +> trunk5 -#: optiondialog.cpp:929 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Zvolte kódování konce řádku při uložení editovaného souboru.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:939 -#, kde-format -msgid "Diff" -msgstr "Porovnávání" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff Settings" -msgstr "Nastavení porovnávání" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:964 -#, kde-format -msgid "Ignore numbers (treat as white space)" -msgstr "Ignorovat čísla (zacházet jako s prázdným místem)" - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore " -"white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Během průběhu srovnávání řádků ignoruje číselné znaky. (Podobné jako " -"Ignorovat prázdná místa.)\n" -"Může pomoci porovnávat soubory s číselnými znaky." - -#. +> trunk5 -#: optiondialog.cpp:971 -#, kde-format -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "Ignorovat komentáře C-C++ (zacházet jako s prázdným místem)" - -#. +> trunk5 -#: optiondialog.cpp:973 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Považuje komentáře C/C++ za prázdné místo." - -#. +> trunk5 -#: optiondialog.cpp:976 -#, kde-format -msgid "Ignore case (treat as white space)" -msgstr "Ignorovat velikost písmen (zacházet jako s prázdným místem)" - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" -"Nakládá s rozdíly malých a VELKÝCH písmen jako se změnami prázdných míst. " -"('a'<=>'A')" - -#. +> trunk5 -#: optiondialog.cpp:982 -#, kde-format -msgid "Preprocessor command:" -msgstr "Příkaz předběžného zpracování:" - -#. +> trunk5 -#: optiondialog.cpp:986 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" -"Uživatelsky nastavené předběžné zpracování. (Podrobnosti získáte v " -"dokumentaci.)" - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "Příkaz předběžného zpracování shody řádku:" - -#. +> trunk5 -#: optiondialog.cpp:993 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Toto předběžné zpracování je použito pouze při shodě řádku.\n" -"(Podrobnosti získáte v dokumentaci.)" - -#. +> trunk5 -#: optiondialog.cpp:996 -#, kde-format -msgid "Try hard (slower)" -msgstr "Důkladné hledání (pomalejší)" - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Pro externí porovnávání přidá parametr --minimal.\n" -"Analýza velkých souborů bude mnohem pomalejší." - -#. +> trunk5 -#: optiondialog.cpp:1003 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Přizpůsobit B a C pro 3 vstupní soubory" - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Zkusí přizpůsobit B a C při porovnávání nebo slučování třech vstupních " -"souborů.\n" -"Pro slučování se nedoporučuje, protože sloučení může způsobit více " -"komplikací.\n" -"(Výchozí ve vypnuto.)" - -#. +> trunk5 -#: optiondialog.cpp:1018 -#, kde-format -msgid "Merge Settings" -msgstr "Nastavení sloučení" - -#. +> trunk5 -#: optiondialog.cpp:1032 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Zpoždění pro automatický posun:" - -#. +> trunk5 -#: optiondialog.cpp:1037 -#, kde-format -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 "" -"V režimu automatického posunu bude před přechodem na následující konflikt \n" -"zobrazen aktuální výběr po zadaný počet sekund. Rozsah: 0-2000ms" - -#. +> trunk5 -#: optiondialog.cpp:1041 -#, kde-format -msgid "Show info dialogs" -msgstr "Zobrazit informační dialogy" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Zobrazí dialog s informacemi o počtu konfliktů." - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "Výchozí (hodnota) pro mezery při sloučení dvou souborů:" - -#. +> trunk5 -#: optiondialog.cpp:1050 optiondialog.cpp:1062 -#, kde-format -msgid "Manual Choice" -msgstr "Zvolit ručně" - -#. +> trunk5 -#: optiondialog.cpp:1054 optiondialog.cpp:1067 -#, kde-format -msgid "" -"Allow the merge algorithm to automatically select an input for white-space-" -"only changes." -msgstr "" -"Umožní slučovacímu algoritmu automaticky zvolit vstup pouze pro změny " -"prázdných míst." - -#. +> trunk5 -#: optiondialog.cpp:1058 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "Výchozí (hodnota) pro mezery při sloučení třech souborů:" - -#. +> trunk5 -#: optiondialog.cpp:1071 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "Automatické sloučení regulárních výrazů" - -#. +> trunk5 -#: optiondialog.cpp:1079 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "Automaticky sloučit regulární výraz:" - -#. +> trunk5 -#: optiondialog.cpp:1083 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one " -"source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Regulární výraz pro řádky, kde by měl KDiff3 automaticky zvolit zdroj.\n" -"Pokud řádek s konfliktem odpovídá regulárnímu výrazu, pak bude vybrán C,\n" -"pokud je dostupný, v opačném případě B." - -#. +> trunk5 -#: optiondialog.cpp:1089 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "Spustit regulární výraz automatického sloučení při spuštění sloučení" - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Spustí automatické sloučení regulárních výrazů\n" -"ihned při spuštění sloučení.\n" - -#. +> trunk5 -#: optiondialog.cpp:1096 -#, kde-format -msgid "Version Control History Merging" -msgstr "Sloučení historie správy verzí" - -#. +> trunk5 -#: optiondialog.cpp:1104 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "Historie spuštění regulárních výrazů:" - -#. +> trunk5 -#: optiondialog.cpp:1108 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Regulární výraz pro spuštění záznamů historie správy verzí.\n" -"Obvykle tento řádek obsahuje klíčové slovo \"$Log$\".\n" -"Výchozí hodnota: \".*\\$Log.*\\$.*\"" - -#. +> trunk5 -#: optiondialog.cpp:1114 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "Regulární výraz pro záznamy historie spouštění:" - -#. +> trunk5 -#: optiondialog.cpp:1126 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading " -"comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history " -"entries.\n" -"See the documentation for details." -msgstr "" -"Záznamy historie správy verzí se skládají z několika řádků.\n" -"Zadejte regulární výraz k rozeznání prvního řádku (bez úvodního komentáře).\n" -"Pro seskupení klíčů, které zvolíte k setřídění použijte závorky.\n" -"Pokud zůstane prázdné, předpokládá KDiff3, že prázdné řádky oddělují záznamy " -"historie.\n" -"Podrobnosti získáte v dokumentaci." - -#. +> trunk5 -#: optiondialog.cpp:1134 -#, kde-format -msgid "History merge sorting" -msgstr "Seřadit historii sloučení" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "Sort version control history by a key." -msgstr "Seřadit historii správy verzí podle klíče." - -#. +> trunk5 -#: optiondialog.cpp:1146 -#, kde-format -msgid "History entry start sort key order:" -msgstr "Klíč k setřídění záznamů historie spuštění:" - -#. +> trunk5 -#: optiondialog.cpp:1150 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history " -"start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Každý pár závorek použitých v regulárním výrazu pro záznam historie " -"spuštění\n" -"seskupuje klíč, který lze použít pro setřídění.\n" -"Zadejte seznam klíčů (číslovaný dle počtu výskytů začínající od 1)\n" -" oddělený ',' (např. \"4,5,6,1,2,3,7\").\n" -"Pokud zůstane prázdné, potom k setřídění nedojde.\n" -"Podrobnosti získáte v dokumentaci." - -#. +> trunk5 -#: optiondialog.cpp:1161 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "Při spuštění sloučení sloučit historii správy verzí" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "" -"Při spuštění sloučení spustí automatické sloučení historie správy verzí." - -#. +> trunk5 -#: optiondialog.cpp:1167 -#, kde-format -msgid "Max number of history entries:" -msgstr "Maximální počet záznamů historie:" - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Po zadaném čísle odstřihnout. Číslo -1 znamená nekonečno položek." - -#. +> trunk5 -#: optiondialog.cpp:1174 -#, kde-format -msgid "Test your regular expressions" -msgstr "Vyzkoušet vaše regulární výrazy" - -#. +> trunk5 -#: optiondialog.cpp:1179 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "Příkaz při irelevantním sloučení:" - -#. +> trunk5 -#: optiondialog.cpp:1183 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Při zvolení bude po automatickém sloučení spuštěn tento skript,\n" -"pokud nebudou zjištěny další relevantní změny.\n" -"Voláno s parametry: NázevSouboru1 NázevSouboru3 NázevSouboru3" - -#. +> trunk5 -#: optiondialog.cpp:1188 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "Automaticky uložit a ukončit při sloučení bez konfliktů" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and " -"quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Pokud je KDiff3 pro sloučení souboru spuštěn z příkazového řádku a všechny\n" -"konflikty jsou vyřešeny bez zásahu uživatele, pak bude uložení a ukončení " -"automatické.\n" -"(Podobně jako volba příkazového řádku \"--auto\".)" - -#. +> trunk5 -#: optiondialog.cpp:1202 optiondialog.cpp:1203 -#, kde-format -msgid "Directory" -msgstr "Adresář" - -#. +> trunk5 -#: optiondialog.cpp:1215 -#, kde-format -msgid "Recursive directories" -msgstr "Rekurzivní adresáře" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Zda analyzovat podadresáře, nebo nikoliv." - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "File pattern(s):" -msgstr "Maska souborů:" - -#. +> trunk5 -#: optiondialog.cpp:1224 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Maska souborů, které mají být analyzovány.\n" -"Zástupné znaky: '*' a '?'\n" -" Více šablon lze zadat při použití oddělovače: ';'" - -#. +> trunk5 -#: optiondialog.cpp:1229 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "Anti-maska souborů:" - -#. +> trunk5 -#: optiondialog.cpp:1234 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Maska souborů, které mají být vyřazeny z analýzy.\n" -"Zástupné znaky: '*' a '?'\n" -" Více šablon lze zadat při použití oddělovače: ';'" - -#. +> trunk5 -#: optiondialog.cpp:1239 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "Anti-maska adresářů:" - -#. +> trunk5 -#: optiondialog.cpp:1244 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Maska adresářů, které mají být vyřazeny z analýzy.\n" -"Zástupné znaky: '*' a '?'\n" -" Více šablon lze zadat při použití oddělovače: ';'" - -#. +> trunk5 -#: optiondialog.cpp:1249 -#, kde-format -msgid "Use .cvsignore" -msgstr "Použít .cvsignore" - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Rozšiřuje anti-masku na vše co by CVS ignoroval.\n" -"Pomocí souborů \".cvsignore\" může být zvolen adresář." - -#. +> trunk5 -#: optiondialog.cpp:1256 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Prohledat skryté soubory a adresáře" - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Prohledá soubory a adresáře s atributem Skrytý." - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Prohledá soubory a adresáře začínající tečkou." - -#. +> trunk5 -#: optiondialog.cpp:1265 -#, kde-format -msgid "Follow file links" -msgstr "Sledovat odkazy souborů" - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Zap: Porovná soubor na který odkaz ukazuje.\n" -"Vyp: Porovná odkazy." - -#. +> trunk5 -#: optiondialog.cpp:1272 -#, kde-format -msgid "Follow directory links" -msgstr "Sledovat odkazy adresářů" - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Zap: Porovná adresář na který odkaz ukazuje.\n" -"Vyp: Porovná odkazy." - -#. +> trunk5 -#: optiondialog.cpp:1290 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Při porovnávání rozlišovat VELKÁ/malá písmena v názvu souboru" - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names " -"match.\n" -"Set this option if the case of the names must match. (Default for Windows is " -"off, otherwise on.)" -msgstr "" -"Porovnávání adresářů bude porovnávat soubory a adresáře v případě, že se " -"jejich názvy shodují.\n" -"Volbu nastavte, pokud se názvy musí shodovat. (Výchozí pro Windows je Vyp., " -"v ostatních případech Zap.)" - -#. +> trunk5 -#: optiondialog.cpp:1297 -#, kde-format -msgid "Unfold all subdirectories on load" -msgstr "Rozbalit při načtení všechny podsložky" - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1304 -#, kde-format -msgid "Skip directory status report" -msgstr "Přeskočit hlášení stavu adresáře" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1311 -#, kde-format -msgid "File Comparison Mode" -msgstr "Režim porovnávání souborů" - -#. +> trunk5 -#: optiondialog.cpp:1316 -#, kde-format -msgid "Binary comparison" -msgstr "Binární porovnávání" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Binárně porovnává každý soubor. (Výchozí)" - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, kde-format -msgid "Full analysis" -msgstr "Důkladná analýza" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Provede důkladnou analýzu a zobrazí statistické informace ve zvláštních " -"sloupcích.\n" -"(Pomalejší než binární porovnávání, mnohem pomalejší pro binární soubory.)" - -#. +> trunk5 -#: optiondialog.cpp:1325 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Důvěřovat velikosti a datu změny (nejisté)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"Files with equal contents but different modification dates will appear as " -"different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Předpokládá se, že soubory jsou shodné, pokud se shoduje jejich datum změny " -"a velikost.\n" -"Soubory se stejným obsahem, ale rozdílným datumem změny. budou považovány za " -"rozdílné.\n" -"Vhodné pro velké adresáře, nebo pomalé sítě." - -#. +> trunk5 -#: optiondialog.cpp:1331 -#, kde-format -msgid "" -"Trust the size and date, but use binary comparison if date does not match " -"(unsafe)" -msgstr "" -"Důvěřovat velikosti a datu, ale pokud se datum neshoduje, porovnat binárně " -"(nejisté)" - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Předpokládá se, že soubory jsou shodné, pokud se shoduje jejich délka a " -"datum změny.\n" -"Pokud se datumy neshodují, ale velikost ano, bude použito binární " -"porovnávání.\n" -"Vhodné pro velké adresáře, nebo pomalé sítě." - -#. +> trunk5 -#: optiondialog.cpp:1337 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Důvěřovat velikosti (nejisté)" - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during " -"download." -msgstr "" -"Předpokládá se, že soubory jsou shodné, pokud je shodná jejich délka.\n" -"Vhodné pro velké adresáře, nebo pomalé sítě, pokud bude datum upraven při " -"stahování." - -#. +> trunk5 -#: optiondialog.cpp:1345 -#, kde-format -msgid "Synchronize directories" -msgstr "Synchronizovat adresáře" - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Nabízí uložení souborů v obou adresářích,\n" -"takže jsou potom oba adresáře stejné.\n" -"Funguje pouze při porovnávání dvou adresářů bez určení cíle." - -#. +> trunk5 -#: optiondialog.cpp:1354 -#, kde-format -msgid "White space differences considered equal" -msgstr "Při rozdílech v mezerách pokládat za shodné" - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Pokud se soubory liší pouze v mezerách, považují se za shodné.\n" -"Aktivní pouze pokud je vybrána volba Důkladná analýza." - -#. +> trunk5 -#: optiondialog.cpp:1363 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Kopírovat novější namísto sloučení (nejisté)" - -#. +> trunk5 -#: optiondialog.cpp:1366 -#, kde-format -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"Nedívat se dovnitř souboru, ale použít novější soubor.\n" -"(Použít jen pokud víte co děláte.)\n" -"Účinné pouze při porovnávání dvou adresářů." - -#. +> trunk5 -#: optiondialog.cpp:1371 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Zálohovat soubory (.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Pokud by byl soubor uložen přes starý soubor, pak bude původní soubor\n" -"uložen s příponou '.orig' místo toho, aby byl smazán." - -#. +> trunk5 -#: optiondialog.cpp:1450 optiondialog.cpp:1451 -#, kde-format -msgid "Regional Settings" -msgstr "Místní nastavení" - -#. +> trunk5 -#: optiondialog.cpp:1465 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Použít stejné kódování pro všechny:" - -#. +> trunk5 -#: optiondialog.cpp:1468 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Zapnout, pokud si přejete změnit všechna kódování pouze podle změny " -"prvního.\n" -"Vypnout, pokud je požadováno rozdílné nastavení." - -#. +> trunk5 -#: optiondialog.cpp:1472 -#, kde-format -msgid "Note: Local Encoding is \"%1\"" -msgstr "Pozn.: Místní kódování je \"%1\"" - -#. +> trunk5 -#: optiondialog.cpp:1476 -#, kde-format -msgid "File Encoding for A:" -msgstr "Kódování souboru A:" - -#. +> trunk5 -#: optiondialog.cpp:1482 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Pokud je volba zapnuta, bude rozeznáno kódování Unicode (UTF-16 a UTF-8).\n" -"Pokud není soubor Unicode, pak bude vybrané kódování použito jako náhradní.\n" -"(Detekce Unicode závisí na prvním bajtu souboru.)" - -#. +> trunk5 -#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Automaticky rozeznat Unicode" - -#. +> trunk5 -#: optiondialog.cpp:1490 -#, kde-format -msgid "File Encoding for B:" -msgstr "Kódování souboru B:" - -#. +> trunk5 -#: optiondialog.cpp:1499 -#, kde-format -msgid "File Encoding for C:" -msgstr "Kódování souboru C:" - -#. +> trunk5 -#: optiondialog.cpp:1508 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Kódování souboru pro výstup sloučení a uložení:" - -#. +> trunk5 -#: optiondialog.cpp:1512 -#, kde-format -msgid "Auto Select" -msgstr "Automaticky vybrat" - -#. +> trunk5 -#: optiondialog.cpp:1515 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for " -"saving." -msgstr "" -"Pokud je volba zapnuta, bude použito kódování ze vstupního souboru.\n" -"V nejasných případech bude uživatel dotázán dialogem na výběr kódování pro " -"uložení." - -#. +> trunk5 -#: optiondialog.cpp:1518 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Kódování souboru pro soubory předběžného zpracování:" - -#. +> trunk5 -#: optiondialog.cpp:1529 -#, kde-format -msgid "Right To Left Language" -msgstr "Jazyky čtené zprava doleva" - -#. +> trunk5 -#: optiondialog.cpp:1532 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Některé jazyky se čtou zprava doleva.\n" -"Tato volba podle toho upraví prohlížeč a editor." - -#. +> trunk5 -#: optiondialog.cpp:1542 -#, kde-format -msgid "Integration" -msgstr "Integrace" - -#. +> trunk5 -#: optiondialog.cpp:1543 -#, kde-format -msgid "Integration Settings" -msgstr "Nastavení integrace" - -#. +> trunk5 -#: optiondialog.cpp:1556 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Ignorovat volby příkazového řádku:" - -#. +> trunk5 -#: optiondialog.cpp:1561 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by " -"other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Seznam voleb příkazového řádku, které by měly být ignorovány, pokud je " -"KDiff3 používán jinými nástroji.\n" -"Může být použito několik hodnot pokud jsou odděleny ';'\n" -"Tímto bude potlačena chyba \"Unknown option\"." - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Ukončit také klávesou Escape" - -#. +> trunk5 -#: optiondialog.cpp:1569 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Rychlý způsob ukončení.\n" -"Pro ty, kteří jsou zvyklí používat klávesu Escape." - -#. +> trunk5 -#: optiondialog.cpp:1653 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "Budou obnovena všechna nastavení. Nikoliv pouze aktuální téma." - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Chyba ztráty dat:\n" -"Pokud lze chybu reprodukovat, kontaktujte autora.\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "Závažná interní chyba" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Příkaz předběžného zpracování: " - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "Následující vámi vybraná volba může změnit data:\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Pravděpodobně není během slučování požadováno.\n" -"Přejete si toto nastavení vypnout, nebo pokračovat s tímto nastavením " -"aktivním?" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Volba je pro slučování nejistá" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Použít tuto volbu během slučování" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Zakázat nebezpečné volby" - -#. +> trunk5 -#: pdiff.cpp:170 -#, kde-format -msgid "Loading A" -msgstr "Načítám A" - -#. +> trunk5 -#: pdiff.cpp:177 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file A." -msgstr "Při zpracovávání fronty nastala chyba.\n" - -#. +> trunk5 -#: pdiff.cpp:181 -#, kde-format -msgid "Loading B" -msgstr "Načítám B" - -#. +> trunk5 -#: pdiff.cpp:188 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file B." -msgstr "Při zpracovávání fronty nastala chyba.\n" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Rozdíly: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Rozdíly řádků: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:223 -#, kde-format -msgid "Loading C" -msgstr "Načítám C" - -#. +> trunk5 -#: pdiff.cpp:230 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file C." -msgstr "Při zpracovávání fronty nastala chyba.\n" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Rozdíly: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Rozdíly: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Rozdíly řádků: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Rozdíly řádků: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:773 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "" -"Všechny vstupní soubory obsahují stejný text, ale nejsou binárně shodné." - -#. +> trunk5 -#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Soubor %1 a %2 obsahuje stejný text, ale není binárně shodný. \n" - -#. +> trunk5 -#: pdiff.cpp:797 -#, kde-format -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"Některé vstupní soubory nevypadají jako čistě textové soubory.\n" -"Vezměte na vědomí, že slučování v KDiff3 nebylo myšleno pro binární data.\n" -"Pokračování na vlastní riziko." - -#. +> trunk5 -#: pdiff.cpp:807 -#, fuzzy, kde-format -#| msgid ", " -msgid ", B" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:809 -#, fuzzy, kde-format -#| msgid ", " -msgid ", C" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:811 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Některé vstupní znaky nemohly být převedeny do platného unicode.\n" -"Možná používáte špatný převodník (např. UTF-8 pro soubory v ne-UTF-8).\n" -"Neukládejte výsledek, pokud si nejste jisti. Pokračujte na vlastní riziko.\n" -"Dotčené vstupní soubory jsou v %1." - -#. +> trunk5 -#: pdiff.cpp:1029 -#, kde-format -msgid "Abort" -msgstr "Přerušit" - -#. +> trunk5 -#: pdiff.cpp:1035 pdiff.cpp:1123 -#, kde-format -msgid "Opening files..." -msgstr "Otevírám soubory..." - -#. +> trunk5 -#: pdiff.cpp:1100 pdiff.cpp:1171 -#, kde-format -msgid "File open error" -msgstr "Chyba otevírání souboru" - -#. +> trunk5 -#: pdiff.cpp:1210 -#, kde-format -msgid "Cutting selection..." -msgstr "Vyjímám výběr..." - -#. +> trunk5 -#: pdiff.cpp:1231 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Kopíruji výběr do schránky..." - -#. +> trunk5 -#: pdiff.cpp:1247 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Vkládám obsah schránky..." - -#. +> trunk5 -#: pdiff.cpp:1718 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1719 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "Počítám maximální šířku pro vodorovný posuvník" - -#. +> trunk5 -#: pdiff.cpp:1930 -#, kde-format -msgid "Save && Continue" -msgstr "Uložit a pokračovat" - -#. +> trunk5 -#: pdiff.cpp:1931 -#, kde-format -msgid "Continue Without Saving" -msgstr "Pokračovat bez ukládání" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search complete." -msgstr "Vyhledávání dokončeno." - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search Complete" -msgstr "Vyhledávání dokončeno" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Není nic vybráno v žádném vstupním okně rozdílů." - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Chyba ručního přidávání rozsahu k porovnání" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "Z&rušit" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (základní):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "Soubor..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Adresář..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (nepovinné):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, kde-format -msgid "Swap/Copy Names..." -msgstr "Prohodit/kopírovat názvy ..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Prohodit %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Kopírovat %1->Výstup" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Prohodit %1<->Výstup" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Výstup (nepovinné):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Nastavit..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, kde-format -msgid "Open Directory" -msgstr "Otevřít adresář" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "Vyberte výstupní soubor" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Hledat text:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Rozlišovat VELKÁ/malá" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Prohledat A" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Prohledat B" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Prohledat C" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Prohledat výstup" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Hledat" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Testovat regulární výraz" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Příklad řádku automatického sloučení:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "" -"Pro vyzkoušení automatického sloučení zkopírujte řádek z vašeho souboru." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Výsledek shody:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Příklad počátečního řádku historie (včetně úvodního komentáře):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Zkopírujte úvodní řádek historie z vašeho souboru\n" -"včetně úvodního komentáře." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Klíč k setřídění historie:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "Příklad počátečního řádku záznamů historie (bez úvodního komentáře):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Zkopírujte úvodní řádek záznamů historie z vašeho souboru,\n" -"avšak vynechte úvodní komentář." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "Výsledek klíče k setřídění:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Shoda úspěšná." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Shoda selhala." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Levé a pravé závorky se do regulárního výrazu nehodí." Index: trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,42 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2011-06-22 14:26+0200\n" -"Last-Translator: Vít Pelčák \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.2\n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Rozhraní pro Diff/Patch" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" Index: trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._json_.po =================================================================== --- trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._json_.po (revision 1522186) +++ trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3._json_.po (nonexistent) @@ -1,21 +0,0 @@ -# Vit Pelcak , 2018. -msgid "" -msgstr "" -"Project-Id-Version: json files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2018-04-03 14:53+0100\n" -"Last-Translator: Vit Pelcak \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "Porovnávejte/slučujte soubory/adresáře pomocí KDiff3" Index: trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/cs/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,108 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2011, 2013, 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2018-06-11 12:45+0100\n" -"Last-Translator: Vit Pelcak \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, kde-format -msgid "KDiff3..." -msgstr "KDiff3..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "Porovnat s %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "Sloučit s %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "Uložit '%1' na později" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "Trojcestné sloučení se základem" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, kde-format -msgid "Compare with..." -msgstr "Porovnat s..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "Vymazat seznam" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "Porovnat" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "Trojcestné porovnání" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, kde-format -msgid "About KDiff3 menu plugin..." -msgstr "O modulu nabídky KDiff3..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, kde-format -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It " -"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " -"the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and " -"choose \"3-way merge with base\" on the other branch which will be used as " -"destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "" Index: trunk/l10n-support/cs/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/cs/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (revision 1522186) +++ trunk/l10n-support/cs/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (nonexistent) @@ -1,86 +0,0 @@ -# Vit Pelcak , 2018. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: 2018-07-11 09:18+0200\n" -"PO-Revision-Date: 2018-07-11 16:13+0100\n" -"Last-Translator: Vit Pelcak \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" - -#. (itstool) path: component/name -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:6 -msgid "KDiff3" -msgstr "KDiff3" - -#. (itstool) path: component/summary -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:7 -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" - -#. (itstool) path: description/p -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:11 -msgid "KDiff3 is a file and directory diff and merge tool which" -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:13 -msgid "compares and merges two or three text input files or directories," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:14 -msgid "shows the differences line by line and character by character(!)," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:15 -msgid "provides an automatic merge-facility," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:16 -msgid "has an editor for comfortable solving of merge-conflicts," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:17 -msgid "provides network transparency via KIO," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:18 -msgid "has options to highlight or hide changes in white-space or comments," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:19 -msgid "supports Unicode, UTF-8 and other file encodings," -msgstr "podporuje Unicode, UTF-8 a další kódování souborů." - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:20 -msgid "prints differences," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:21 -msgid "supports version control keyword and history merging." -msgstr "" Index: trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,61 @@ +# Andrew Coles , 2009. +# Steve Allewell , 2014. +msgid "" +msgstr "" +"Project-Id-Version: desktop files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-08-05 08:40+0200\n" +"PO-Revision-Date: 2014-07-04 23:07+0100\n" +"Last-Translator: Steve Allewell \n" +"Language-Team: British English \n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 +#: kdiff3plugin/kdiff3plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "Compare/Merge Files/Directories with KDiff3" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:51 +#| msgctxt "Name" +#| msgid "KDiff3" +msgctxt "X-KDE-Submenu" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3plugin/kdiff3_plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories" +msgstr "Compare/Merge Files/Directories" + +#. +> trunk +#: src/kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: src/kdiff3.desktop:52 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch Frontend" + +#. +> trunk +#: src/kdiff3.desktop:105 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "A File And Directory Comparison And Merge Tool" + +#. +> trunk +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" Index: trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,3689 @@ +# translation of kdiff3.po to British English +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Malcolm Hunter , 2003. +# Jonathan Riddell , 2003. +# Andrew Coles , 2004, 2005, 2009, 2010. +# Steve Allewell , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2012-10-30 10:41+0100\n" +"PO-Revision-Date: 2014-07-06 17:18+0100\n" +"Last-Translator: Steve Allewell \n" +"Language-Team: British English \n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#. +> trunk +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Andrew Coles, Steve Allewell" + +#. +> trunk +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "andrew_coles@yahoo.co.uk, steve.allewell@gmail.com" + +#. +> trunk +#: diff.cpp:251 +msgid "Writing clipboard data to temp file failed." +msgstr "Writing clipboard data to temp file failed." + +#. +> trunk +#: diff.cpp:255 +msgid "From Clipboard" +msgstr "From Clipboard" + +#. +> trunk +#: diff.cpp:537 +msgid "Expecting space after closing apostroph." +msgstr "Expecting space after closing apostrophe." + +#. +> trunk +#: diff.cpp:540 +msgid "Not matching apostrophs." +msgstr "No matching apostrophes." + +#. +> trunk +#: diff.cpp:562 +msgid "Unexpected apostroph within argument." +msgstr "Unexpected apostrophe within argument." + +#. +> trunk +#: diff.cpp:569 +msgid "No program specified." +msgstr "No program specified." + +#. +> trunk +#: diff.cpp:671 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." + +#. +> trunk +#: diff.cpp:719 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." + +#. +> trunk +#: diff.cpp:1850 diff.cpp:1864 +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" + +#. +> trunk +#: diff.cpp:1852 diff.cpp:1866 +msgid "Severe Internal Error" +msgstr "Severe Internal Error" + +#. +> trunk +#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 +msgid "File" +msgstr "File" + +#. +> trunk +#: difftextwindow.cpp:403 +msgid "Line" +msgstr "Line" + +#. +> trunk +#: difftextwindow.cpp:405 +msgid "Line not available" +msgstr "Line not available" + +#. +> trunk +#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 +msgid "Encoding:" +msgstr "Encoding:" + +#. +> trunk +#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 +#: optiondialog.cpp:762 +msgid "Line end style:" +msgstr "Line end style:" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 +msgid "DOS" +msgstr "DOS" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 +msgid "Unix" +msgstr "Unix" + +#. +> trunk +#: difftextwindow.cpp:1759 kdiff3.cpp:831 +msgid "Top line" +msgstr "Top line" + +#. +> trunk +#: difftextwindow.cpp:1769 +msgid "End" +msgstr "End" + +#. +> trunk +#: directorymergewindow.cpp:150 +msgid "Mix of links and normal files." +msgstr "Mix of links and normal files." + +#. +> trunk +#: directorymergewindow.cpp:157 +msgid "Link: " +msgstr "Link: " + +#. +> trunk +#: directorymergewindow.cpp:165 +msgid "Size. " +msgstr "Size. " + +#. +> trunk +#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 +msgid "Date & Size: " +msgstr "Date & Size: " + +#. +> trunk +#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Creating temp copy of %1 failed." + +#. +> trunk +#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 +#, kde-format +msgid "Opening %1 failed." +msgstr "Opening %1 failed." + +#. +> trunk +#: directorymergewindow.cpp:227 +msgid "Comparing file..." +msgstr "Comparing file..." + +#. +> trunk +#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 +#, kde-format +msgid "Error reading from %1" +msgstr "Error reading from %1" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Name" +msgstr "Name" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Operation" +msgstr "Operation" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Status" +msgstr "Status" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Unsolved" +msgstr "Unsolved" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Solved" +msgstr "Solved" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Nonwhite" +msgstr "Nonwhite" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "White" +msgstr "White" + +#. +> trunk +#: directorymergewindow.cpp:402 +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" + +#. +> trunk +#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 +#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 +msgid "Warning" +msgstr "Warning" + +#. +> trunk +#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 +msgid "Rescan" +msgstr "Rescan" + +#. +> trunk +#: directorymergewindow.cpp:405 pdiff.cpp:1081 +msgid "Continue Merging" +msgstr "Continue Merging" + +#. +> trunk +#: directorymergewindow.cpp:562 +msgid "Opening of directories failed:" +msgstr "Opening of directories failed:" + +#. +> trunk +#: directorymergewindow.cpp:565 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" does not exist or is not a directory.\n" + +#. +> trunk +#: directorymergewindow.cpp:568 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" does not exist or is not a directory.\n" + +#. +> trunk +#: directorymergewindow.cpp:571 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" does not exist or is not a directory.\n" + +#. +> trunk +#: directorymergewindow.cpp:573 +msgid "Directory Open Error" +msgstr "Directory Open Error" + +#. +> trunk +#: directorymergewindow.cpp:581 +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." + +#. +> trunk +#: directorymergewindow.cpp:583 +msgid "Parameter Warning" +msgstr "Parameter Warning" + +#. +> trunk +#: directorymergewindow.cpp:588 +msgid "Scanning directories..." +msgstr "Scanning directories..." + +#. +> trunk +#: directorymergewindow.cpp:621 +msgid "Reading Directory A" +msgstr "Reading Directory A" + +#. +> trunk +#: directorymergewindow.cpp:643 +msgid "Reading Directory B" +msgstr "Reading Directory B" + +#. +> trunk +#: directorymergewindow.cpp:665 +msgid "Reading Directory C" +msgstr "Reading Directory C" + +#. +> trunk +#: directorymergewindow.cpp:691 +msgid "Some subdirectories were not readable in" +msgstr "Some subdirectories were not readable in" + +#. +> trunk +#: directorymergewindow.cpp:696 +msgid "Check the permissions of the subdirectories." +msgstr "Check the permissions of the subdirectories." + +#. +> trunk +#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 +#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 +#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 +msgid "Ready." +msgstr "Ready." + +#. +> trunk +#: directorymergewindow.cpp:749 +msgid "Directory Comparison Status" +msgstr "Directory Comparison Status" + +#. +> trunk +#: directorymergewindow.cpp:750 +msgid "Number of subdirectories:" +msgstr "Number of subdirectories:" + +#. +> trunk +#: directorymergewindow.cpp:751 +msgid "Number of equal files:" +msgstr "Number of equal files:" + +#. +> trunk +#: directorymergewindow.cpp:752 +msgid "Number of different files:" +msgstr "Number of different files:" + +#. +> trunk +#: directorymergewindow.cpp:755 +msgid "Number of manual merges:" +msgstr "Number of manual merges:" + +#. +> trunk +#: directorymergewindow.cpp:926 +msgid "This affects all merge operations." +msgstr "This affects all merge operations." + +#. +> trunk +#: directorymergewindow.cpp:927 +msgid "Changing All Merge Operations" +msgstr "Changing All Merge Operations" + +#. +> trunk +#: directorymergewindow.cpp:1326 +msgid "Processing " +msgstr "Processing " + +#. +> trunk +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 +msgid "To do." +msgstr "To do." + +#. +> trunk +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 +msgid "Copy A to B" +msgstr "Copy A to B" + +#. +> trunk +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 +msgid "Copy B to A" +msgstr "Copy B to A" + +#. +> trunk +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 +msgid "Delete A" +msgstr "Delete A" + +#. +> trunk +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 +msgid "Delete B" +msgstr "Delete B" + +#. +> trunk +#: directorymergewindow.cpp:1828 +msgid "Delete A & B" +msgstr "Delete A & B" + +#. +> trunk +#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 +msgid "Merge to A" +msgstr "Merge to A" + +#. +> trunk +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 +msgid "Merge to B" +msgstr "Merge to B" + +#. +> trunk +#: directorymergewindow.cpp:1831 +msgid "Merge to A & B" +msgstr "Merge to A & B" + +#. +> trunk +#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 +msgid "Delete (if exists)" +msgstr "Delete (if exists)" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 +msgid "Merge" +msgstr "Merge" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +msgid "Merge (manual)" +msgstr "Merge (manual)" + +#. +> trunk +#: directorymergewindow.cpp:1838 +msgid "Error: Conflicting File Types" +msgstr "Error: Conflicting File Types" + +#. +> trunk +#: directorymergewindow.cpp:1839 +msgid "Error: Changed and Deleted" +msgstr "Error: Changed and Deleted" + +#. +> trunk +#: directorymergewindow.cpp:1840 +msgid "Error: Dates are equal but files are not." +msgstr "Error: Dates are equal but files are not." + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 +msgid "This operation is currently not possible." +msgstr "This operation is currently not possible." + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 +msgid "Operation Not Possible" +msgstr "Operation Not Possible" + +#. +> trunk +#: directorymergewindow.cpp:1959 +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 "" +"This should never happen: \n" +"\n" +"mergeResultSaved: m_pMFI=0\n" +"\n" +"If you know how to reproduce this, please contact the program author." + +#. +> trunk +#: directorymergewindow.cpp:1959 +msgid "Program Error" +msgstr "Program Error" + +#. +> trunk +#: directorymergewindow.cpp:1970 +msgid "An error occurred while copying.\n" +msgstr "An error occurred while copying.\n" + +#. +> trunk +#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 +#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 +#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 +#: directorymergewindow.cpp:2388 +msgid "Error" +msgstr "Error" + +#. +> trunk +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 +msgid "Merge Error" +msgstr "Merge Error" + +#. +> trunk +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 +msgid "Error." +msgstr "Error." + +#. +> trunk +#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 +#: directorymergewindow.cpp:2326 +msgid "Done." +msgstr "Done." + +#. +> trunk +#: directorymergewindow.cpp:2004 +msgid "Not saved." +msgstr "Not saved." + +#. +> trunk +#: directorymergewindow.cpp:2039 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Unknown merge operation. (This must never happen!)" + +#. +> trunk +#: directorymergewindow.cpp:2071 +msgid "Unknown merge operation." +msgstr "Unknown merge operation." + +#. +> trunk +#: directorymergewindow.cpp:2086 +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 "" +"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!" + +#. +> trunk +#: directorymergewindow.cpp:2091 +msgid "Starting Merge" +msgstr "Starting Merge" + +#. +> trunk +#: directorymergewindow.cpp:2092 +msgid "Do It" +msgstr "Do It" + +#. +> trunk +#: directorymergewindow.cpp:2093 +msgid "Simulate It" +msgstr "Simulate It" + +#. +> trunk +#: directorymergewindow.cpp:2119 +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "The highlighted item has a different type in the different directories. Select what to do." + +#. +> trunk +#: directorymergewindow.cpp:2128 +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "The modification dates of the file are equal but the files are not. Select what to do." + +#. +> trunk +#: directorymergewindow.cpp:2137 +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "The highlighted item was changed in one directory and deleted in the other. Select what to do." + +#. +> trunk +#: directorymergewindow.cpp:2188 +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "This operation is currently not possible because directory merge is currently running." + +#. +> trunk +#: directorymergewindow.cpp:2248 +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 "" +"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?" + +#. +> trunk +#: directorymergewindow.cpp:2250 +msgid "Continue merge after an error" +msgstr "Continue merge after an error" + +#. +> trunk +#: directorymergewindow.cpp:2251 +msgid "Continue With Last Item" +msgstr "Continue With Last Item" + +#. +> trunk +#: directorymergewindow.cpp:2252 +msgid "Skip Item" +msgstr "Skip Item" + +#. +> trunk +#: directorymergewindow.cpp:2286 +msgid "Skipped." +msgstr "Skipped." + +#. +> trunk +#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 +msgid "In progress..." +msgstr "In progress..." + +#. +> trunk +#: directorymergewindow.cpp:2341 +msgid "Merge operation complete." +msgstr "Merge operation complete." + +#. +> trunk +#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 +msgid "Merge Complete" +msgstr "Merge Complete" + +#. +> trunk +#: directorymergewindow.cpp:2354 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Simulated merge complete: Check if you agree with the proposed operations." + +#. +> trunk +#: directorymergewindow.cpp:2388 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "An error occurred. Press OK to see detailed information.\n" + +#. +> trunk +#: directorymergewindow.cpp:2420 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Error: While deleting %1: Creating backup failed." + +#. +> trunk +#: directorymergewindow.cpp:2427 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "delete directory recursively( %1 )" + +#. +> trunk +#: directorymergewindow.cpp:2429 +#, kde-format +msgid "delete( %1 )" +msgstr "delete( %1 )" + +#. +> trunk +#: directorymergewindow.cpp:2444 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Error: delete dir operation failed while trying to read the directory." + +#. +> trunk +#: directorymergewindow.cpp:2463 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Error: rmdir( %1 ) operation failed." + +#. +> trunk +#: directorymergewindow.cpp:2473 +msgid "Error: delete operation failed." +msgstr "Error: delete operation failed." + +#. +> trunk +#: directorymergewindow.cpp:2499 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "manual merge( %1, %2, %3 -> %4)" + +#. +> trunk +#: directorymergewindow.cpp:2502 +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Note: After a manual merge the user should continue by pressing F7." + +#. +> trunk +#: directorymergewindow.cpp:2527 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." + +#. +> trunk +#: directorymergewindow.cpp:2536 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copyLink( %1 -> %2 )" + +#. +> trunk +#: directorymergewindow.cpp:2547 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Error: copyLink failed: Remote links are not yet supported." + +#. +> trunk +#: directorymergewindow.cpp:2553 +msgid "Error: copyLink failed." +msgstr "Error: copyLink failed." + +#. +> trunk +#: directorymergewindow.cpp:2578 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "copy( %1 -> %2 )" + +#. +> trunk +#: directorymergewindow.cpp:2604 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." + +#. +> trunk +#: directorymergewindow.cpp:2610 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "rename( %1 -> %2 )" + +#. +> trunk +#: directorymergewindow.cpp:2619 +msgid "Error: Rename failed." +msgstr "Error: Rename failed." + +#. +> trunk +#: directorymergewindow.cpp:2637 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Error during makeDir of %1. Cannot delete existing file." + +#. +> trunk +#: directorymergewindow.cpp:2653 +#, kde-format +msgid "makeDir( %1 )" +msgstr "makeDir( %1 )" + +#. +> trunk +#: directorymergewindow.cpp:2663 +msgid "Error while creating directory." +msgstr "Error while creating directory." + +#. +> trunk +#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 +msgid "Dest" +msgstr "Dest" + +#. +> trunk +#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 +msgid "Dir" +msgstr "Dir" + +#. +> trunk +#: directorymergewindow.cpp:2692 +msgid "Type" +msgstr "Type" + +#. +> trunk +#: directorymergewindow.cpp:2692 +msgid "Size" +msgstr "Size" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Attr" +msgstr "Attr" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Last Modification" +msgstr "Last Modification" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Link-Destination" +msgstr "Link-Destination" + +#. +> trunk +#: directorymergewindow.cpp:2740 +msgid "not available" +msgstr "not available" + +#. +> trunk +#: directorymergewindow.cpp:2760 +msgid "A (Dest): " +msgstr "A (Dest): " + +#. +> trunk +#: directorymergewindow.cpp:2763 +msgid "A (Base): " +msgstr "A (Base): " + +#. +> trunk +#: directorymergewindow.cpp:2769 +msgid "B (Dest): " +msgstr "B (Dest): " + +#. +> trunk +#: directorymergewindow.cpp:2777 +msgid "C (Dest): " +msgstr "C (Dest): " + +#. +> trunk +#: directorymergewindow.cpp:2783 +msgid "Dest: " +msgstr "Dest: " + +#. +> trunk +#: directorymergewindow.cpp:2850 +msgid "Save Directory Merge State As..." +msgstr "Save Directory Merge State As..." + +#. +> trunk +#: directorymergewindow.cpp:2973 +msgid "Start/Continue Directory Merge" +msgstr "Start/Continue Directory Merge" + +#. +> trunk +#: directorymergewindow.cpp:2974 +msgid "Run Operation for Current Item" +msgstr "Run Operation for Current Item" + +#. +> trunk +#: directorymergewindow.cpp:2975 +msgid "Compare Selected File" +msgstr "Compare Selected File" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "Merge Current File" +msgstr "Merge Current File" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "" +"Merge\n" +"File" +msgstr "" +"Merge\n" +"File" + +#. +> trunk +#: directorymergewindow.cpp:2977 +msgid "Fold All Subdirs" +msgstr "Fold All Subdirs" + +#. +> trunk +#: directorymergewindow.cpp:2978 +msgid "Unfold All Subdirs" +msgstr "Unfold All Subdirs" + +#. +> trunk +#: directorymergewindow.cpp:2982 +msgid "Choose A for All Items" +msgstr "Choose A for All Items" + +#. +> trunk +#: directorymergewindow.cpp:2983 +msgid "Choose B for All Items" +msgstr "Choose B for All Items" + +#. +> trunk +#: directorymergewindow.cpp:2984 +msgid "Choose C for All Items" +msgstr "Choose C for All Items" + +#. +> trunk +#: directorymergewindow.cpp:2985 +msgid "Auto-Choose Operation for All Items" +msgstr "Auto-Choose Operation for All Items" + +#. +> trunk +#: directorymergewindow.cpp:2986 +msgid "No Operation for All Items" +msgstr "No Operation for All Items" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "Show Identical Files" +msgstr "Show Identical Files" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "" +"Identical\n" +"Files" +msgstr "" +"Identical\n" +"Files" + +#. +> trunk +#: directorymergewindow.cpp:2992 +msgid "Show Different Files" +msgstr "Show Different Files" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "Show Files only in A" +msgstr "Show Files only in A" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "" +"Files\n" +"only in A" +msgstr "" +"Files\n" +"only in A" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "Show Files only in B" +msgstr "Show Files only in B" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "" +"Files\n" +"only in B" +msgstr "" +"Files\n" +"only in B" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "Show Files only in C" +msgstr "Show Files only in C" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "" +"Files\n" +"only in C" +msgstr "" +"Files\n" +"only in C" + +#. +> trunk +#: directorymergewindow.cpp:2999 +msgid "Compare Explicitly Selected Files" +msgstr "Compare Explicitly Selected Files" + +#. +> trunk +#: directorymergewindow.cpp:3000 +msgid "Merge Explicitly Selected Files" +msgstr "Merge Explicitly Selected Files" + +#. +> trunk +#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 +msgid "Do Nothing" +msgstr "Do Nothing" + +#. +> trunk +#: directorymergewindow.cpp:3003 +msgid "A" +msgstr "A" + +#. +> trunk +#: directorymergewindow.cpp:3004 +msgid "B" +msgstr "B" + +#. +> trunk +#: directorymergewindow.cpp:3005 +msgid "C" +msgstr "C" + +#. +> trunk +#: directorymergewindow.cpp:3014 +msgid "Delete A && B" +msgstr "Delete A && B" + +#. +> trunk +#: directorymergewindow.cpp:3017 +msgid "Merge to A && B" +msgstr "Merge to A && B" + +#. +> trunk +#: fileaccess.cpp:617 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " + +#. +> trunk +#: fileaccess.cpp:624 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " + +#. +> trunk +#: fileaccess.cpp:648 +#, kde-format +msgid "Getting file status: %1" +msgstr "Getting file status: %1" + +#. +> trunk +#: fileaccess.cpp:691 +#, kde-format +msgid "Reading file: %1" +msgstr "Reading file: %1" + +#. +> trunk +#: fileaccess.cpp:728 +#, kde-format +msgid "Writing file: %1" +msgstr "Writing file: %1" + +#. +> trunk +#: fileaccess.cpp:756 +msgid "Out of memory" +msgstr "Out of memory" + +#. +> trunk +#: fileaccess.cpp:791 +#, kde-format +msgid "Making directory: %1" +msgstr "Making directory: %1" + +#. +> trunk +#: fileaccess.cpp:811 +#, kde-format +msgid "Removing directory: %1" +msgstr "Removing directory: %1" + +#. +> trunk +#: fileaccess.cpp:826 +#, kde-format +msgid "Removing file: %1" +msgstr "Removing file: %1" + +#. +> trunk +#: fileaccess.cpp:842 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Creating symbolic link: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:869 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Renaming file: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:902 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Copying file: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:916 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Error during file copy operation: Opening file for reading failed. Filename: %1" + +#. +> trunk +#: fileaccess.cpp:922 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Error during file copy operation: Opening file for writing failed. Filename: %1" + +#. +> trunk +#: fileaccess.cpp:937 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Error during file copy operation: Reading failed. Filename: %1" + +#. +> trunk +#: fileaccess.cpp:946 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Error during file copy operation: Writing failed. Filename: %1" + +#. +> trunk +#: fileaccess.cpp:1236 +msgid "Reading directory: " +msgstr "Reading directory: " + +#. +> trunk +#: fileaccess.cpp:1360 +#, kde-format +msgid "Listing directory: %1" +msgstr "Listing directory: %1" + +#. +> trunk +#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 +msgid "&Cancel" +msgstr "&Cancel" + +#. +> trunk +#: kdiff3.cpp:169 +msgid "Current Configuration:" +msgstr "Current Configuration:" + +#. +> trunk +#: kdiff3.cpp:174 +msgid "Config Option Error:" +msgstr "Config Option Error:" + +#. +> trunk +#: kdiff3.cpp:219 +msgid "Option --auto used, but no output file specified." +msgstr "Option --auto used, but no output file specified." + +#. +> trunk +#: kdiff3.cpp:369 +msgid "Option --auto ignored for directory comparison." +msgstr "Option --auto ignored for directory comparison." + +#. +> trunk +#: kdiff3.cpp:405 +msgid "Saving failed." +msgstr "Saving failed." + +#. +> trunk +#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 +msgid "Opening of these files failed:" +msgstr "Opening of these files failed:" + +#. +> trunk +#: kdiff3.cpp:449 +msgid "File Open Error" +msgstr "File Open Error" + +#. +> trunk +#: kdiff3.cpp:477 +msgid "Opens documents for comparison..." +msgstr "Opens documents for comparison..." + +#. +> trunk +#: kdiff3.cpp:479 +msgid "Reload" +msgstr "Reload" + +#. +> trunk +#: kdiff3.cpp:482 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Saves the merge result. All conflicts must be solved!" + +#. +> trunk +#: kdiff3.cpp:484 +msgid "Saves the current document as..." +msgstr "Saves the current document as..." + +#. +> trunk +#: kdiff3.cpp:487 +msgid "Print the differences" +msgstr "Print the differences" + +#. +> trunk +#: kdiff3.cpp:490 +msgid "Quits the application" +msgstr "Quits the application" + +#. +> trunk +#: kdiff3.cpp:492 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Cuts the selected section and puts it to the clipboard" + +#. +> trunk +#: kdiff3.cpp:494 +msgid "Copies the selected section to the clipboard" +msgstr "Copies the selected section to the clipboard" + +#. +> trunk +#: kdiff3.cpp:496 +msgid "Pastes the clipboard contents to current position" +msgstr "Pastes the clipboard contents to current position" + +#. +> trunk +#: kdiff3.cpp:498 +msgid "Select everything in current window" +msgstr "Select everything in current window" + +#. +> trunk +#: kdiff3.cpp:500 +msgid "Search for a string" +msgstr "Search for a string" + +#. +> trunk +#: kdiff3.cpp:502 +msgid "Search again for the string" +msgstr "Search again for the string" + +#. +> trunk +#: kdiff3.cpp:507 +msgid "Enables/disables the statusbar" +msgstr "Enables/disables the statusbar" + +#. +> trunk +#: kdiff3.cpp:511 +msgid "Configure KDiff3..." +msgstr "Configure KDiff3..." + +#. +> trunk +#: kdiff3.cpp:532 +msgid "Go to Current Delta" +msgstr "Go to Current Delta" + +#. +> trunk +#: kdiff3.cpp:532 +msgid "" +"Current\n" +"Delta" +msgstr "" +"Current\n" +"Delta" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "Go to First Delta" +msgstr "Go to First Delta" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "" +"First\n" +"Delta" +msgstr "" +"First\n" +"Delta" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "Go to Last Delta" +msgstr "Go to Last Delta" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "" +"Last\n" +"Delta" +msgstr "" +"Last\n" +"Delta" + +#. +> trunk +#: kdiff3.cpp:538 +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" + +#. +> trunk +#: kdiff3.cpp:539 +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Does not skip white space differences even when \"Show White Space\" is disabled.)" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "Go to Previous Delta" +msgstr "Go to Previous Delta" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Prev\n" +"Delta" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "Go to Next Delta" +msgstr "Go to Next Delta" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "" +"Next\n" +"Delta" +msgstr "" +"Next\n" +"Delta" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "Go to Previous Conflict" +msgstr "Go to Previous Conflict" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Prev\n" +"Conflict" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "Go to Next Conflict" +msgstr "Go to Next Conflict" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Next\n" +"Conflict" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "Go to Previous Unsolved Conflict" +msgstr "Go to Previous Unsolved Conflict" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Prev\n" +"Unsolved" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "Go to Next Unsolved Conflict" +msgstr "Go to Next Unsolved Conflict" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Next\n" +"Unsolved" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "Select Line(s) From A" +msgstr "Select Line(s) From A" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "" +"Choose\n" +"A" +msgstr "" +"Choose\n" +"A" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "Select Line(s) From B" +msgstr "Select Line(s) From B" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "" +"Choose\n" +"B" +msgstr "" +"Choose\n" +"B" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "Select Line(s) From C" +msgstr "Select Line(s) From C" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "" +"Choose\n" +"C" +msgstr "" +"Choose\n" +"C" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "" +"Auto\n" +"Next" +msgstr "" +"Auto\n" +"Next" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "Show Space && Tabulator Characters for Differences" +msgstr "Show Space && Tabulator Characters for Differences" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "" +"White\n" +"Characters" +msgstr "" +"White\n" +"Characters" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "Show White Space" +msgstr "Show White Space" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "" +"White\n" +"Deltas" +msgstr "" +"White\n" +"Deltas" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "Show Line Numbers" +msgstr "Show Line Numbers" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Line\n" +"Numbers" + +#. +> trunk +#: kdiff3.cpp:561 +msgid "Choose A Everywhere" +msgstr "Choose A Everywhere" + +#. +> trunk +#: kdiff3.cpp:562 +msgid "Choose B Everywhere" +msgstr "Choose B Everywhere" + +#. +> trunk +#: kdiff3.cpp:563 +msgid "Choose C Everywhere" +msgstr "Choose C Everywhere" + +#. +> trunk +#: kdiff3.cpp:564 +msgid "Choose A for All Unsolved Conflicts" +msgstr "Choose A for All Unsolved Conflicts" + +#. +> trunk +#: kdiff3.cpp:565 +msgid "Choose B for All Unsolved Conflicts" +msgstr "Choose B for All Unsolved Conflicts" + +#. +> trunk +#: kdiff3.cpp:566 +msgid "Choose C for All Unsolved Conflicts" +msgstr "Choose C for All Unsolved Conflicts" + +#. +> trunk +#: kdiff3.cpp:567 +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Choose A for All Unsolved Whitespace Conflicts" + +#. +> trunk +#: kdiff3.cpp:568 +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Choose B for All Unsolved Whitespace Conflicts" + +#. +> trunk +#: kdiff3.cpp:569 +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Choose C for All Unsolved Whitespace Conflicts" + +#. +> trunk +#: kdiff3.cpp:570 +msgid "Automatically Solve Simple Conflicts" +msgstr "Automatically Solve Simple Conflicts" + +#. +> trunk +#: kdiff3.cpp:571 +msgid "Set Deltas to Conflicts" +msgstr "Set Deltas to Conflicts" + +#. +> trunk +#: kdiff3.cpp:572 +msgid "Run Regular Expression Auto Merge" +msgstr "Run Regular Expression Auto Merge" + +#. +> trunk +#: kdiff3.cpp:573 +msgid "Automatically Solve History Conflicts" +msgstr "Automatically Solve History Conflicts" + +#. +> trunk +#: kdiff3.cpp:574 +msgid "Split Diff At Selection" +msgstr "Split Diff At Selection" + +#. +> trunk +#: kdiff3.cpp:575 +msgid "Join Selected Diffs" +msgstr "Join Selected Diffs" + +#. +> trunk +#: kdiff3.cpp:577 +msgid "Show Window A" +msgstr "Show Window A" + +#. +> trunk +#: kdiff3.cpp:578 +msgid "Show Window B" +msgstr "Show Window B" + +#. +> trunk +#: kdiff3.cpp:579 +msgid "Show Window C" +msgstr "Show Window C" + +#. +> trunk +#: kdiff3.cpp:580 kdiff3.cpp:591 +msgid "Focus Next Window" +msgstr "Focus Next Window" + +#. +> trunk +#: kdiff3.cpp:582 +msgid "Normal Overview" +msgstr "Normal Overview" + +#. +> trunk +#: kdiff3.cpp:583 +msgid "A vs. B Overview" +msgstr "A vs. B Overview" + +#. +> trunk +#: kdiff3.cpp:584 +msgid "A vs. C Overview" +msgstr "A vs. C Overview" + +#. +> trunk +#: kdiff3.cpp:585 +msgid "B vs. C Overview" +msgstr "B vs. C Overview" + +#. +> trunk +#: kdiff3.cpp:586 +msgid "Word Wrap Diff Windows" +msgstr "Word Wrap Diff Windows" + +#. +> trunk +#: kdiff3.cpp:587 +msgid "Add Manual Diff Alignment" +msgstr "Add Manual Diff Alignment" + +#. +> trunk +#: kdiff3.cpp:588 +msgid "Clear All Manual Diff Alignments" +msgstr "Clear All Manual Diff Alignments" + +#. +> trunk +#: kdiff3.cpp:593 +msgid "Focus Prev Window" +msgstr "Focus Prev Window" + +#. +> trunk +#: kdiff3.cpp:594 +msgid "Toggle Split Orientation" +msgstr "Toggle Split Orientation" + +#. +> trunk +#: kdiff3.cpp:596 +msgid "Dir && Text Split Screen View" +msgstr "Dir && Text Split Screen View" + +#. +> trunk +#: kdiff3.cpp:598 +msgid "Toggle Between Dir && Text View" +msgstr "Toggle Between Dir && Text View" + +#. +> trunk +#: kdiff3.cpp:654 pdiff.cpp:1812 +msgid "The merge result hasn't been saved." +msgstr "The merge result hasn't been saved." + +#. +> trunk +#: kdiff3.cpp:656 +msgid "Save && Quit" +msgstr "Save && Quit" + +#. +> trunk +#: kdiff3.cpp:657 +msgid "Quit Without Saving" +msgstr "Quit Without Saving" + +#. +> trunk +#: kdiff3.cpp:665 pdiff.cpp:1823 +msgid "Saving the merge result failed." +msgstr "Saving the merge result failed." + +#. +> trunk +#: kdiff3.cpp:676 pdiff.cpp:1078 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "You are currently doing a directory merge. Are you sure, you want to abort?" + +#. +> trunk +#: kdiff3.cpp:701 +msgid "Saving file..." +msgstr "Saving file..." + +#. +> trunk +#: kdiff3.cpp:718 +msgid "Saving file with a new filename..." +msgstr "Saving file with a new filename..." + +#. +> trunk +#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 +msgid "Save As..." +msgstr "Save As..." + +#. +> trunk +#: kdiff3.cpp:781 +#| msgid "Printing completed." +msgid "Printing not implemented." +msgstr "Printing not implemented." + +#. +> trunk +#: kdiff3.cpp:815 +msgid "Printing..." +msgstr "Printing..." + +#. +> trunk +#: kdiff3.cpp:956 +msgid "Selection" +msgstr "Selection" + +#. +> trunk +#: kdiff3.cpp:982 +msgid "Printing completed." +msgstr "Printing completed." + +#. +> trunk +#: kdiff3.cpp:986 +msgid "Printing aborted." +msgstr "Printing aborted." + +#. +> trunk +#: kdiff3.cpp:993 +msgid "Exiting..." +msgstr "Exiting..." + +#. +> trunk +#: kdiff3.cpp:1006 +msgid "Toggling toolbar..." +msgstr "Toggling toolbar..." + +#. +> trunk +#: kdiff3.cpp:1027 +msgid "Toggle the statusbar..." +msgstr "Toggle the statusbar..." + +#. +> trunk +#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 +msgid "Couldn't find files for comparison." +msgstr "Couldn't find files for comparison." + +#. +> trunk +#: kdiff3_part.cpp:302 +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk +#: kdiff3_part.cpp:303 main.cpp:174 +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:4 +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:13 +msgid "Configure KDiff3" +msgstr "Configure KDiff3" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_part.rc:16 +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3_shell.cpp:76 +#| msgid "" +#| "Could not initialize the KDiff part.\n" +#| "This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"Could not initialise the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." + +#. i18n: ectx: Menu (file) +#. +> trunk +#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 +msgid "&File" +msgstr "&File" + +#. i18n: ectx: Menu (directory) +#. +> trunk +#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 +msgid "&Directory" +msgstr "&Directory" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk +#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 +#: kreplacements/kreplacements.cpp:497 +msgid "Current Item Merge Operation" +msgstr "Current Item Merge Operation" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk +#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 +#: kreplacements/kreplacements.cpp:498 +msgid "Current Item Sync Operation" +msgstr "Current Item Sync Operation" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 +msgid "&Movement" +msgstr "&Movement" + +#. i18n: ectx: Menu (diff) +#. +> trunk +#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 +msgid "D&iffview" +msgstr "D&iffview" + +#. i18n: ectx: Menu (merge) +#. +> trunk +#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 +msgid "&Merge" +msgstr "&Merge" + +#. i18n: ectx: Menu (window) +#. +> trunk +#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 +msgid "&Window" +msgstr "&Window" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_shell.rc:106 +msgid "Main Toolbar" +msgstr "Main Toolbar" + +#. +> trunk +#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 +#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 +msgid "Cancel" +msgstr "Cancel" + +#. +> trunk +#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 +#: smalldialogs.cpp:508 +msgid "OK" +msgstr "OK" + +#. +> trunk +#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 +msgid "Help" +msgstr "Help" + +#. +> trunk +#: kreplacements/kreplacements.cpp:185 +msgid "Defaults" +msgstr "Defaults" + +#. +> trunk +#: kreplacements/kreplacements.cpp:297 +msgid "&Edit" +msgstr "&Edit" + +#. +> trunk +#: kreplacements/kreplacements.cpp:305 +msgid "&Settings" +msgstr "&Settings" + +#. +> trunk +#: kreplacements/kreplacements.cpp:306 +msgid "&Help" +msgstr "&Help" + +#. +> trunk +#: kreplacements/kreplacements.cpp:353 +msgid "&About" +msgstr "&About" + +#. +> trunk +#: kreplacements/kreplacements.cpp:369 +msgid "A&uthor" +msgstr "A&uthor" + +#. +> trunk +#: kreplacements/kreplacements.cpp:383 +msgid "&Thanks To" +msgstr "&Thanks To" + +#. +> trunk +#: kreplacements/kreplacements.cpp:597 +msgid "Open" +msgstr "Open" + +#. +> trunk +#: kreplacements/kreplacements.cpp:606 +msgid "Save" +msgstr "Save" + +#. +> trunk +#: kreplacements/kreplacements.cpp:623 +msgid "Print..." +msgstr "Print..." + +#. +> trunk +#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 +msgid "Quit" +msgstr "Quit" + +#. +> trunk +#: kreplacements/kreplacements.cpp:639 +msgid "Cut" +msgstr "Cut" + +#. +> trunk +#: kreplacements/kreplacements.cpp:647 +msgid "Copy" +msgstr "Copy" + +#. +> trunk +#: kreplacements/kreplacements.cpp:655 +msgid "Paste" +msgstr "Paste" + +#. +> trunk +#: kreplacements/kreplacements.cpp:663 +msgid "Select All" +msgstr "Select All" + +#. +> trunk +#: kreplacements/kreplacements.cpp:671 +msgid "Show Toolbar" +msgstr "Show Toolbar" + +#. +> trunk +#: kreplacements/kreplacements.cpp:679 +msgid "Show &Status Bar" +msgstr "Show &Status Bar" + +#. +> trunk +#: kreplacements/kreplacements.cpp:687 +#, kde-format +msgid "&Configure %1..." +msgstr "&Configure %1..." + +#. +> trunk +#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 +msgid "About" +msgstr "About" + +#. +> trunk +#: kreplacements/kreplacements.cpp:722 +msgid "Find" +msgstr "Find" + +#. +> trunk +#: kreplacements/kreplacements.cpp:730 +msgid "Find Next" +msgstr "Find Next" + +#. +> trunk +#: kreplacements/kreplacements.cpp:750 +msgid "Select Font" +msgstr "Select Font" + +#. +> trunk +#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 +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 "" +"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." + +#. +> trunk +#: kreplacements/kreplacements.cpp:792 +msgid "Incompatible font." +msgstr "Incompatible font." + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Continue at my own risk" +msgstr "Continue at my own risk" + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Select another font" +msgstr "Select another font" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1134 +msgid "For more documentation, see the help-menu or the subdirectory doc." +msgstr "For more documentation, see the help-menu or the subdirectory doc." + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "KDiff3-Usage" +msgstr "KDiff3-Usage" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "Ignore" +msgstr "Ignore" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "Exit" +msgstr "Exit" + +#. +> trunk +#: kreplacements/kreplacements.h:105 +msgid "Continue" +msgstr "Continue" + +#. +> trunk +#: main.cpp:74 main.cpp:76 +msgid "Ignored. (User defined.)" +msgstr "Ignored. (User defined.)" + +#. +> trunk +#: main.cpp:162 +msgid "kdiff3" +msgstr "kdiff3" + +#. +> trunk +#: main.cpp:166 +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Tool for Comparison and Merge of Files and Directories" + +#. +> trunk +#: main.cpp:167 +#| msgid "(c) 2002-2009 Joachim Eibl" +msgid "(c) 2002-2011 Joachim Eibl" +msgstr "(c) 2002-2011 Joachim Eibl" + +#. +> trunk +#: main.cpp:175 +msgid "Eike Sauer" +msgstr "Eike Sauer" + +#. +> trunk +#: main.cpp:175 +msgid "Bugfixes, Debian package maintainer" +msgstr "Bugfixes, Debian package maintainer" + +#. +> trunk +#: main.cpp:176 +msgid "Sebastien Fricker" +msgstr "Sebastien Fricker" + +#. +> trunk +#: main.cpp:176 +msgid "Windows installer" +msgstr "Windows installer" + +#. +> trunk +#: main.cpp:177 +msgid "Stephan Binner" +msgstr "Stephan Binner" + +#. +> trunk +#: main.cpp:177 +msgid "i18n-help" +msgstr "i18n-help" + +#. +> trunk +#: main.cpp:178 +msgid "Stefan Partheymueller" +msgstr "Stefan Partheymueller" + +#. +> trunk +#: main.cpp:178 +msgid "Clipboard-patch" +msgstr "Clipboard-patch" + +#. +> trunk +#: main.cpp:179 +msgid "David Faure" +msgstr "David Faure" + +#. +> trunk +#: main.cpp:179 +msgid "KIO-Help" +msgstr "KIO-Help" + +#. +> trunk +#: main.cpp:180 +msgid "Bernd Gehrmann" +msgstr "Bernd Gehrmann" + +#. +> trunk +#: main.cpp:180 +msgid "Class CvsIgnoreList from Cervisia" +msgstr "Class CvsIgnoreList from Cervisia" + +#. +> trunk +#: main.cpp:181 +msgid "Andre Woebbeking" +msgstr "Andre Woebbeking" + +#. +> trunk +#: main.cpp:181 +msgid "Class StringMatcher" +msgstr "Class StringMatcher" + +#. +> trunk +#: main.cpp:182 +msgid "Michael Denio" +msgstr "Michael Denio" + +#. +> trunk +#: main.cpp:182 +msgid "Directory Equality-Coloring patch" +msgstr "Directory Equality-Colouring patch" + +#. +> trunk +#: main.cpp:183 +msgid "Manfred Koehler" +msgstr "Manfred Koehler" + +#. +> trunk +#: main.cpp:183 +msgid "Fix for slow startup on Windows" +msgstr "Fix for slow startup on Windows" + +#. +> trunk +#: main.cpp:184 +msgid "Sergey Zorin" +msgstr "Sergey Zorin" + +#. +> trunk +#: main.cpp:184 +msgid "Diff Ext for Windows" +msgstr "Diff Ext for Windows" + +#. +> trunk +#: main.cpp:185 +msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#. +> trunk +#: main.cpp:185 +msgid "GNU-Diffutils" +msgstr "GNU-Diffutils" + +#. +> trunk +#: main.cpp:186 +msgid "Tino Boellsterling, Timothy Mee" +msgstr "Tino Boellsterling, Timothy Mee" + +#. +> trunk +#: main.cpp:186 +msgid "Intensive test, use and feedback" +msgstr "Intensive test, use and feedback" + +#. +> trunk +#: main.cpp:187 +msgid "Michael Schmidt" +msgstr "Michael Schmidt" + +#. +> trunk +#: main.cpp:187 +msgid "Mac support" +msgstr "Mac support" + +#. +> trunk +#: main.cpp:188 +msgid "Valentin Rusu" +msgstr "Valentin Rusu" + +#. +> trunk +#: main.cpp:188 main.cpp:189 +msgid "KDE4 porting" +msgstr "KDE4 porting" + +#. +> trunk +#: main.cpp:189 +msgid "Albert Astals Cid" +msgstr "Albert Astals Cid" + +#. +> trunk +#: main.cpp:190 +msgid "Silvan Scherrer" +msgstr "Silvan Scherrer" + +#. +> trunk +#: main.cpp:190 +msgid "OS2 port" +msgstr "OS2 port" + +#. +> trunk +#: main.cpp:192 +msgid "+ Many thanks to those who reported bugs and contributed ideas!" +msgstr "+ Many thanks to those who reported bugs and contributed ideas!" + +#. +> trunk +#: main.cpp:198 +msgid "Merge the input." +msgstr "Merge the input." + +#. +> trunk +#: main.cpp:199 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Explicit base file. For compatibility with certain tools." + +#. +> trunk +#: main.cpp:200 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Output file. Implies -m. E.g.: -o newfile.txt" + +#. +> trunk +#: main.cpp:201 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Output file, again. (For compatibility with certain tools.)" + +#. +> trunk +#: main.cpp:202 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "No GUI if all conflicts are auto-solvable. (Needs -o file)" + +#. +> trunk +#: main.cpp:203 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "Do not solve conflicts automatically. (For compatibility...)" + +#. +> trunk +#: main.cpp:204 +msgid "Visible name replacement for input file 1 (base)." +msgstr "Visible name replacement for input file 1 (base)." + +#. +> trunk +#: main.cpp:205 +msgid "Visible name replacement for input file 2." +msgstr "Visible name replacement for input file 2." + +#. +> trunk +#: main.cpp:206 +msgid "Visible name replacement for input file 3." +msgstr "Visible name replacement for input file 3." + +#. +> trunk +#: main.cpp:207 +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Alternative visible name replacement. Supply this once for every input." + +#. +> trunk +#: main.cpp:208 +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" + +#. +> trunk +#: main.cpp:209 +msgid "Show list of config settings and current values." +msgstr "Show list of config settings and current values." + +#. +> trunk +#: main.cpp:210 +msgid "Use a different config file." +msgstr "Use a different config file." + +#. +> trunk +#: main.cpp:213 +msgid "file1 to open (base, if not specified via --base)" +msgstr "file1 to open (base, if not specified via --base)" + +#. +> trunk +#: main.cpp:214 +msgid "file2 to open" +msgstr "file2 to open" + +#. +> trunk +#: main.cpp:215 +msgid "file3 to open" +msgstr "file3 to open" + +#. +> trunk +#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 +#: mergeresultwindow.cpp:1014 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" + +#. +> trunk +#: mergeresultwindow.cpp:303 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"The output has been modified.\n" +"If you continue your changes will be lost." + +#. +> trunk +#: mergeresultwindow.cpp:834 pdiff.cpp:532 +msgid "All input files are binary equal." +msgstr "All input files are binary equal." + +#. +> trunk +#: mergeresultwindow.cpp:836 +msgid "All input files contain the same text." +msgstr "All input files contain the same text." + +#. +> trunk +#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 +#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Files %1 and %2 are binary equal.\n" + +#. +> trunk +#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 +#: mergeresultwindow.cpp:843 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Files %1 and %2 have equal text.\n" + +#. +> trunk +#: mergeresultwindow.cpp:849 +msgid "Total number of conflicts: " +msgstr "Total number of conflicts: " + +#. +> trunk +#: mergeresultwindow.cpp:850 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"Nr of automatically solved conflicts: " + +#. +> trunk +#: mergeresultwindow.cpp:851 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"Nr of unsolved conflicts: " + +#. +> trunk +#: mergeresultwindow.cpp:853 +msgid "Conflicts" +msgstr "Conflicts" + +#. +> trunk +#: mergeresultwindow.cpp:1728 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1736 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2725 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" + +#. +> trunk +#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 +msgid "Conflicts Left" +msgstr "Conflicts Left" + +#. +> trunk +#: mergeresultwindow.cpp:2734 +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" +msgstr "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" + +#. +> trunk +#: mergeresultwindow.cpp:2748 +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Creating backup failed. File not saved." + +#. +> trunk +#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 +msgid "File Save Error" +msgstr "File Save Error" + +#. +> trunk +#: mergeresultwindow.cpp:2792 +msgid "Error while writing." +msgstr "Error while writing." + +#. +> trunk +#: mergeresultwindow.cpp:3122 +msgid "Output" +msgstr "Output" + +#. +> trunk +#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 +msgid "[Modified]" +msgstr "[Modified]" + +#. +> trunk +#: mergeresultwindow.cpp:3141 +msgid "Encoding for saving" +msgstr "Encoding for saving" + +#. +> trunk +#: mergeresultwindow.cpp:3229 +msgid "Conflict" +msgstr "Conflict" + +#. +> trunk +#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 +#: mergeresultwindow.cpp:3265 +msgid "Codec from" +msgstr "Codec from" + +#. +> trunk +#: optiondialog.cpp:367 +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#. +> trunk +#: optiondialog.cpp:368 +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk +#: optiondialog.cpp:369 +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk +#: optiondialog.cpp:388 +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Change this if non-ASCII characters are not displayed correctly." + +#. +> trunk +#: optiondialog.cpp:465 +msgid "Configure" +msgstr "Configure" + +#. +> trunk +#: optiondialog.cpp:531 +msgid "Font" +msgstr "Font" + +#. +> trunk +#: optiondialog.cpp:532 +msgid "Editor & Diff Output Font" +msgstr "Editor & Diff Output Font" + +#. +> trunk +#: optiondialog.cpp:556 +msgid "Italic font for deltas" +msgstr "Italic font for deltas" + +#. +> trunk +#: optiondialog.cpp:559 +msgid "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." +msgstr "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." + +#. +> trunk +#: optiondialog.cpp:568 +msgid "Color" +msgstr "Colour" + +#. +> trunk +#: optiondialog.cpp:569 +msgid "Colors Settings" +msgstr "Colour Settings" + +#. +> trunk +#: optiondialog.cpp:588 +msgid "Editor and Diff Views:" +msgstr "Editor and Diff Views:" + +#. +> trunk +#: optiondialog.cpp:596 +msgid "Foreground color:" +msgstr "Foreground colour:" + +#. +> trunk +#: optiondialog.cpp:603 +msgid "Background color:" +msgstr "Background colour:" + +#. +> trunk +#: optiondialog.cpp:612 +msgid "Diff background color:" +msgstr "Diff background colour:" + +#. +> trunk +#: optiondialog.cpp:620 +msgid "Color A:" +msgstr "Colour A:" + +#. +> trunk +#: optiondialog.cpp:628 +msgid "Color B:" +msgstr "Colour B:" + +#. +> trunk +#: optiondialog.cpp:636 +msgid "Color C:" +msgstr "Colour C:" + +#. +> trunk +#: optiondialog.cpp:643 +msgid "Conflict color:" +msgstr "Conflict colour:" + +#. +> trunk +#: optiondialog.cpp:651 +msgid "Current range background color:" +msgstr "Current range background colour:" + +#. +> trunk +#: optiondialog.cpp:659 +msgid "Current range diff background color:" +msgstr "Current range diff background colour:" + +#. +> trunk +#: optiondialog.cpp:666 +msgid "Color for manually aligned difference ranges:" +msgstr "Colour for manually aligned difference ranges:" + +#. +> trunk +#: optiondialog.cpp:672 +msgid "Directory Comparison View:" +msgstr "Directory Comparison View:" + +#. +> trunk +#: optiondialog.cpp:678 +msgid "Newest file color:" +msgstr "Newest file colour:" + +#. +> trunk +#: optiondialog.cpp:682 +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Changing this colour will only be effective when starting the next directory comparison." + +#. +> trunk +#: optiondialog.cpp:687 +msgid "Oldest file color:" +msgstr "Oldest file colour:" + +#. +> trunk +#: optiondialog.cpp:695 +msgid "Middle age file color:" +msgstr "Middle age file colour:" + +#. +> trunk +#: optiondialog.cpp:703 +msgid "Color for missing files:" +msgstr "Colour for missing files:" + +#. +> trunk +#: optiondialog.cpp:717 +msgid "Editor" +msgstr "Editor" + +#. +> trunk +#: optiondialog.cpp:718 +msgid "Editor Behavior" +msgstr "Editor Behaviour" + +#. +> trunk +#: optiondialog.cpp:732 +msgid "Tab inserts spaces" +msgstr "Tab inserts spaces" + +#. +> trunk +#: optiondialog.cpp:735 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." + +#. +> trunk +#: optiondialog.cpp:741 +msgid "Tab size:" +msgstr "Tab size:" + +#. +> trunk +#: optiondialog.cpp:747 +msgid "Auto indentation" +msgstr "Auto indentation" + +#. +> trunk +#: optiondialog.cpp:750 +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "On: The indentation of the previous line is used for a new line.\n" + +#. +> trunk +#: optiondialog.cpp:754 +msgid "Auto copy selection" +msgstr "Auto copy selection" + +#. +> trunk +#: optiondialog.cpp:757 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." + +#. +> trunk +#: optiondialog.cpp:772 +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" + +#. +> trunk +#: optiondialog.cpp:784 +msgid "Diff" +msgstr "Diff" + +#. +> trunk +#: optiondialog.cpp:785 +msgid "Diff Settings" +msgstr "Diff Settings" + +#. +> trunk +#: optiondialog.cpp:809 +msgid "Treat as white space." +msgstr "Treat as white space." + +#. +> trunk +#: optiondialog.cpp:811 +msgid "Ignore numbers" +msgstr "Ignore numbers" + +#. +> trunk +#: optiondialog.cpp:814 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." + +#. +> trunk +#: optiondialog.cpp:819 +msgid "Ignore C/C++ comments" +msgstr "Ignore C/C++ comments" + +#. +> trunk +#: optiondialog.cpp:821 +msgid "Treat C/C++ comments like white space." +msgstr "Treat C/C++ comments like white space." + +#. +> trunk +#: optiondialog.cpp:825 +msgid "Ignore case" +msgstr "Ignore case" + +#. +> trunk +#: optiondialog.cpp:828 +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Treat case differences like white space changes. ('a'<=>'A')" + +#. +> trunk +#: optiondialog.cpp:832 +msgid "Preprocessor command:" +msgstr "Preprocessor command:" + +#. +> trunk +#: optiondialog.cpp:836 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "User defined pre-processing. (See the docs for details.)" + +#. +> trunk +#: optiondialog.cpp:839 +msgid "Line-matching preprocessor command:" +msgstr "Line-matching preprocessor command:" + +#. +> trunk +#: optiondialog.cpp:843 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" + +#. +> trunk +#: optiondialog.cpp:846 +msgid "Try hard (slower)" +msgstr "Try hard (slower)" + +#. +> trunk +#: optiondialog.cpp:849 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." + +#. +> trunk +#: optiondialog.cpp:854 +msgid "Align B and C for 3 input files" +msgstr "Align B and C for 3 input files" + +#. +> trunk +#: optiondialog.cpp:857 +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" + +#. +> trunk +#: optiondialog.cpp:870 +msgid "Merge Settings" +msgstr "Merge Settings" + +#. +> trunk +#: optiondialog.cpp:885 +msgid "Auto advance delay (ms):" +msgstr "Auto advance delay (ms):" + +#. +> trunk +#: optiondialog.cpp:890 +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 "" +"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" + +#. +> trunk +#: optiondialog.cpp:895 +msgid "Show info dialogs" +msgstr "Show info dialogues" + +#. +> trunk +#: optiondialog.cpp:897 +msgid "Show a dialog with information about the number of conflicts." +msgstr "Show a dialogue with information about the number of conflicts." + +#. +> trunk +#: optiondialog.cpp:900 +msgid "White space 2-file merge default:" +msgstr "White space 2-file merge default:" + +#. +> trunk +#: optiondialog.cpp:904 optiondialog.cpp:917 +msgid "Manual Choice" +msgstr "Manual Choice" + +#. +> trunk +#: optiondialog.cpp:908 optiondialog.cpp:922 +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "Allow the merge algorithm to automatically select an input for white-space-only changes." + +#. +> trunk +#: optiondialog.cpp:913 +msgid "White space 3-file merge default:" +msgstr "White space 3-file merge default:" + +#. +> trunk +#: optiondialog.cpp:927 +msgid "Automatic Merge Regular Expression" +msgstr "Automatic Merge Regular Expression" + +#. +> trunk +#: optiondialog.cpp:936 smalldialogs.cpp:414 +msgid "Auto merge regular expression:" +msgstr "Auto merge regular expression:" + +#. +> trunk +#: optiondialog.cpp:940 +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." + +#. +> trunk +#: optiondialog.cpp:946 +msgid "Run regular expression auto merge on merge start" +msgstr "Run regular expression auto merge on merge start" + +#. +> trunk +#: optiondialog.cpp:948 +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" + +#. +> trunk +#: optiondialog.cpp:953 +msgid "Version Control History Merging" +msgstr "Version Control History Merging" + +#. +> trunk +#: optiondialog.cpp:962 smalldialogs.cpp:441 +msgid "History start regular expression:" +msgstr "History start regular expression:" + +#. +> trunk +#: optiondialog.cpp:966 +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" + +#. +> trunk +#: optiondialog.cpp:972 smalldialogs.cpp:469 +msgid "History entry start regular expression:" +msgstr "History entry start regular expression:" + +#. +> trunk +#: optiondialog.cpp:984 +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use brackets to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." + +#. +> trunk +#: optiondialog.cpp:992 +msgid "History merge sorting" +msgstr "History merge sorting" + +#. +> trunk +#: optiondialog.cpp:994 +msgid "Sort version control history by a key." +msgstr "Sort version control history by a key." + +#. +> trunk +#: optiondialog.cpp:1004 +msgid "History entry start sort key order:" +msgstr "History entry start sort key order:" + +#. +> trunk +#: optiondialog.cpp:1008 +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Each pair of brackets used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." + +#. +> trunk +#: optiondialog.cpp:1019 +msgid "Merge version control history on merge start" +msgstr "Merge version control history on merge start" + +#. +> trunk +#: optiondialog.cpp:1021 +msgid "Run version control history automerge on merge start." +msgstr "Run version control history automerge on merge start." + +#. +> trunk +#: optiondialog.cpp:1025 +msgid "Max number of history entries:" +msgstr "Max number of history entries:" + +#. +> trunk +#: optiondialog.cpp:1028 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Cut off after specified number. Use -1 for infinite number of entries." + +#. +> trunk +#: optiondialog.cpp:1032 +msgid "Test your regular expressions" +msgstr "Test your regular expressions" + +#. +> trunk +#: optiondialog.cpp:1037 +msgid "Irrelevant merge command:" +msgstr "Irrelevant merge command:" + +#. +> trunk +#: optiondialog.cpp:1041 +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" + +#. +> trunk +#: optiondialog.cpp:1047 +msgid "Auto save and quit on merge without conflicts" +msgstr "Auto save and quit on merge without conflicts" + +#. +> trunk +#: optiondialog.cpp:1050 +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" + +#. +> trunk +#: optiondialog.cpp:1061 optiondialog.cpp:1062 +msgid "Directory" +msgstr "Directory" + +#. +> trunk +#: optiondialog.cpp:1075 +msgid "Recursive directories" +msgstr "Recursive directories" + +#. +> trunk +#: optiondialog.cpp:1077 +msgid "Whether to analyze subdirectories or not." +msgstr "Whether to analyse subdirectories or not." + +#. +> trunk +#: optiondialog.cpp:1079 +msgid "File pattern(s):" +msgstr "File pattern(s):" + +#. +> trunk +#: optiondialog.cpp:1084 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Pattern(s) of files to be analysed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" + +#. +> trunk +#: optiondialog.cpp:1090 +msgid "File-anti-pattern(s):" +msgstr "File-anti-pattern(s):" + +#. +> trunk +#: optiondialog.cpp:1095 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" + +#. +> trunk +#: optiondialog.cpp:1101 +msgid "Dir-anti-pattern(s):" +msgstr "Dir-anti-pattern(s):" + +#. +> trunk +#: optiondialog.cpp:1106 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" + +#. +> trunk +#: optiondialog.cpp:1112 +msgid "Use .cvsignore" +msgstr "Use .cvsignore" + +#. +> trunk +#: optiondialog.cpp:1115 +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." + +#. +> trunk +#: optiondialog.cpp:1120 +msgid "Find hidden files and directories" +msgstr "Find hidden files and directories" + +#. +> trunk +#: optiondialog.cpp:1123 +msgid "Finds files and directories with the hidden attribute." +msgstr "Finds files and directories with the hidden attribute." + +#. +> trunk +#: optiondialog.cpp:1125 +msgid "Finds files and directories starting with '.'." +msgstr "Finds files and directories starting with '.'." + +#. +> trunk +#: optiondialog.cpp:1129 +msgid "Follow file links" +msgstr "Follow file links" + +#. +> trunk +#: optiondialog.cpp:1132 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." + +#. +> trunk +#: optiondialog.cpp:1137 +msgid "Follow directory links" +msgstr "Follow directory links" + +#. +> trunk +#: optiondialog.cpp:1140 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." + +#. +> trunk +#: optiondialog.cpp:1156 +msgid "Case sensitive filename comparison" +msgstr "Case sensitive filename comparison" + +#. +> trunk +#: optiondialog.cpp:1159 +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" + +#. +> trunk +#: optiondialog.cpp:1163 +msgid "File Comparison Mode" +msgstr "File Comparison Mode" + +#. +> trunk +#: optiondialog.cpp:1169 +msgid "Binary comparison" +msgstr "Binary comparison" + +#. +> trunk +#: optiondialog.cpp:1170 +msgid "Binary comparison of each file. (Default)" +msgstr "Binary comparison of each file. (Default)" + +#. +> trunk +#: optiondialog.cpp:1173 +msgid "Full analysis" +msgstr "Full analysis" + +#. +> trunk +#: optiondialog.cpp:1174 +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" + +#. +> trunk +#: optiondialog.cpp:1178 +msgid "Trust the size and modification date (unsafe)" +msgstr "Trust the size and modification date (unsafe)" + +#. +> trunk +#: optiondialog.cpp:1179 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." + +#. +> trunk +#: optiondialog.cpp:1184 +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Trust the size and date, but use binary comparison if date does not match (unsafe)" + +#. +> trunk +#: optiondialog.cpp:1185 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." + +#. +> trunk +#: optiondialog.cpp:1190 +msgid "Trust the size (unsafe)" +msgstr "Trust the size (unsafe)" + +#. +> trunk +#: optiondialog.cpp:1191 +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 "" +"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." + +#. +> trunk +#: optiondialog.cpp:1199 +msgid "Synchronize directories" +msgstr "Synchronise directories" + +#. +> trunk +#: optiondialog.cpp:1202 +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 "" +"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." + +#. +> trunk +#: optiondialog.cpp:1208 +msgid "White space differences considered equal" +msgstr "White space differences considered equal" + +#. +> trunk +#: optiondialog.cpp:1211 +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." + +#. +> trunk +#: optiondialog.cpp:1217 +msgid "Copy newer instead of merging (unsafe)" +msgstr "Copy newer instead of merging (unsafe)" + +#. +> trunk +#: optiondialog.cpp:1220 +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 "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." + +#. +> trunk +#: optiondialog.cpp:1225 +msgid "Backup files (.orig)" +msgstr "Backup files (.orig)" + +#. +> trunk +#: optiondialog.cpp:1228 +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." + +#. +> trunk +#: optiondialog.cpp:1301 optiondialog.cpp:1302 +msgid "Regional Settings" +msgstr "Regional Settings" + +#. +> trunk +#: optiondialog.cpp:1405 +msgid "Language (restart required)" +msgstr "Language (restart required)" + +#. +> trunk +#: optiondialog.cpp:1448 +msgid "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." +msgstr "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." + +#. +> trunk +#: optiondialog.cpp:1466 +msgid "Use the same encoding for everything:" +msgstr "Use the same encoding for everything:" + +#. +> trunk +#: optiondialog.cpp:1469 +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." + +#. +> trunk +#: optiondialog.cpp:1474 +msgid "Note: Local Encoding is " +msgstr "Note: Local Encoding is " + +#. +> trunk +#: optiondialog.cpp:1478 +msgid "File Encoding for A:" +msgstr "File Encoding for A:" + +#. +> trunk +#: optiondialog.cpp:1484 +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" + +#. +> trunk +#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 +msgid "Auto Detect Unicode" +msgstr "Auto Detect Unicode" + +#. +> trunk +#: optiondialog.cpp:1493 +msgid "File Encoding for B:" +msgstr "File Encoding for B:" + +#. +> trunk +#: optiondialog.cpp:1502 +msgid "File Encoding for C:" +msgstr "File Encoding for C:" + +#. +> trunk +#: optiondialog.cpp:1511 +msgid "File Encoding for Merge Output and Saving:" +msgstr "File Encoding for Merge Output and Saving:" + +#. +> trunk +#: optiondialog.cpp:1515 +msgid "Auto Select" +msgstr "Auto Select" + +#. +> trunk +#: optiondialog.cpp:1518 +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialogue will ask the user to choose the encoding for saving." + +#. +> trunk +#: optiondialog.cpp:1522 +msgid "File Encoding for Preprocessor Files:" +msgstr "File Encoding for Preprocessor Files:" + +#. +> trunk +#: optiondialog.cpp:1533 +msgid "Right To Left Language" +msgstr "Right To Left Language" + +#. +> trunk +#: optiondialog.cpp:1536 +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." + +#. +> trunk +#: optiondialog.cpp:1551 +msgid "Integration" +msgstr "Integration" + +#. +> trunk +#: optiondialog.cpp:1552 +msgid "Integration Settings" +msgstr "Integration Settings" + +#. +> trunk +#: optiondialog.cpp:1566 +msgid "Command line options to ignore:" +msgstr "Command line options to ignore:" + +#. +> trunk +#: optiondialog.cpp:1571 +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." + +#. +> trunk +#: optiondialog.cpp:1578 +msgid "Quit also via Escape key" +msgstr "Quit also via Escape key" + +#. +> trunk +#: optiondialog.cpp:1581 +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." + +#. +> trunk +#: optiondialog.cpp:1586 +msgid "Integrate with ClearCase" +msgstr "Integrate with ClearCase" + +#. +> trunk +#: optiondialog.cpp:1589 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" + +#. +> trunk +#: optiondialog.cpp:1595 +msgid "Remove ClearCase Integration" +msgstr "Remove ClearCase Integration" + +#. +> trunk +#: optiondialog.cpp:1598 +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "Restore the old \"map\" file from before doing the ClearCase integration." + +#. +> trunk +#: optiondialog.cpp:1683 +msgid "Incompatible Font" +msgstr "Incompatible Font" + +#. +> trunk +#: optiondialog.cpp:1684 +msgid "Continue at Own Risk" +msgstr "Continue at Own Risk" + +#. +> trunk +#: optiondialog.cpp:1685 +msgid "Select Another Font" +msgstr "Select Another Font" + +#. +> trunk +#: optiondialog.cpp:1720 +msgid "This resets all options. Not only those of the current topic." +msgstr "This resets all options. Not only those of the current topic." + +#. +> trunk +#: pdiff.cpp:260 +msgid "PreprocessorCmd: " +msgstr "PreprocessorCmd: " + +#. +> trunk +#: pdiff.cpp:265 +msgid "The following option(s) you selected might change data:\n" +msgstr "The following option(s) you selected might change data:\n" + +#. +> trunk +#: pdiff.cpp:266 +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" + +#. +> trunk +#: pdiff.cpp:268 +msgid "Option Unsafe for Merging" +msgstr "Option Unsafe for Merging" + +#. +> trunk +#: pdiff.cpp:269 +msgid "Use These Options During Merge" +msgstr "Use These Options During Merge" + +#. +> trunk +#: pdiff.cpp:270 +msgid "Disable Unsafe Options" +msgstr "Disable Unsafe Options" + +#. +> trunk +#: pdiff.cpp:300 +msgid "Loading A" +msgstr "Loading A" + +#. +> trunk +#: pdiff.cpp:304 +msgid "Loading B" +msgstr "Loading B" + +#. +> trunk +#: pdiff.cpp:321 pdiff.cpp:347 +msgid "Diff: A <-> B" +msgstr "Diff: A <-> B" + +#. +> trunk +#: pdiff.cpp:327 pdiff.cpp:372 +msgid "Linediff: A <-> B" +msgstr "Linediff: A <-> B" + +#. +> trunk +#: pdiff.cpp:338 +msgid "Loading C" +msgstr "Loading C" + +#. +> trunk +#: pdiff.cpp:350 +msgid "Diff: B <-> C" +msgstr "Diff: B <-> C" + +#. +> trunk +#: pdiff.cpp:353 +msgid "Diff: A <-> C" +msgstr "Diff: A <-> C" + +#. +> trunk +#: pdiff.cpp:375 +msgid "Linediff: B <-> C" +msgstr "Linediff: B <-> C" + +#. +> trunk +#: pdiff.cpp:378 +msgid "Linediff: A <-> C" +msgstr "Linediff: A <-> C" + +#. +> trunk +#: pdiff.cpp:534 +msgid "All input files contain the same text, but are not binary equal." +msgstr "All input files contain the same text, but are not binary equal." + +#. +> trunk +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Files %1 and %2 have equal text, but are not binary equal. \n" + +#. +> trunk +#: pdiff.cpp:551 +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 "" +"Some input files do not seem to be pure textfiles.\n" +"Note that the KDiff3-merge was not meant for binary data.\n" +"Continue at your own risk." + +#. +> trunk +#: pdiff.cpp:566 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Don't save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." + +#. +> trunk +#: pdiff.cpp:1080 +msgid "Abort" +msgstr "Abort" + +#. +> trunk +#: pdiff.cpp:1087 pdiff.cpp:1175 +msgid "Opening files..." +msgstr "Opening files..." + +#. +> trunk +#: pdiff.cpp:1152 pdiff.cpp:1223 +msgid "File open error" +msgstr "File open error" + +#. +> trunk +#: pdiff.cpp:1255 +msgid "Cutting selection..." +msgstr "Cutting selection..." + +#. +> trunk +#: pdiff.cpp:1276 +msgid "Copying selection to clipboard..." +msgstr "Copying selection to clipboard..." + +#. +> trunk +#: pdiff.cpp:1292 +msgid "Inserting clipboard contents..." +msgstr "Inserting clipboard contents..." + +#. +> trunk +#: pdiff.cpp:1814 +msgid "Save && Continue" +msgstr "Save && Continue" + +#. +> trunk +#: pdiff.cpp:1815 +msgid "Continue Without Saving" +msgstr "Continue Without Saving" + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search complete." +msgstr "Search complete." + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search Complete" +msgstr "Search Complete" + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Nothing is selected in either diff input window." +msgstr "Nothing is selected in either diff input window." + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Error while adding manual diff range" +msgstr "Error while adding manual diff range" + +#. +> trunk +#: smalldialogs.cpp:58 +msgid "A (Base):" +msgstr "A (Base):" + +#. +> trunk +#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 +#: smalldialogs.cpp:142 +msgid "File..." +msgstr "File..." + +#. +> trunk +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:144 +msgid "Dir..." +msgstr "Dir..." + +#. +> trunk +#: smalldialogs.cpp:93 +msgid "C (Optional):" +msgstr "C (Optional):" + +#. +> trunk +#: smalldialogs.cpp:116 +msgid "Swap/Copy Names ..." +msgstr "Swap/Copy Names ..." + +#. +> trunk +#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Swap %1<->%2" + +#. +> trunk +#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#, kde-format +msgid "Copy %1->Output" +msgstr "Copy %1->Output" + +#. +> trunk +#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Swap %1<->Output" + +#. +> trunk +#: smalldialogs.cpp:136 +msgid "Output (optional):" +msgstr "Output (optional):" + +#. +> trunk +#: smalldialogs.cpp:168 +msgid "Configure..." +msgstr "Configure..." + +#. +> trunk +#: smalldialogs.cpp:174 +msgid "&OK" +msgstr "&OK" + +#. +> trunk +#: smalldialogs.cpp:362 +msgid "Search text:" +msgstr "Search text:" + +#. +> trunk +#: smalldialogs.cpp:369 +msgid "Case sensitive" +msgstr "Case sensitive" + +#. +> trunk +#: smalldialogs.cpp:372 +msgid "Search A" +msgstr "Search A" + +#. +> trunk +#: smalldialogs.cpp:377 +msgid "Search B" +msgstr "Search B" + +#. +> trunk +#: smalldialogs.cpp:382 +msgid "Search C" +msgstr "Search C" + +#. +> trunk +#: smalldialogs.cpp:387 +msgid "Search output" +msgstr "Search output" + +#. +> trunk +#: smalldialogs.cpp:392 +msgid "&Search" +msgstr "&Search" + +#. +> trunk +#: smalldialogs.cpp:409 +msgid "Regular Expression Tester" +msgstr "Regular Expression Tester" + +#. +> trunk +#: smalldialogs.cpp:422 +msgid "Example auto merge line:" +msgstr "Example auto merge line:" + +#. +> trunk +#: smalldialogs.cpp:424 +msgid "To test auto merge, copy a line as used in your files." +msgstr "To test auto merge, copy a line as used in your files." + +#. +> trunk +#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 +msgid "Match result:" +msgstr "Match result:" + +#. +> trunk +#: smalldialogs.cpp:449 +msgid "Example history start line (with leading comment):" +msgstr "Example history start line (with leading comment):" + +#. +> trunk +#: smalldialogs.cpp:451 +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Copy a history start line as used in your files,\n" +"including the leading comment." + +#. +> trunk +#: smalldialogs.cpp:477 +msgid "History sort key order:" +msgstr "History sort key order:" + +#. +> trunk +#: smalldialogs.cpp:485 +msgid "Example history entry start line (without leading comment):" +msgstr "Example history entry start line (without leading comment):" + +#. +> trunk +#: smalldialogs.cpp:487 +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." + +#. +> trunk +#: smalldialogs.cpp:501 +msgid "Sort key result:" +msgstr "Sort key result:" + +#. +> trunk +#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 +msgid "Match success." +msgstr "Match success." + +#. +> trunk +#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 +msgid "Match failed." +msgstr "Match failed." + +#. +> trunk +#: smalldialogs.cpp:574 +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Opening and closing brackets do not match in regular expression." Index: trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/en_GB/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,102 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Steve Allewell , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2011-08-02 08:55+0200\n" +"PO-Revision-Date: 2014-07-04 23:10+0100\n" +"Last-Translator: Steve Allewell \n" +"Language-Team: British English \n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.5\n" + +#. +> trunk +#: kdiff3fileitemaction.cpp:94 +msgid "KDiff3 ..." +msgstr "KDiff3 ..." + +#. +> trunk +#: kdiff3fileitemaction.cpp:125 +#, kde-format +msgid "Compare with %1" +msgstr "Compare with %1" + +#. +> trunk +#: kdiff3fileitemaction.cpp:131 +#, kde-format +msgid "Merge with %1" +msgstr "Merge with %1" + +#. +> trunk +#: kdiff3fileitemaction.cpp:137 +#, kde-format +msgid "Save '%1' for later" +msgstr "Save '%1' for later" + +#. +> trunk +#: kdiff3fileitemaction.cpp:143 +msgid "3-way merge with base" +msgstr "3-way merge with base" + +#. +> trunk +#: kdiff3fileitemaction.cpp:150 +msgid "Compare with ..." +msgstr "Compare with ..." + +#. +> trunk +#: kdiff3fileitemaction.cpp:162 +msgid "Clear list" +msgstr "Clear list" + +#. +> trunk +#: kdiff3fileitemaction.cpp:170 +msgid "Compare" +msgstr "Compare" + +#. +> trunk +#: kdiff3fileitemaction.cpp:176 +msgid "3 way comparison" +msgstr "3 way comparison" + +#. +> trunk +#: kdiff3fileitemaction.cpp:180 +msgid "About KDiff3 menu plugin ..." +msgstr "About KDiff3 menu plugin ..." + +#. +> trunk +#: kdiff3fileitemaction.cpp:284 +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk +#: kdiff3fileitemaction.cpp:286 +msgid "" +"Using the contextmenu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." + +#. +> trunk +#: kdiff3fileitemaction.cpp:294 +msgid "About KDiff3 File Item Action Plugin" +msgstr "About KDiff3 File Item Action Plugin" Index: trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,3689 +0,0 @@ -# translation of kdiff3.po to British English -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# Malcolm Hunter , 2003. -# Jonathan Riddell , 2003. -# Andrew Coles , 2004, 2005, 2009, 2010. -# Steve Allewell , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-30 10:41+0100\n" -"PO-Revision-Date: 2014-07-06 17:18+0100\n" -"Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" - -#. +> trunk -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Andrew Coles, Steve Allewell" - -#. +> trunk -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "andrew_coles@yahoo.co.uk, steve.allewell@gmail.com" - -#. +> trunk -#: diff.cpp:251 -msgid "Writing clipboard data to temp file failed." -msgstr "Writing clipboard data to temp file failed." - -#. +> trunk -#: diff.cpp:255 -msgid "From Clipboard" -msgstr "From Clipboard" - -#. +> trunk -#: diff.cpp:537 -msgid "Expecting space after closing apostroph." -msgstr "Expecting space after closing apostrophe." - -#. +> trunk -#: diff.cpp:540 -msgid "Not matching apostrophs." -msgstr "No matching apostrophes." - -#. +> trunk -#: diff.cpp:562 -msgid "Unexpected apostroph within argument." -msgstr "Unexpected apostrophe within argument." - -#. +> trunk -#: diff.cpp:569 -msgid "No program specified." -msgstr "No program specified." - -#. +> trunk -#: diff.cpp:671 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." - -#. +> trunk -#: diff.cpp:719 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." - -#. +> trunk -#: diff.cpp:1850 diff.cpp:1864 -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" - -#. +> trunk -#: diff.cpp:1852 diff.cpp:1866 -msgid "Severe Internal Error" -msgstr "Severe Internal Error" - -#. +> trunk -#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 -msgid "File" -msgstr "File" - -#. +> trunk -#: difftextwindow.cpp:403 -msgid "Line" -msgstr "Line" - -#. +> trunk -#: difftextwindow.cpp:405 -msgid "Line not available" -msgstr "Line not available" - -#. +> trunk -#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 -msgid "Encoding:" -msgstr "Encoding:" - -#. +> trunk -#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 -#: optiondialog.cpp:762 -msgid "Line end style:" -msgstr "Line end style:" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 -msgid "DOS" -msgstr "DOS" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 -msgid "Unix" -msgstr "Unix" - -#. +> trunk -#: difftextwindow.cpp:1759 kdiff3.cpp:831 -msgid "Top line" -msgstr "Top line" - -#. +> trunk -#: difftextwindow.cpp:1769 -msgid "End" -msgstr "End" - -#. +> trunk -#: directorymergewindow.cpp:150 -msgid "Mix of links and normal files." -msgstr "Mix of links and normal files." - -#. +> trunk -#: directorymergewindow.cpp:157 -msgid "Link: " -msgstr "Link: " - -#. +> trunk -#: directorymergewindow.cpp:165 -msgid "Size. " -msgstr "Size. " - -#. +> trunk -#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 -msgid "Date & Size: " -msgstr "Date & Size: " - -#. +> trunk -#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Creating temp copy of %1 failed." - -#. +> trunk -#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 -#, kde-format -msgid "Opening %1 failed." -msgstr "Opening %1 failed." - -#. +> trunk -#: directorymergewindow.cpp:227 -msgid "Comparing file..." -msgstr "Comparing file..." - -#. +> trunk -#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 -#, kde-format -msgid "Error reading from %1" -msgstr "Error reading from %1" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Name" -msgstr "Name" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Operation" -msgstr "Operation" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Status" -msgstr "Status" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Unsolved" -msgstr "Unsolved" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Solved" -msgstr "Solved" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Nonwhite" -msgstr "Nonwhite" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "White" -msgstr "White" - -#. +> trunk -#: directorymergewindow.cpp:402 -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" - -#. +> trunk -#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 -#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 -msgid "Warning" -msgstr "Warning" - -#. +> trunk -#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 -msgid "Rescan" -msgstr "Rescan" - -#. +> trunk -#: directorymergewindow.cpp:405 pdiff.cpp:1081 -msgid "Continue Merging" -msgstr "Continue Merging" - -#. +> trunk -#: directorymergewindow.cpp:562 -msgid "Opening of directories failed:" -msgstr "Opening of directories failed:" - -#. +> trunk -#: directorymergewindow.cpp:565 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Dir A \"%1\" does not exist or is not a directory.\n" - -#. +> trunk -#: directorymergewindow.cpp:568 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Dir B \"%1\" does not exist or is not a directory.\n" - -#. +> trunk -#: directorymergewindow.cpp:571 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Dir C \"%1\" does not exist or is not a directory.\n" - -#. +> trunk -#: directorymergewindow.cpp:573 -msgid "Directory Open Error" -msgstr "Directory Open Error" - -#. +> trunk -#: directorymergewindow.cpp:581 -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." - -#. +> trunk -#: directorymergewindow.cpp:583 -msgid "Parameter Warning" -msgstr "Parameter Warning" - -#. +> trunk -#: directorymergewindow.cpp:588 -msgid "Scanning directories..." -msgstr "Scanning directories..." - -#. +> trunk -#: directorymergewindow.cpp:621 -msgid "Reading Directory A" -msgstr "Reading Directory A" - -#. +> trunk -#: directorymergewindow.cpp:643 -msgid "Reading Directory B" -msgstr "Reading Directory B" - -#. +> trunk -#: directorymergewindow.cpp:665 -msgid "Reading Directory C" -msgstr "Reading Directory C" - -#. +> trunk -#: directorymergewindow.cpp:691 -msgid "Some subdirectories were not readable in" -msgstr "Some subdirectories were not readable in" - -#. +> trunk -#: directorymergewindow.cpp:696 -msgid "Check the permissions of the subdirectories." -msgstr "Check the permissions of the subdirectories." - -#. +> trunk -#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 -#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 -#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 -msgid "Ready." -msgstr "Ready." - -#. +> trunk -#: directorymergewindow.cpp:749 -msgid "Directory Comparison Status" -msgstr "Directory Comparison Status" - -#. +> trunk -#: directorymergewindow.cpp:750 -msgid "Number of subdirectories:" -msgstr "Number of subdirectories:" - -#. +> trunk -#: directorymergewindow.cpp:751 -msgid "Number of equal files:" -msgstr "Number of equal files:" - -#. +> trunk -#: directorymergewindow.cpp:752 -msgid "Number of different files:" -msgstr "Number of different files:" - -#. +> trunk -#: directorymergewindow.cpp:755 -msgid "Number of manual merges:" -msgstr "Number of manual merges:" - -#. +> trunk -#: directorymergewindow.cpp:926 -msgid "This affects all merge operations." -msgstr "This affects all merge operations." - -#. +> trunk -#: directorymergewindow.cpp:927 -msgid "Changing All Merge Operations" -msgstr "Changing All Merge Operations" - -#. +> trunk -#: directorymergewindow.cpp:1326 -msgid "Processing " -msgstr "Processing " - -#. +> trunk -#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 -msgid "To do." -msgstr "To do." - -#. +> trunk -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 -msgid "Copy A to B" -msgstr "Copy A to B" - -#. +> trunk -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 -msgid "Copy B to A" -msgstr "Copy B to A" - -#. +> trunk -#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 -msgid "Delete A" -msgstr "Delete A" - -#. +> trunk -#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 -msgid "Delete B" -msgstr "Delete B" - -#. +> trunk -#: directorymergewindow.cpp:1828 -msgid "Delete A & B" -msgstr "Delete A & B" - -#. +> trunk -#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 -msgid "Merge to A" -msgstr "Merge to A" - -#. +> trunk -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 -msgid "Merge to B" -msgstr "Merge to B" - -#. +> trunk -#: directorymergewindow.cpp:1831 -msgid "Merge to A & B" -msgstr "Merge to A & B" - -#. +> trunk -#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 -msgid "Delete (if exists)" -msgstr "Delete (if exists)" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 -msgid "Merge" -msgstr "Merge" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -msgid "Merge (manual)" -msgstr "Merge (manual)" - -#. +> trunk -#: directorymergewindow.cpp:1838 -msgid "Error: Conflicting File Types" -msgstr "Error: Conflicting File Types" - -#. +> trunk -#: directorymergewindow.cpp:1839 -msgid "Error: Changed and Deleted" -msgstr "Error: Changed and Deleted" - -#. +> trunk -#: directorymergewindow.cpp:1840 -msgid "Error: Dates are equal but files are not." -msgstr "Error: Dates are equal but files are not." - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 -msgid "This operation is currently not possible." -msgstr "This operation is currently not possible." - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 -msgid "Operation Not Possible" -msgstr "Operation Not Possible" - -#. +> trunk -#: directorymergewindow.cpp:1959 -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 "" -"This should never happen: \n" -"\n" -"mergeResultSaved: m_pMFI=0\n" -"\n" -"If you know how to reproduce this, please contact the program author." - -#. +> trunk -#: directorymergewindow.cpp:1959 -msgid "Program Error" -msgstr "Program Error" - -#. +> trunk -#: directorymergewindow.cpp:1970 -msgid "An error occurred while copying.\n" -msgstr "An error occurred while copying.\n" - -#. +> trunk -#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 -#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 -#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 -#: directorymergewindow.cpp:2388 -msgid "Error" -msgstr "Error" - -#. +> trunk -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 -msgid "Merge Error" -msgstr "Merge Error" - -#. +> trunk -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 -msgid "Error." -msgstr "Error." - -#. +> trunk -#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 -#: directorymergewindow.cpp:2326 -msgid "Done." -msgstr "Done." - -#. +> trunk -#: directorymergewindow.cpp:2004 -msgid "Not saved." -msgstr "Not saved." - -#. +> trunk -#: directorymergewindow.cpp:2039 -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Unknown merge operation. (This must never happen!)" - -#. +> trunk -#: directorymergewindow.cpp:2071 -msgid "Unknown merge operation." -msgstr "Unknown merge operation." - -#. +> trunk -#: directorymergewindow.cpp:2086 -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 "" -"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!" - -#. +> trunk -#: directorymergewindow.cpp:2091 -msgid "Starting Merge" -msgstr "Starting Merge" - -#. +> trunk -#: directorymergewindow.cpp:2092 -msgid "Do It" -msgstr "Do It" - -#. +> trunk -#: directorymergewindow.cpp:2093 -msgid "Simulate It" -msgstr "Simulate It" - -#. +> trunk -#: directorymergewindow.cpp:2119 -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "The highlighted item has a different type in the different directories. Select what to do." - -#. +> trunk -#: directorymergewindow.cpp:2128 -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "The modification dates of the file are equal but the files are not. Select what to do." - -#. +> trunk -#: directorymergewindow.cpp:2137 -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "The highlighted item was changed in one directory and deleted in the other. Select what to do." - -#. +> trunk -#: directorymergewindow.cpp:2188 -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "This operation is currently not possible because directory merge is currently running." - -#. +> trunk -#: directorymergewindow.cpp:2248 -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 "" -"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?" - -#. +> trunk -#: directorymergewindow.cpp:2250 -msgid "Continue merge after an error" -msgstr "Continue merge after an error" - -#. +> trunk -#: directorymergewindow.cpp:2251 -msgid "Continue With Last Item" -msgstr "Continue With Last Item" - -#. +> trunk -#: directorymergewindow.cpp:2252 -msgid "Skip Item" -msgstr "Skip Item" - -#. +> trunk -#: directorymergewindow.cpp:2286 -msgid "Skipped." -msgstr "Skipped." - -#. +> trunk -#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 -msgid "In progress..." -msgstr "In progress..." - -#. +> trunk -#: directorymergewindow.cpp:2341 -msgid "Merge operation complete." -msgstr "Merge operation complete." - -#. +> trunk -#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 -msgid "Merge Complete" -msgstr "Merge Complete" - -#. +> trunk -#: directorymergewindow.cpp:2354 -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Simulated merge complete: Check if you agree with the proposed operations." - -#. +> trunk -#: directorymergewindow.cpp:2388 -msgid "An error occurred. Press OK to see detailed information.\n" -msgstr "An error occurred. Press OK to see detailed information.\n" - -#. +> trunk -#: directorymergewindow.cpp:2420 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Error: While deleting %1: Creating backup failed." - -#. +> trunk -#: directorymergewindow.cpp:2427 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "delete directory recursively( %1 )" - -#. +> trunk -#: directorymergewindow.cpp:2429 -#, kde-format -msgid "delete( %1 )" -msgstr "delete( %1 )" - -#. +> trunk -#: directorymergewindow.cpp:2444 -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Error: delete dir operation failed while trying to read the directory." - -#. +> trunk -#: directorymergewindow.cpp:2463 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Error: rmdir( %1 ) operation failed." - -#. +> trunk -#: directorymergewindow.cpp:2473 -msgid "Error: delete operation failed." -msgstr "Error: delete operation failed." - -#. +> trunk -#: directorymergewindow.cpp:2499 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "manual merge( %1, %2, %3 -> %4)" - -#. +> trunk -#: directorymergewindow.cpp:2502 -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Note: After a manual merge the user should continue by pressing F7." - -#. +> trunk -#: directorymergewindow.cpp:2527 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." - -#. +> trunk -#: directorymergewindow.cpp:2536 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "copyLink( %1 -> %2 )" - -#. +> trunk -#: directorymergewindow.cpp:2547 -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Error: copyLink failed: Remote links are not yet supported." - -#. +> trunk -#: directorymergewindow.cpp:2553 -msgid "Error: copyLink failed." -msgstr "Error: copyLink failed." - -#. +> trunk -#: directorymergewindow.cpp:2578 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "copy( %1 -> %2 )" - -#. +> trunk -#: directorymergewindow.cpp:2604 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." - -#. +> trunk -#: directorymergewindow.cpp:2610 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "rename( %1 -> %2 )" - -#. +> trunk -#: directorymergewindow.cpp:2619 -msgid "Error: Rename failed." -msgstr "Error: Rename failed." - -#. +> trunk -#: directorymergewindow.cpp:2637 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Error during makeDir of %1. Cannot delete existing file." - -#. +> trunk -#: directorymergewindow.cpp:2653 -#, kde-format -msgid "makeDir( %1 )" -msgstr "makeDir( %1 )" - -#. +> trunk -#: directorymergewindow.cpp:2663 -msgid "Error while creating directory." -msgstr "Error while creating directory." - -#. +> trunk -#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 -msgid "Dest" -msgstr "Dest" - -#. +> trunk -#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 -msgid "Dir" -msgstr "Dir" - -#. +> trunk -#: directorymergewindow.cpp:2692 -msgid "Type" -msgstr "Type" - -#. +> trunk -#: directorymergewindow.cpp:2692 -msgid "Size" -msgstr "Size" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Attr" -msgstr "Attr" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Last Modification" -msgstr "Last Modification" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Link-Destination" -msgstr "Link-Destination" - -#. +> trunk -#: directorymergewindow.cpp:2740 -msgid "not available" -msgstr "not available" - -#. +> trunk -#: directorymergewindow.cpp:2760 -msgid "A (Dest): " -msgstr "A (Dest): " - -#. +> trunk -#: directorymergewindow.cpp:2763 -msgid "A (Base): " -msgstr "A (Base): " - -#. +> trunk -#: directorymergewindow.cpp:2769 -msgid "B (Dest): " -msgstr "B (Dest): " - -#. +> trunk -#: directorymergewindow.cpp:2777 -msgid "C (Dest): " -msgstr "C (Dest): " - -#. +> trunk -#: directorymergewindow.cpp:2783 -msgid "Dest: " -msgstr "Dest: " - -#. +> trunk -#: directorymergewindow.cpp:2850 -msgid "Save Directory Merge State As..." -msgstr "Save Directory Merge State As..." - -#. +> trunk -#: directorymergewindow.cpp:2973 -msgid "Start/Continue Directory Merge" -msgstr "Start/Continue Directory Merge" - -#. +> trunk -#: directorymergewindow.cpp:2974 -msgid "Run Operation for Current Item" -msgstr "Run Operation for Current Item" - -#. +> trunk -#: directorymergewindow.cpp:2975 -msgid "Compare Selected File" -msgstr "Compare Selected File" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "Merge Current File" -msgstr "Merge Current File" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "" -"Merge\n" -"File" -msgstr "" -"Merge\n" -"File" - -#. +> trunk -#: directorymergewindow.cpp:2977 -msgid "Fold All Subdirs" -msgstr "Fold All Subdirs" - -#. +> trunk -#: directorymergewindow.cpp:2978 -msgid "Unfold All Subdirs" -msgstr "Unfold All Subdirs" - -#. +> trunk -#: directorymergewindow.cpp:2982 -msgid "Choose A for All Items" -msgstr "Choose A for All Items" - -#. +> trunk -#: directorymergewindow.cpp:2983 -msgid "Choose B for All Items" -msgstr "Choose B for All Items" - -#. +> trunk -#: directorymergewindow.cpp:2984 -msgid "Choose C for All Items" -msgstr "Choose C for All Items" - -#. +> trunk -#: directorymergewindow.cpp:2985 -msgid "Auto-Choose Operation for All Items" -msgstr "Auto-Choose Operation for All Items" - -#. +> trunk -#: directorymergewindow.cpp:2986 -msgid "No Operation for All Items" -msgstr "No Operation for All Items" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "Show Identical Files" -msgstr "Show Identical Files" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "" -"Identical\n" -"Files" -msgstr "" -"Identical\n" -"Files" - -#. +> trunk -#: directorymergewindow.cpp:2992 -msgid "Show Different Files" -msgstr "Show Different Files" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "Show Files only in A" -msgstr "Show Files only in A" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "" -"Files\n" -"only in A" -msgstr "" -"Files\n" -"only in A" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "Show Files only in B" -msgstr "Show Files only in B" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "" -"Files\n" -"only in B" -msgstr "" -"Files\n" -"only in B" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "Show Files only in C" -msgstr "Show Files only in C" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "" -"Files\n" -"only in C" -msgstr "" -"Files\n" -"only in C" - -#. +> trunk -#: directorymergewindow.cpp:2999 -msgid "Compare Explicitly Selected Files" -msgstr "Compare Explicitly Selected Files" - -#. +> trunk -#: directorymergewindow.cpp:3000 -msgid "Merge Explicitly Selected Files" -msgstr "Merge Explicitly Selected Files" - -#. +> trunk -#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 -msgid "Do Nothing" -msgstr "Do Nothing" - -#. +> trunk -#: directorymergewindow.cpp:3003 -msgid "A" -msgstr "A" - -#. +> trunk -#: directorymergewindow.cpp:3004 -msgid "B" -msgstr "B" - -#. +> trunk -#: directorymergewindow.cpp:3005 -msgid "C" -msgstr "C" - -#. +> trunk -#: directorymergewindow.cpp:3014 -msgid "Delete A && B" -msgstr "Delete A && B" - -#. +> trunk -#: directorymergewindow.cpp:3017 -msgid "Merge to A && B" -msgstr "Merge to A && B" - -#. +> trunk -#: fileaccess.cpp:617 -msgid "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " -msgstr "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " - -#. +> trunk -#: fileaccess.cpp:624 -msgid "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " -msgstr "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " - -#. +> trunk -#: fileaccess.cpp:648 -#, kde-format -msgid "Getting file status: %1" -msgstr "Getting file status: %1" - -#. +> trunk -#: fileaccess.cpp:691 -#, kde-format -msgid "Reading file: %1" -msgstr "Reading file: %1" - -#. +> trunk -#: fileaccess.cpp:728 -#, kde-format -msgid "Writing file: %1" -msgstr "Writing file: %1" - -#. +> trunk -#: fileaccess.cpp:756 -msgid "Out of memory" -msgstr "Out of memory" - -#. +> trunk -#: fileaccess.cpp:791 -#, kde-format -msgid "Making directory: %1" -msgstr "Making directory: %1" - -#. +> trunk -#: fileaccess.cpp:811 -#, kde-format -msgid "Removing directory: %1" -msgstr "Removing directory: %1" - -#. +> trunk -#: fileaccess.cpp:826 -#, kde-format -msgid "Removing file: %1" -msgstr "Removing file: %1" - -#. +> trunk -#: fileaccess.cpp:842 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Creating symbolic link: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:869 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Renaming file: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:902 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Copying file: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:916 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Error during file copy operation: Opening file for reading failed. Filename: %1" - -#. +> trunk -#: fileaccess.cpp:922 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Error during file copy operation: Opening file for writing failed. Filename: %1" - -#. +> trunk -#: fileaccess.cpp:937 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Error during file copy operation: Reading failed. Filename: %1" - -#. +> trunk -#: fileaccess.cpp:946 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Error during file copy operation: Writing failed. Filename: %1" - -#. +> trunk -#: fileaccess.cpp:1236 -msgid "Reading directory: " -msgstr "Reading directory: " - -#. +> trunk -#: fileaccess.cpp:1360 -#, kde-format -msgid "Listing directory: %1" -msgstr "Listing directory: %1" - -#. +> trunk -#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 -msgid "&Cancel" -msgstr "&Cancel" - -#. +> trunk -#: kdiff3.cpp:169 -msgid "Current Configuration:" -msgstr "Current Configuration:" - -#. +> trunk -#: kdiff3.cpp:174 -msgid "Config Option Error:" -msgstr "Config Option Error:" - -#. +> trunk -#: kdiff3.cpp:219 -msgid "Option --auto used, but no output file specified." -msgstr "Option --auto used, but no output file specified." - -#. +> trunk -#: kdiff3.cpp:369 -msgid "Option --auto ignored for directory comparison." -msgstr "Option --auto ignored for directory comparison." - -#. +> trunk -#: kdiff3.cpp:405 -msgid "Saving failed." -msgstr "Saving failed." - -#. +> trunk -#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 -msgid "Opening of these files failed:" -msgstr "Opening of these files failed:" - -#. +> trunk -#: kdiff3.cpp:449 -msgid "File Open Error" -msgstr "File Open Error" - -#. +> trunk -#: kdiff3.cpp:477 -msgid "Opens documents for comparison..." -msgstr "Opens documents for comparison..." - -#. +> trunk -#: kdiff3.cpp:479 -msgid "Reload" -msgstr "Reload" - -#. +> trunk -#: kdiff3.cpp:482 -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Saves the merge result. All conflicts must be solved!" - -#. +> trunk -#: kdiff3.cpp:484 -msgid "Saves the current document as..." -msgstr "Saves the current document as..." - -#. +> trunk -#: kdiff3.cpp:487 -msgid "Print the differences" -msgstr "Print the differences" - -#. +> trunk -#: kdiff3.cpp:490 -msgid "Quits the application" -msgstr "Quits the application" - -#. +> trunk -#: kdiff3.cpp:492 -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Cuts the selected section and puts it to the clipboard" - -#. +> trunk -#: kdiff3.cpp:494 -msgid "Copies the selected section to the clipboard" -msgstr "Copies the selected section to the clipboard" - -#. +> trunk -#: kdiff3.cpp:496 -msgid "Pastes the clipboard contents to current position" -msgstr "Pastes the clipboard contents to current position" - -#. +> trunk -#: kdiff3.cpp:498 -msgid "Select everything in current window" -msgstr "Select everything in current window" - -#. +> trunk -#: kdiff3.cpp:500 -msgid "Search for a string" -msgstr "Search for a string" - -#. +> trunk -#: kdiff3.cpp:502 -msgid "Search again for the string" -msgstr "Search again for the string" - -#. +> trunk -#: kdiff3.cpp:507 -msgid "Enables/disables the statusbar" -msgstr "Enables/disables the statusbar" - -#. +> trunk -#: kdiff3.cpp:511 -msgid "Configure KDiff3..." -msgstr "Configure KDiff3..." - -#. +> trunk -#: kdiff3.cpp:532 -msgid "Go to Current Delta" -msgstr "Go to Current Delta" - -#. +> trunk -#: kdiff3.cpp:532 -msgid "" -"Current\n" -"Delta" -msgstr "" -"Current\n" -"Delta" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "Go to First Delta" -msgstr "Go to First Delta" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "" -"First\n" -"Delta" -msgstr "" -"First\n" -"Delta" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "Go to Last Delta" -msgstr "Go to Last Delta" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "" -"Last\n" -"Delta" -msgstr "" -"Last\n" -"Delta" - -#. +> trunk -#: kdiff3.cpp:538 -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" - -#. +> trunk -#: kdiff3.cpp:539 -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Does not skip white space differences even when \"Show White Space\" is disabled.)" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "Go to Previous Delta" -msgstr "Go to Previous Delta" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Prev\n" -"Delta" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "Go to Next Delta" -msgstr "Go to Next Delta" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "" -"Next\n" -"Delta" -msgstr "" -"Next\n" -"Delta" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "Go to Previous Conflict" -msgstr "Go to Previous Conflict" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Prev\n" -"Conflict" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "Go to Next Conflict" -msgstr "Go to Next Conflict" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Next\n" -"Conflict" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "Go to Previous Unsolved Conflict" -msgstr "Go to Previous Unsolved Conflict" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Prev\n" -"Unsolved" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "Go to Next Unsolved Conflict" -msgstr "Go to Next Unsolved Conflict" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Next\n" -"Unsolved" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "Select Line(s) From A" -msgstr "Select Line(s) From A" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "" -"Choose\n" -"A" -msgstr "" -"Choose\n" -"A" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "Select Line(s) From B" -msgstr "Select Line(s) From B" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "" -"Choose\n" -"B" -msgstr "" -"Choose\n" -"B" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "Select Line(s) From C" -msgstr "Select Line(s) From C" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "" -"Choose\n" -"C" -msgstr "" -"Choose\n" -"C" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "" -"Auto\n" -"Next" -msgstr "" -"Auto\n" -"Next" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "Show Space && Tabulator Characters for Differences" -msgstr "Show Space && Tabulator Characters for Differences" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "" -"White\n" -"Characters" -msgstr "" -"White\n" -"Characters" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "Show White Space" -msgstr "Show White Space" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "" -"White\n" -"Deltas" -msgstr "" -"White\n" -"Deltas" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "Show Line Numbers" -msgstr "Show Line Numbers" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Line\n" -"Numbers" - -#. +> trunk -#: kdiff3.cpp:561 -msgid "Choose A Everywhere" -msgstr "Choose A Everywhere" - -#. +> trunk -#: kdiff3.cpp:562 -msgid "Choose B Everywhere" -msgstr "Choose B Everywhere" - -#. +> trunk -#: kdiff3.cpp:563 -msgid "Choose C Everywhere" -msgstr "Choose C Everywhere" - -#. +> trunk -#: kdiff3.cpp:564 -msgid "Choose A for All Unsolved Conflicts" -msgstr "Choose A for All Unsolved Conflicts" - -#. +> trunk -#: kdiff3.cpp:565 -msgid "Choose B for All Unsolved Conflicts" -msgstr "Choose B for All Unsolved Conflicts" - -#. +> trunk -#: kdiff3.cpp:566 -msgid "Choose C for All Unsolved Conflicts" -msgstr "Choose C for All Unsolved Conflicts" - -#. +> trunk -#: kdiff3.cpp:567 -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Choose A for All Unsolved Whitespace Conflicts" - -#. +> trunk -#: kdiff3.cpp:568 -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Choose B for All Unsolved Whitespace Conflicts" - -#. +> trunk -#: kdiff3.cpp:569 -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Choose C for All Unsolved Whitespace Conflicts" - -#. +> trunk -#: kdiff3.cpp:570 -msgid "Automatically Solve Simple Conflicts" -msgstr "Automatically Solve Simple Conflicts" - -#. +> trunk -#: kdiff3.cpp:571 -msgid "Set Deltas to Conflicts" -msgstr "Set Deltas to Conflicts" - -#. +> trunk -#: kdiff3.cpp:572 -msgid "Run Regular Expression Auto Merge" -msgstr "Run Regular Expression Auto Merge" - -#. +> trunk -#: kdiff3.cpp:573 -msgid "Automatically Solve History Conflicts" -msgstr "Automatically Solve History Conflicts" - -#. +> trunk -#: kdiff3.cpp:574 -msgid "Split Diff At Selection" -msgstr "Split Diff At Selection" - -#. +> trunk -#: kdiff3.cpp:575 -msgid "Join Selected Diffs" -msgstr "Join Selected Diffs" - -#. +> trunk -#: kdiff3.cpp:577 -msgid "Show Window A" -msgstr "Show Window A" - -#. +> trunk -#: kdiff3.cpp:578 -msgid "Show Window B" -msgstr "Show Window B" - -#. +> trunk -#: kdiff3.cpp:579 -msgid "Show Window C" -msgstr "Show Window C" - -#. +> trunk -#: kdiff3.cpp:580 kdiff3.cpp:591 -msgid "Focus Next Window" -msgstr "Focus Next Window" - -#. +> trunk -#: kdiff3.cpp:582 -msgid "Normal Overview" -msgstr "Normal Overview" - -#. +> trunk -#: kdiff3.cpp:583 -msgid "A vs. B Overview" -msgstr "A vs. B Overview" - -#. +> trunk -#: kdiff3.cpp:584 -msgid "A vs. C Overview" -msgstr "A vs. C Overview" - -#. +> trunk -#: kdiff3.cpp:585 -msgid "B vs. C Overview" -msgstr "B vs. C Overview" - -#. +> trunk -#: kdiff3.cpp:586 -msgid "Word Wrap Diff Windows" -msgstr "Word Wrap Diff Windows" - -#. +> trunk -#: kdiff3.cpp:587 -msgid "Add Manual Diff Alignment" -msgstr "Add Manual Diff Alignment" - -#. +> trunk -#: kdiff3.cpp:588 -msgid "Clear All Manual Diff Alignments" -msgstr "Clear All Manual Diff Alignments" - -#. +> trunk -#: kdiff3.cpp:593 -msgid "Focus Prev Window" -msgstr "Focus Prev Window" - -#. +> trunk -#: kdiff3.cpp:594 -msgid "Toggle Split Orientation" -msgstr "Toggle Split Orientation" - -#. +> trunk -#: kdiff3.cpp:596 -msgid "Dir && Text Split Screen View" -msgstr "Dir && Text Split Screen View" - -#. +> trunk -#: kdiff3.cpp:598 -msgid "Toggle Between Dir && Text View" -msgstr "Toggle Between Dir && Text View" - -#. +> trunk -#: kdiff3.cpp:654 pdiff.cpp:1812 -msgid "The merge result hasn't been saved." -msgstr "The merge result hasn't been saved." - -#. +> trunk -#: kdiff3.cpp:656 -msgid "Save && Quit" -msgstr "Save && Quit" - -#. +> trunk -#: kdiff3.cpp:657 -msgid "Quit Without Saving" -msgstr "Quit Without Saving" - -#. +> trunk -#: kdiff3.cpp:665 pdiff.cpp:1823 -msgid "Saving the merge result failed." -msgstr "Saving the merge result failed." - -#. +> trunk -#: kdiff3.cpp:676 pdiff.cpp:1078 -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "You are currently doing a directory merge. Are you sure, you want to abort?" - -#. +> trunk -#: kdiff3.cpp:701 -msgid "Saving file..." -msgstr "Saving file..." - -#. +> trunk -#: kdiff3.cpp:718 -msgid "Saving file with a new filename..." -msgstr "Saving file with a new filename..." - -#. +> trunk -#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 -msgid "Save As..." -msgstr "Save As..." - -#. +> trunk -#: kdiff3.cpp:781 -#| msgid "Printing completed." -msgid "Printing not implemented." -msgstr "Printing not implemented." - -#. +> trunk -#: kdiff3.cpp:815 -msgid "Printing..." -msgstr "Printing..." - -#. +> trunk -#: kdiff3.cpp:956 -msgid "Selection" -msgstr "Selection" - -#. +> trunk -#: kdiff3.cpp:982 -msgid "Printing completed." -msgstr "Printing completed." - -#. +> trunk -#: kdiff3.cpp:986 -msgid "Printing aborted." -msgstr "Printing aborted." - -#. +> trunk -#: kdiff3.cpp:993 -msgid "Exiting..." -msgstr "Exiting..." - -#. +> trunk -#: kdiff3.cpp:1006 -msgid "Toggling toolbar..." -msgstr "Toggling toolbar..." - -#. +> trunk -#: kdiff3.cpp:1027 -msgid "Toggle the statusbar..." -msgstr "Toggle the statusbar..." - -#. +> trunk -#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 -msgid "Couldn't find files for comparison." -msgstr "Couldn't find files for comparison." - -#. +> trunk -#: kdiff3_part.cpp:302 -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk -#: kdiff3_part.cpp:303 main.cpp:174 -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:4 -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:13 -msgid "Configure KDiff3" -msgstr "Configure KDiff3" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_part.rc:16 -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3_shell.cpp:76 -#| msgid "" -#| "Could not initialize the KDiff part.\n" -#| "This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"Could not initialise the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." - -#. i18n: ectx: Menu (file) -#. +> trunk -#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 -msgid "&File" -msgstr "&File" - -#. i18n: ectx: Menu (directory) -#. +> trunk -#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 -msgid "&Directory" -msgstr "&Directory" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk -#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 -#: kreplacements/kreplacements.cpp:497 -msgid "Current Item Merge Operation" -msgstr "Current Item Merge Operation" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk -#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 -#: kreplacements/kreplacements.cpp:498 -msgid "Current Item Sync Operation" -msgstr "Current Item Sync Operation" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 -msgid "&Movement" -msgstr "&Movement" - -#. i18n: ectx: Menu (diff) -#. +> trunk -#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 -msgid "D&iffview" -msgstr "D&iffview" - -#. i18n: ectx: Menu (merge) -#. +> trunk -#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 -msgid "&Merge" -msgstr "&Merge" - -#. i18n: ectx: Menu (window) -#. +> trunk -#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 -msgid "&Window" -msgstr "&Window" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_shell.rc:106 -msgid "Main Toolbar" -msgstr "Main Toolbar" - -#. +> trunk -#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 -#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 -msgid "Cancel" -msgstr "Cancel" - -#. +> trunk -#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 -#: smalldialogs.cpp:508 -msgid "OK" -msgstr "OK" - -#. +> trunk -#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 -msgid "Help" -msgstr "Help" - -#. +> trunk -#: kreplacements/kreplacements.cpp:185 -msgid "Defaults" -msgstr "Defaults" - -#. +> trunk -#: kreplacements/kreplacements.cpp:297 -msgid "&Edit" -msgstr "&Edit" - -#. +> trunk -#: kreplacements/kreplacements.cpp:305 -msgid "&Settings" -msgstr "&Settings" - -#. +> trunk -#: kreplacements/kreplacements.cpp:306 -msgid "&Help" -msgstr "&Help" - -#. +> trunk -#: kreplacements/kreplacements.cpp:353 -msgid "&About" -msgstr "&About" - -#. +> trunk -#: kreplacements/kreplacements.cpp:369 -msgid "A&uthor" -msgstr "A&uthor" - -#. +> trunk -#: kreplacements/kreplacements.cpp:383 -msgid "&Thanks To" -msgstr "&Thanks To" - -#. +> trunk -#: kreplacements/kreplacements.cpp:597 -msgid "Open" -msgstr "Open" - -#. +> trunk -#: kreplacements/kreplacements.cpp:606 -msgid "Save" -msgstr "Save" - -#. +> trunk -#: kreplacements/kreplacements.cpp:623 -msgid "Print..." -msgstr "Print..." - -#. +> trunk -#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 -msgid "Quit" -msgstr "Quit" - -#. +> trunk -#: kreplacements/kreplacements.cpp:639 -msgid "Cut" -msgstr "Cut" - -#. +> trunk -#: kreplacements/kreplacements.cpp:647 -msgid "Copy" -msgstr "Copy" - -#. +> trunk -#: kreplacements/kreplacements.cpp:655 -msgid "Paste" -msgstr "Paste" - -#. +> trunk -#: kreplacements/kreplacements.cpp:663 -msgid "Select All" -msgstr "Select All" - -#. +> trunk -#: kreplacements/kreplacements.cpp:671 -msgid "Show Toolbar" -msgstr "Show Toolbar" - -#. +> trunk -#: kreplacements/kreplacements.cpp:679 -msgid "Show &Status Bar" -msgstr "Show &Status Bar" - -#. +> trunk -#: kreplacements/kreplacements.cpp:687 -#, kde-format -msgid "&Configure %1..." -msgstr "&Configure %1..." - -#. +> trunk -#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 -msgid "About" -msgstr "About" - -#. +> trunk -#: kreplacements/kreplacements.cpp:722 -msgid "Find" -msgstr "Find" - -#. +> trunk -#: kreplacements/kreplacements.cpp:730 -msgid "Find Next" -msgstr "Find Next" - -#. +> trunk -#: kreplacements/kreplacements.cpp:750 -msgid "Select Font" -msgstr "Select Font" - -#. +> trunk -#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 -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 "" -"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." - -#. +> trunk -#: kreplacements/kreplacements.cpp:792 -msgid "Incompatible font." -msgstr "Incompatible font." - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Continue at my own risk" -msgstr "Continue at my own risk" - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Select another font" -msgstr "Select another font" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1134 -msgid "For more documentation, see the help-menu or the subdirectory doc." -msgstr "For more documentation, see the help-menu or the subdirectory doc." - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "KDiff3-Usage" -msgstr "KDiff3-Usage" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "Ignore" -msgstr "Ignore" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "Exit" -msgstr "Exit" - -#. +> trunk -#: kreplacements/kreplacements.h:105 -msgid "Continue" -msgstr "Continue" - -#. +> trunk -#: main.cpp:74 main.cpp:76 -msgid "Ignored. (User defined.)" -msgstr "Ignored. (User defined.)" - -#. +> trunk -#: main.cpp:162 -msgid "kdiff3" -msgstr "kdiff3" - -#. +> trunk -#: main.cpp:166 -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Tool for Comparison and Merge of Files and Directories" - -#. +> trunk -#: main.cpp:167 -#| msgid "(c) 2002-2009 Joachim Eibl" -msgid "(c) 2002-2011 Joachim Eibl" -msgstr "(c) 2002-2011 Joachim Eibl" - -#. +> trunk -#: main.cpp:175 -msgid "Eike Sauer" -msgstr "Eike Sauer" - -#. +> trunk -#: main.cpp:175 -msgid "Bugfixes, Debian package maintainer" -msgstr "Bugfixes, Debian package maintainer" - -#. +> trunk -#: main.cpp:176 -msgid "Sebastien Fricker" -msgstr "Sebastien Fricker" - -#. +> trunk -#: main.cpp:176 -msgid "Windows installer" -msgstr "Windows installer" - -#. +> trunk -#: main.cpp:177 -msgid "Stephan Binner" -msgstr "Stephan Binner" - -#. +> trunk -#: main.cpp:177 -msgid "i18n-help" -msgstr "i18n-help" - -#. +> trunk -#: main.cpp:178 -msgid "Stefan Partheymueller" -msgstr "Stefan Partheymueller" - -#. +> trunk -#: main.cpp:178 -msgid "Clipboard-patch" -msgstr "Clipboard-patch" - -#. +> trunk -#: main.cpp:179 -msgid "David Faure" -msgstr "David Faure" - -#. +> trunk -#: main.cpp:179 -msgid "KIO-Help" -msgstr "KIO-Help" - -#. +> trunk -#: main.cpp:180 -msgid "Bernd Gehrmann" -msgstr "Bernd Gehrmann" - -#. +> trunk -#: main.cpp:180 -msgid "Class CvsIgnoreList from Cervisia" -msgstr "Class CvsIgnoreList from Cervisia" - -#. +> trunk -#: main.cpp:181 -msgid "Andre Woebbeking" -msgstr "Andre Woebbeking" - -#. +> trunk -#: main.cpp:181 -msgid "Class StringMatcher" -msgstr "Class StringMatcher" - -#. +> trunk -#: main.cpp:182 -msgid "Michael Denio" -msgstr "Michael Denio" - -#. +> trunk -#: main.cpp:182 -msgid "Directory Equality-Coloring patch" -msgstr "Directory Equality-Colouring patch" - -#. +> trunk -#: main.cpp:183 -msgid "Manfred Koehler" -msgstr "Manfred Koehler" - -#. +> trunk -#: main.cpp:183 -msgid "Fix for slow startup on Windows" -msgstr "Fix for slow startup on Windows" - -#. +> trunk -#: main.cpp:184 -msgid "Sergey Zorin" -msgstr "Sergey Zorin" - -#. +> trunk -#: main.cpp:184 -msgid "Diff Ext for Windows" -msgstr "Diff Ext for Windows" - -#. +> trunk -#: main.cpp:185 -msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#. +> trunk -#: main.cpp:185 -msgid "GNU-Diffutils" -msgstr "GNU-Diffutils" - -#. +> trunk -#: main.cpp:186 -msgid "Tino Boellsterling, Timothy Mee" -msgstr "Tino Boellsterling, Timothy Mee" - -#. +> trunk -#: main.cpp:186 -msgid "Intensive test, use and feedback" -msgstr "Intensive test, use and feedback" - -#. +> trunk -#: main.cpp:187 -msgid "Michael Schmidt" -msgstr "Michael Schmidt" - -#. +> trunk -#: main.cpp:187 -msgid "Mac support" -msgstr "Mac support" - -#. +> trunk -#: main.cpp:188 -msgid "Valentin Rusu" -msgstr "Valentin Rusu" - -#. +> trunk -#: main.cpp:188 main.cpp:189 -msgid "KDE4 porting" -msgstr "KDE4 porting" - -#. +> trunk -#: main.cpp:189 -msgid "Albert Astals Cid" -msgstr "Albert Astals Cid" - -#. +> trunk -#: main.cpp:190 -msgid "Silvan Scherrer" -msgstr "Silvan Scherrer" - -#. +> trunk -#: main.cpp:190 -msgid "OS2 port" -msgstr "OS2 port" - -#. +> trunk -#: main.cpp:192 -msgid "+ Many thanks to those who reported bugs and contributed ideas!" -msgstr "+ Many thanks to those who reported bugs and contributed ideas!" - -#. +> trunk -#: main.cpp:198 -msgid "Merge the input." -msgstr "Merge the input." - -#. +> trunk -#: main.cpp:199 -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Explicit base file. For compatibility with certain tools." - -#. +> trunk -#: main.cpp:200 -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Output file. Implies -m. E.g.: -o newfile.txt" - -#. +> trunk -#: main.cpp:201 -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Output file, again. (For compatibility with certain tools.)" - -#. +> trunk -#: main.cpp:202 -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "No GUI if all conflicts are auto-solvable. (Needs -o file)" - -#. +> trunk -#: main.cpp:203 -msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "Do not solve conflicts automatically. (For compatibility...)" - -#. +> trunk -#: main.cpp:204 -msgid "Visible name replacement for input file 1 (base)." -msgstr "Visible name replacement for input file 1 (base)." - -#. +> trunk -#: main.cpp:205 -msgid "Visible name replacement for input file 2." -msgstr "Visible name replacement for input file 2." - -#. +> trunk -#: main.cpp:206 -msgid "Visible name replacement for input file 3." -msgstr "Visible name replacement for input file 3." - -#. +> trunk -#: main.cpp:207 -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Alternative visible name replacement. Supply this once for every input." - -#. +> trunk -#: main.cpp:208 -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" - -#. +> trunk -#: main.cpp:209 -msgid "Show list of config settings and current values." -msgstr "Show list of config settings and current values." - -#. +> trunk -#: main.cpp:210 -msgid "Use a different config file." -msgstr "Use a different config file." - -#. +> trunk -#: main.cpp:213 -msgid "file1 to open (base, if not specified via --base)" -msgstr "file1 to open (base, if not specified via --base)" - -#. +> trunk -#: main.cpp:214 -msgid "file2 to open" -msgstr "file2 to open" - -#. +> trunk -#: main.cpp:215 -msgid "file3 to open" -msgstr "file3 to open" - -#. +> trunk -#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 -#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 -#: mergeresultwindow.cpp:1014 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" - -#. +> trunk -#: mergeresultwindow.cpp:303 -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"The output has been modified.\n" -"If you continue your changes will be lost." - -#. +> trunk -#: mergeresultwindow.cpp:834 pdiff.cpp:532 -msgid "All input files are binary equal." -msgstr "All input files are binary equal." - -#. +> trunk -#: mergeresultwindow.cpp:836 -msgid "All input files contain the same text." -msgstr "All input files contain the same text." - -#. +> trunk -#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 -#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Files %1 and %2 are binary equal.\n" - -#. +> trunk -#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 -#: mergeresultwindow.cpp:843 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Files %1 and %2 have equal text.\n" - -#. +> trunk -#: mergeresultwindow.cpp:849 -msgid "Total number of conflicts: " -msgstr "Total number of conflicts: " - -#. +> trunk -#: mergeresultwindow.cpp:850 -msgid "" -"\n" -"Nr of automatically solved conflicts: " -msgstr "" -"\n" -"Nr of automatically solved conflicts: " - -#. +> trunk -#: mergeresultwindow.cpp:851 -msgid "" -"\n" -"Nr of unsolved conflicts: " -msgstr "" -"\n" -"Nr of unsolved conflicts: " - -#. +> trunk -#: mergeresultwindow.cpp:853 -msgid "Conflicts" -msgstr "Conflicts" - -#. +> trunk -#: mergeresultwindow.cpp:1728 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1736 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2725 -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" -msgstr "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" - -#. +> trunk -#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 -msgid "Conflicts Left" -msgstr "Conflicts Left" - -#. +> trunk -#: mergeresultwindow.cpp:2734 -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" -msgstr "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" - -#. +> trunk -#: mergeresultwindow.cpp:2748 -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Creating backup failed. File not saved." - -#. +> trunk -#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 -msgid "File Save Error" -msgstr "File Save Error" - -#. +> trunk -#: mergeresultwindow.cpp:2792 -msgid "Error while writing." -msgstr "Error while writing." - -#. +> trunk -#: mergeresultwindow.cpp:3122 -msgid "Output" -msgstr "Output" - -#. +> trunk -#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 -msgid "[Modified]" -msgstr "[Modified]" - -#. +> trunk -#: mergeresultwindow.cpp:3141 -msgid "Encoding for saving" -msgstr "Encoding for saving" - -#. +> trunk -#: mergeresultwindow.cpp:3229 -msgid "Conflict" -msgstr "Conflict" - -#. +> trunk -#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 -#: mergeresultwindow.cpp:3265 -msgid "Codec from" -msgstr "Codec from" - -#. +> trunk -#: optiondialog.cpp:367 -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 bit" - -#. +> trunk -#: optiondialog.cpp:368 -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk -#: optiondialog.cpp:369 -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk -#: optiondialog.cpp:388 -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Change this if non-ASCII characters are not displayed correctly." - -#. +> trunk -#: optiondialog.cpp:465 -msgid "Configure" -msgstr "Configure" - -#. +> trunk -#: optiondialog.cpp:531 -msgid "Font" -msgstr "Font" - -#. +> trunk -#: optiondialog.cpp:532 -msgid "Editor & Diff Output Font" -msgstr "Editor & Diff Output Font" - -#. +> trunk -#: optiondialog.cpp:556 -msgid "Italic font for deltas" -msgstr "Italic font for deltas" - -#. +> trunk -#: optiondialog.cpp:559 -msgid "" -"Selects the italic version of the font for differences.\n" -"If the font doesn't support italic characters, then this does nothing." -msgstr "" -"Selects the italic version of the font for differences.\n" -"If the font doesn't support italic characters, then this does nothing." - -#. +> trunk -#: optiondialog.cpp:568 -msgid "Color" -msgstr "Colour" - -#. +> trunk -#: optiondialog.cpp:569 -msgid "Colors Settings" -msgstr "Colour Settings" - -#. +> trunk -#: optiondialog.cpp:588 -msgid "Editor and Diff Views:" -msgstr "Editor and Diff Views:" - -#. +> trunk -#: optiondialog.cpp:596 -msgid "Foreground color:" -msgstr "Foreground colour:" - -#. +> trunk -#: optiondialog.cpp:603 -msgid "Background color:" -msgstr "Background colour:" - -#. +> trunk -#: optiondialog.cpp:612 -msgid "Diff background color:" -msgstr "Diff background colour:" - -#. +> trunk -#: optiondialog.cpp:620 -msgid "Color A:" -msgstr "Colour A:" - -#. +> trunk -#: optiondialog.cpp:628 -msgid "Color B:" -msgstr "Colour B:" - -#. +> trunk -#: optiondialog.cpp:636 -msgid "Color C:" -msgstr "Colour C:" - -#. +> trunk -#: optiondialog.cpp:643 -msgid "Conflict color:" -msgstr "Conflict colour:" - -#. +> trunk -#: optiondialog.cpp:651 -msgid "Current range background color:" -msgstr "Current range background colour:" - -#. +> trunk -#: optiondialog.cpp:659 -msgid "Current range diff background color:" -msgstr "Current range diff background colour:" - -#. +> trunk -#: optiondialog.cpp:666 -msgid "Color for manually aligned difference ranges:" -msgstr "Colour for manually aligned difference ranges:" - -#. +> trunk -#: optiondialog.cpp:672 -msgid "Directory Comparison View:" -msgstr "Directory Comparison View:" - -#. +> trunk -#: optiondialog.cpp:678 -msgid "Newest file color:" -msgstr "Newest file colour:" - -#. +> trunk -#: optiondialog.cpp:682 -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Changing this colour will only be effective when starting the next directory comparison." - -#. +> trunk -#: optiondialog.cpp:687 -msgid "Oldest file color:" -msgstr "Oldest file colour:" - -#. +> trunk -#: optiondialog.cpp:695 -msgid "Middle age file color:" -msgstr "Middle age file colour:" - -#. +> trunk -#: optiondialog.cpp:703 -msgid "Color for missing files:" -msgstr "Colour for missing files:" - -#. +> trunk -#: optiondialog.cpp:717 -msgid "Editor" -msgstr "Editor" - -#. +> trunk -#: optiondialog.cpp:718 -msgid "Editor Behavior" -msgstr "Editor Behaviour" - -#. +> trunk -#: optiondialog.cpp:732 -msgid "Tab inserts spaces" -msgstr "Tab inserts spaces" - -#. +> trunk -#: optiondialog.cpp:735 -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." - -#. +> trunk -#: optiondialog.cpp:741 -msgid "Tab size:" -msgstr "Tab size:" - -#. +> trunk -#: optiondialog.cpp:747 -msgid "Auto indentation" -msgstr "Auto indentation" - -#. +> trunk -#: optiondialog.cpp:750 -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "On: The indentation of the previous line is used for a new line.\n" - -#. +> trunk -#: optiondialog.cpp:754 -msgid "Auto copy selection" -msgstr "Auto copy selection" - -#. +> trunk -#: optiondialog.cpp:757 -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." - -#. +> trunk -#: optiondialog.cpp:772 -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" - -#. +> trunk -#: optiondialog.cpp:784 -msgid "Diff" -msgstr "Diff" - -#. +> trunk -#: optiondialog.cpp:785 -msgid "Diff Settings" -msgstr "Diff Settings" - -#. +> trunk -#: optiondialog.cpp:809 -msgid "Treat as white space." -msgstr "Treat as white space." - -#. +> trunk -#: optiondialog.cpp:811 -msgid "Ignore numbers" -msgstr "Ignore numbers" - -#. +> trunk -#: optiondialog.cpp:814 -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." - -#. +> trunk -#: optiondialog.cpp:819 -msgid "Ignore C/C++ comments" -msgstr "Ignore C/C++ comments" - -#. +> trunk -#: optiondialog.cpp:821 -msgid "Treat C/C++ comments like white space." -msgstr "Treat C/C++ comments like white space." - -#. +> trunk -#: optiondialog.cpp:825 -msgid "Ignore case" -msgstr "Ignore case" - -#. +> trunk -#: optiondialog.cpp:828 -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Treat case differences like white space changes. ('a'<=>'A')" - -#. +> trunk -#: optiondialog.cpp:832 -msgid "Preprocessor command:" -msgstr "Preprocessor command:" - -#. +> trunk -#: optiondialog.cpp:836 -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "User defined pre-processing. (See the docs for details.)" - -#. +> trunk -#: optiondialog.cpp:839 -msgid "Line-matching preprocessor command:" -msgstr "Line-matching preprocessor command:" - -#. +> trunk -#: optiondialog.cpp:843 -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" - -#. +> trunk -#: optiondialog.cpp:846 -msgid "Try hard (slower)" -msgstr "Try hard (slower)" - -#. +> trunk -#: optiondialog.cpp:849 -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." - -#. +> trunk -#: optiondialog.cpp:854 -msgid "Align B and C for 3 input files" -msgstr "Align B and C for 3 input files" - -#. +> trunk -#: optiondialog.cpp:857 -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" - -#. +> trunk -#: optiondialog.cpp:870 -msgid "Merge Settings" -msgstr "Merge Settings" - -#. +> trunk -#: optiondialog.cpp:885 -msgid "Auto advance delay (ms):" -msgstr "Auto advance delay (ms):" - -#. +> trunk -#: optiondialog.cpp:890 -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 "" -"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" - -#. +> trunk -#: optiondialog.cpp:895 -msgid "Show info dialogs" -msgstr "Show info dialogues" - -#. +> trunk -#: optiondialog.cpp:897 -msgid "Show a dialog with information about the number of conflicts." -msgstr "Show a dialogue with information about the number of conflicts." - -#. +> trunk -#: optiondialog.cpp:900 -msgid "White space 2-file merge default:" -msgstr "White space 2-file merge default:" - -#. +> trunk -#: optiondialog.cpp:904 optiondialog.cpp:917 -msgid "Manual Choice" -msgstr "Manual Choice" - -#. +> trunk -#: optiondialog.cpp:908 optiondialog.cpp:922 -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "Allow the merge algorithm to automatically select an input for white-space-only changes." - -#. +> trunk -#: optiondialog.cpp:913 -msgid "White space 3-file merge default:" -msgstr "White space 3-file merge default:" - -#. +> trunk -#: optiondialog.cpp:927 -msgid "Automatic Merge Regular Expression" -msgstr "Automatic Merge Regular Expression" - -#. +> trunk -#: optiondialog.cpp:936 smalldialogs.cpp:414 -msgid "Auto merge regular expression:" -msgstr "Auto merge regular expression:" - -#. +> trunk -#: optiondialog.cpp:940 -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." - -#. +> trunk -#: optiondialog.cpp:946 -msgid "Run regular expression auto merge on merge start" -msgstr "Run regular expression auto merge on merge start" - -#. +> trunk -#: optiondialog.cpp:948 -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" - -#. +> trunk -#: optiondialog.cpp:953 -msgid "Version Control History Merging" -msgstr "Version Control History Merging" - -#. +> trunk -#: optiondialog.cpp:962 smalldialogs.cpp:441 -msgid "History start regular expression:" -msgstr "History start regular expression:" - -#. +> trunk -#: optiondialog.cpp:966 -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" - -#. +> trunk -#: optiondialog.cpp:972 smalldialogs.cpp:469 -msgid "History entry start regular expression:" -msgstr "History entry start regular expression:" - -#. +> trunk -#: optiondialog.cpp:984 -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use brackets to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." - -#. +> trunk -#: optiondialog.cpp:992 -msgid "History merge sorting" -msgstr "History merge sorting" - -#. +> trunk -#: optiondialog.cpp:994 -msgid "Sort version control history by a key." -msgstr "Sort version control history by a key." - -#. +> trunk -#: optiondialog.cpp:1004 -msgid "History entry start sort key order:" -msgstr "History entry start sort key order:" - -#. +> trunk -#: optiondialog.cpp:1008 -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Each pair of brackets used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." - -#. +> trunk -#: optiondialog.cpp:1019 -msgid "Merge version control history on merge start" -msgstr "Merge version control history on merge start" - -#. +> trunk -#: optiondialog.cpp:1021 -msgid "Run version control history automerge on merge start." -msgstr "Run version control history automerge on merge start." - -#. +> trunk -#: optiondialog.cpp:1025 -msgid "Max number of history entries:" -msgstr "Max number of history entries:" - -#. +> trunk -#: optiondialog.cpp:1028 -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Cut off after specified number. Use -1 for infinite number of entries." - -#. +> trunk -#: optiondialog.cpp:1032 -msgid "Test your regular expressions" -msgstr "Test your regular expressions" - -#. +> trunk -#: optiondialog.cpp:1037 -msgid "Irrelevant merge command:" -msgstr "Irrelevant merge command:" - -#. +> trunk -#: optiondialog.cpp:1041 -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" - -#. +> trunk -#: optiondialog.cpp:1047 -msgid "Auto save and quit on merge without conflicts" -msgstr "Auto save and quit on merge without conflicts" - -#. +> trunk -#: optiondialog.cpp:1050 -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" - -#. +> trunk -#: optiondialog.cpp:1061 optiondialog.cpp:1062 -msgid "Directory" -msgstr "Directory" - -#. +> trunk -#: optiondialog.cpp:1075 -msgid "Recursive directories" -msgstr "Recursive directories" - -#. +> trunk -#: optiondialog.cpp:1077 -msgid "Whether to analyze subdirectories or not." -msgstr "Whether to analyse subdirectories or not." - -#. +> trunk -#: optiondialog.cpp:1079 -msgid "File pattern(s):" -msgstr "File pattern(s):" - -#. +> trunk -#: optiondialog.cpp:1084 -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Pattern(s) of files to be analysed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" - -#. +> trunk -#: optiondialog.cpp:1090 -msgid "File-anti-pattern(s):" -msgstr "File-anti-pattern(s):" - -#. +> trunk -#: optiondialog.cpp:1095 -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" - -#. +> trunk -#: optiondialog.cpp:1101 -msgid "Dir-anti-pattern(s):" -msgstr "Dir-anti-pattern(s):" - -#. +> trunk -#: optiondialog.cpp:1106 -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" - -#. +> trunk -#: optiondialog.cpp:1112 -msgid "Use .cvsignore" -msgstr "Use .cvsignore" - -#. +> trunk -#: optiondialog.cpp:1115 -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." - -#. +> trunk -#: optiondialog.cpp:1120 -msgid "Find hidden files and directories" -msgstr "Find hidden files and directories" - -#. +> trunk -#: optiondialog.cpp:1123 -msgid "Finds files and directories with the hidden attribute." -msgstr "Finds files and directories with the hidden attribute." - -#. +> trunk -#: optiondialog.cpp:1125 -msgid "Finds files and directories starting with '.'." -msgstr "Finds files and directories starting with '.'." - -#. +> trunk -#: optiondialog.cpp:1129 -msgid "Follow file links" -msgstr "Follow file links" - -#. +> trunk -#: optiondialog.cpp:1132 -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." - -#. +> trunk -#: optiondialog.cpp:1137 -msgid "Follow directory links" -msgstr "Follow directory links" - -#. +> trunk -#: optiondialog.cpp:1140 -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." - -#. +> trunk -#: optiondialog.cpp:1156 -msgid "Case sensitive filename comparison" -msgstr "Case sensitive filename comparison" - -#. +> trunk -#: optiondialog.cpp:1159 -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" - -#. +> trunk -#: optiondialog.cpp:1163 -msgid "File Comparison Mode" -msgstr "File Comparison Mode" - -#. +> trunk -#: optiondialog.cpp:1169 -msgid "Binary comparison" -msgstr "Binary comparison" - -#. +> trunk -#: optiondialog.cpp:1170 -msgid "Binary comparison of each file. (Default)" -msgstr "Binary comparison of each file. (Default)" - -#. +> trunk -#: optiondialog.cpp:1173 -msgid "Full analysis" -msgstr "Full analysis" - -#. +> trunk -#: optiondialog.cpp:1174 -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" - -#. +> trunk -#: optiondialog.cpp:1178 -msgid "Trust the size and modification date (unsafe)" -msgstr "Trust the size and modification date (unsafe)" - -#. +> trunk -#: optiondialog.cpp:1179 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." - -#. +> trunk -#: optiondialog.cpp:1184 -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Trust the size and date, but use binary comparison if date does not match (unsafe)" - -#. +> trunk -#: optiondialog.cpp:1185 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." - -#. +> trunk -#: optiondialog.cpp:1190 -msgid "Trust the size (unsafe)" -msgstr "Trust the size (unsafe)" - -#. +> trunk -#: optiondialog.cpp:1191 -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 "" -"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." - -#. +> trunk -#: optiondialog.cpp:1199 -msgid "Synchronize directories" -msgstr "Synchronise directories" - -#. +> trunk -#: optiondialog.cpp:1202 -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 "" -"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." - -#. +> trunk -#: optiondialog.cpp:1208 -msgid "White space differences considered equal" -msgstr "White space differences considered equal" - -#. +> trunk -#: optiondialog.cpp:1211 -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." - -#. +> trunk -#: optiondialog.cpp:1217 -msgid "Copy newer instead of merging (unsafe)" -msgstr "Copy newer instead of merging (unsafe)" - -#. +> trunk -#: optiondialog.cpp:1220 -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 "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." - -#. +> trunk -#: optiondialog.cpp:1225 -msgid "Backup files (.orig)" -msgstr "Backup files (.orig)" - -#. +> trunk -#: optiondialog.cpp:1228 -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." - -#. +> trunk -#: optiondialog.cpp:1301 optiondialog.cpp:1302 -msgid "Regional Settings" -msgstr "Regional Settings" - -#. +> trunk -#: optiondialog.cpp:1405 -msgid "Language (restart required)" -msgstr "Language (restart required)" - -#. +> trunk -#: optiondialog.cpp:1448 -msgid "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." -msgstr "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." - -#. +> trunk -#: optiondialog.cpp:1466 -msgid "Use the same encoding for everything:" -msgstr "Use the same encoding for everything:" - -#. +> trunk -#: optiondialog.cpp:1469 -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." - -#. +> trunk -#: optiondialog.cpp:1474 -msgid "Note: Local Encoding is " -msgstr "Note: Local Encoding is " - -#. +> trunk -#: optiondialog.cpp:1478 -msgid "File Encoding for A:" -msgstr "File Encoding for A:" - -#. +> trunk -#: optiondialog.cpp:1484 -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" - -#. +> trunk -#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 -msgid "Auto Detect Unicode" -msgstr "Auto Detect Unicode" - -#. +> trunk -#: optiondialog.cpp:1493 -msgid "File Encoding for B:" -msgstr "File Encoding for B:" - -#. +> trunk -#: optiondialog.cpp:1502 -msgid "File Encoding for C:" -msgstr "File Encoding for C:" - -#. +> trunk -#: optiondialog.cpp:1511 -msgid "File Encoding for Merge Output and Saving:" -msgstr "File Encoding for Merge Output and Saving:" - -#. +> trunk -#: optiondialog.cpp:1515 -msgid "Auto Select" -msgstr "Auto Select" - -#. +> trunk -#: optiondialog.cpp:1518 -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialogue will ask the user to choose the encoding for saving." - -#. +> trunk -#: optiondialog.cpp:1522 -msgid "File Encoding for Preprocessor Files:" -msgstr "File Encoding for Preprocessor Files:" - -#. +> trunk -#: optiondialog.cpp:1533 -msgid "Right To Left Language" -msgstr "Right To Left Language" - -#. +> trunk -#: optiondialog.cpp:1536 -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." - -#. +> trunk -#: optiondialog.cpp:1551 -msgid "Integration" -msgstr "Integration" - -#. +> trunk -#: optiondialog.cpp:1552 -msgid "Integration Settings" -msgstr "Integration Settings" - -#. +> trunk -#: optiondialog.cpp:1566 -msgid "Command line options to ignore:" -msgstr "Command line options to ignore:" - -#. +> trunk -#: optiondialog.cpp:1571 -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." - -#. +> trunk -#: optiondialog.cpp:1578 -msgid "Quit also via Escape key" -msgstr "Quit also via Escape key" - -#. +> trunk -#: optiondialog.cpp:1581 -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." - -#. +> trunk -#: optiondialog.cpp:1586 -msgid "Integrate with ClearCase" -msgstr "Integrate with ClearCase" - -#. +> trunk -#: optiondialog.cpp:1589 -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" - -#. +> trunk -#: optiondialog.cpp:1595 -msgid "Remove ClearCase Integration" -msgstr "Remove ClearCase Integration" - -#. +> trunk -#: optiondialog.cpp:1598 -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "Restore the old \"map\" file from before doing the ClearCase integration." - -#. +> trunk -#: optiondialog.cpp:1683 -msgid "Incompatible Font" -msgstr "Incompatible Font" - -#. +> trunk -#: optiondialog.cpp:1684 -msgid "Continue at Own Risk" -msgstr "Continue at Own Risk" - -#. +> trunk -#: optiondialog.cpp:1685 -msgid "Select Another Font" -msgstr "Select Another Font" - -#. +> trunk -#: optiondialog.cpp:1720 -msgid "This resets all options. Not only those of the current topic." -msgstr "This resets all options. Not only those of the current topic." - -#. +> trunk -#: pdiff.cpp:260 -msgid "PreprocessorCmd: " -msgstr "PreprocessorCmd: " - -#. +> trunk -#: pdiff.cpp:265 -msgid "The following option(s) you selected might change data:\n" -msgstr "The following option(s) you selected might change data:\n" - -#. +> trunk -#: pdiff.cpp:266 -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" - -#. +> trunk -#: pdiff.cpp:268 -msgid "Option Unsafe for Merging" -msgstr "Option Unsafe for Merging" - -#. +> trunk -#: pdiff.cpp:269 -msgid "Use These Options During Merge" -msgstr "Use These Options During Merge" - -#. +> trunk -#: pdiff.cpp:270 -msgid "Disable Unsafe Options" -msgstr "Disable Unsafe Options" - -#. +> trunk -#: pdiff.cpp:300 -msgid "Loading A" -msgstr "Loading A" - -#. +> trunk -#: pdiff.cpp:304 -msgid "Loading B" -msgstr "Loading B" - -#. +> trunk -#: pdiff.cpp:321 pdiff.cpp:347 -msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" - -#. +> trunk -#: pdiff.cpp:327 pdiff.cpp:372 -msgid "Linediff: A <-> B" -msgstr "Linediff: A <-> B" - -#. +> trunk -#: pdiff.cpp:338 -msgid "Loading C" -msgstr "Loading C" - -#. +> trunk -#: pdiff.cpp:350 -msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" - -#. +> trunk -#: pdiff.cpp:353 -msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" - -#. +> trunk -#: pdiff.cpp:375 -msgid "Linediff: B <-> C" -msgstr "Linediff: B <-> C" - -#. +> trunk -#: pdiff.cpp:378 -msgid "Linediff: A <-> C" -msgstr "Linediff: A <-> C" - -#. +> trunk -#: pdiff.cpp:534 -msgid "All input files contain the same text, but are not binary equal." -msgstr "All input files contain the same text, but are not binary equal." - -#. +> trunk -#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Files %1 and %2 have equal text, but are not binary equal. \n" - -#. +> trunk -#: pdiff.cpp:551 -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 "" -"Some input files do not seem to be pure textfiles.\n" -"Note that the KDiff3-merge was not meant for binary data.\n" -"Continue at your own risk." - -#. +> trunk -#: pdiff.cpp:566 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Don't save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." - -#. +> trunk -#: pdiff.cpp:1080 -msgid "Abort" -msgstr "Abort" - -#. +> trunk -#: pdiff.cpp:1087 pdiff.cpp:1175 -msgid "Opening files..." -msgstr "Opening files..." - -#. +> trunk -#: pdiff.cpp:1152 pdiff.cpp:1223 -msgid "File open error" -msgstr "File open error" - -#. +> trunk -#: pdiff.cpp:1255 -msgid "Cutting selection..." -msgstr "Cutting selection..." - -#. +> trunk -#: pdiff.cpp:1276 -msgid "Copying selection to clipboard..." -msgstr "Copying selection to clipboard..." - -#. +> trunk -#: pdiff.cpp:1292 -msgid "Inserting clipboard contents..." -msgstr "Inserting clipboard contents..." - -#. +> trunk -#: pdiff.cpp:1814 -msgid "Save && Continue" -msgstr "Save && Continue" - -#. +> trunk -#: pdiff.cpp:1815 -msgid "Continue Without Saving" -msgstr "Continue Without Saving" - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search complete." -msgstr "Search complete." - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search Complete" -msgstr "Search Complete" - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Nothing is selected in either diff input window." -msgstr "Nothing is selected in either diff input window." - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Error while adding manual diff range" -msgstr "Error while adding manual diff range" - -#. +> trunk -#: smalldialogs.cpp:58 -msgid "A (Base):" -msgstr "A (Base):" - -#. +> trunk -#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 -#: smalldialogs.cpp:142 -msgid "File..." -msgstr "File..." - -#. +> trunk -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:144 -msgid "Dir..." -msgstr "Dir..." - -#. +> trunk -#: smalldialogs.cpp:93 -msgid "C (Optional):" -msgstr "C (Optional):" - -#. +> trunk -#: smalldialogs.cpp:116 -msgid "Swap/Copy Names ..." -msgstr "Swap/Copy Names ..." - -#. +> trunk -#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Swap %1<->%2" - -#. +> trunk -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 -#, kde-format -msgid "Copy %1->Output" -msgstr "Copy %1->Output" - -#. +> trunk -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Swap %1<->Output" - -#. +> trunk -#: smalldialogs.cpp:136 -msgid "Output (optional):" -msgstr "Output (optional):" - -#. +> trunk -#: smalldialogs.cpp:168 -msgid "Configure..." -msgstr "Configure..." - -#. +> trunk -#: smalldialogs.cpp:174 -msgid "&OK" -msgstr "&OK" - -#. +> trunk -#: smalldialogs.cpp:362 -msgid "Search text:" -msgstr "Search text:" - -#. +> trunk -#: smalldialogs.cpp:369 -msgid "Case sensitive" -msgstr "Case sensitive" - -#. +> trunk -#: smalldialogs.cpp:372 -msgid "Search A" -msgstr "Search A" - -#. +> trunk -#: smalldialogs.cpp:377 -msgid "Search B" -msgstr "Search B" - -#. +> trunk -#: smalldialogs.cpp:382 -msgid "Search C" -msgstr "Search C" - -#. +> trunk -#: smalldialogs.cpp:387 -msgid "Search output" -msgstr "Search output" - -#. +> trunk -#: smalldialogs.cpp:392 -msgid "&Search" -msgstr "&Search" - -#. +> trunk -#: smalldialogs.cpp:409 -msgid "Regular Expression Tester" -msgstr "Regular Expression Tester" - -#. +> trunk -#: smalldialogs.cpp:422 -msgid "Example auto merge line:" -msgstr "Example auto merge line:" - -#. +> trunk -#: smalldialogs.cpp:424 -msgid "To test auto merge, copy a line as used in your files." -msgstr "To test auto merge, copy a line as used in your files." - -#. +> trunk -#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 -msgid "Match result:" -msgstr "Match result:" - -#. +> trunk -#: smalldialogs.cpp:449 -msgid "Example history start line (with leading comment):" -msgstr "Example history start line (with leading comment):" - -#. +> trunk -#: smalldialogs.cpp:451 -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Copy a history start line as used in your files,\n" -"including the leading comment." - -#. +> trunk -#: smalldialogs.cpp:477 -msgid "History sort key order:" -msgstr "History sort key order:" - -#. +> trunk -#: smalldialogs.cpp:485 -msgid "Example history entry start line (without leading comment):" -msgstr "Example history entry start line (without leading comment):" - -#. +> trunk -#: smalldialogs.cpp:487 -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." - -#. +> trunk -#: smalldialogs.cpp:501 -msgid "Sort key result:" -msgstr "Sort key result:" - -#. +> trunk -#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 -msgid "Match success." -msgstr "Match success." - -#. +> trunk -#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 -msgid "Match failed." -msgstr "Match failed." - -#. +> trunk -#: smalldialogs.cpp:574 -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Opening and closing brackets do not match in regular expression." Index: trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,61 +0,0 @@ -# Andrew Coles , 2009. -# Steve Allewell , 2014. -msgid "" -msgstr "" -"Project-Id-Version: desktop files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2013-08-05 08:40+0200\n" -"PO-Revision-Date: 2014-07-04 23:07+0100\n" -"Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 -#: kdiff3plugin/kdiff3plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "Compare/Merge Files/Directories with KDiff3" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:51 -#| msgctxt "Name" -#| msgid "KDiff3" -msgctxt "X-KDE-Submenu" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3plugin/kdiff3_plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories" -msgstr "Compare/Merge Files/Directories" - -#. +> trunk -#: src/kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: src/kdiff3.desktop:52 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Diff/Patch Frontend" - -#. +> trunk -#: src/kdiff3.desktop:105 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "A File And Directory Comparison And Merge Tool" - -#. +> trunk -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" Index: trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/en_GB/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,102 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Steve Allewell , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2011-08-02 08:55+0200\n" -"PO-Revision-Date: 2014-07-04 23:10+0100\n" -"Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" - -#. +> trunk -#: kdiff3fileitemaction.cpp:94 -msgid "KDiff3 ..." -msgstr "KDiff3 ..." - -#. +> trunk -#: kdiff3fileitemaction.cpp:125 -#, kde-format -msgid "Compare with %1" -msgstr "Compare with %1" - -#. +> trunk -#: kdiff3fileitemaction.cpp:131 -#, kde-format -msgid "Merge with %1" -msgstr "Merge with %1" - -#. +> trunk -#: kdiff3fileitemaction.cpp:137 -#, kde-format -msgid "Save '%1' for later" -msgstr "Save '%1' for later" - -#. +> trunk -#: kdiff3fileitemaction.cpp:143 -msgid "3-way merge with base" -msgstr "3-way merge with base" - -#. +> trunk -#: kdiff3fileitemaction.cpp:150 -msgid "Compare with ..." -msgstr "Compare with ..." - -#. +> trunk -#: kdiff3fileitemaction.cpp:162 -msgid "Clear list" -msgstr "Clear list" - -#. +> trunk -#: kdiff3fileitemaction.cpp:170 -msgid "Compare" -msgstr "Compare" - -#. +> trunk -#: kdiff3fileitemaction.cpp:176 -msgid "3 way comparison" -msgstr "3 way comparison" - -#. +> trunk -#: kdiff3fileitemaction.cpp:180 -msgid "About KDiff3 menu plugin ..." -msgstr "About KDiff3 menu plugin ..." - -#. +> trunk -#: kdiff3fileitemaction.cpp:284 -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk -#: kdiff3fileitemaction.cpp:286 -msgid "" -"Using the contextmenu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." - -#. +> trunk -#: kdiff3fileitemaction.cpp:294 -msgid "About KDiff3 File Item Action Plugin" -msgstr "About KDiff3 File Item Action Plugin" Index: trunk/l10n-support/fi/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/fi/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/fi/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,54 @@ +# Lasse Liehu , 2012. +# KDE Finnish translation sprint participants: +# Author: Niklas Laxström +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2013-01-20 20:02:17+0000\n" +"Last-Translator: Lasse Liehu \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POT-Import-Date: 2012-12-01 22:21:43+0000\n" +"X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch-käyttöliittymä" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Tiedostojen ja hakemistojen vertailu- ja yhdistämistyökalu" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "Vertaa ja yhdistä tiedostoja sekä hakemistoja KDiff3:lla" + +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "KDiff3" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "Vertaa ja yhdistä tiedostoja sekä hakemistoja" Index: trunk/l10n-support/fi/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/fi/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/fi/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4221 @@ +# KDE Finnish translation sprint participants: +# Author: Artnay +# Author: Lliehu +# Author: Niklas Laxström +# Tommi Nieminen , 2012, 2013, 2015, 2016. +# Lasse Liehu , 2012, 2013, 2014, 2016. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-01 10:31+0200\n" +"PO-Revision-Date: 2016-03-05 20:27+0200\n" +"Last-Translator: Tommi Nieminen \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POT-Import-Date: 2012-12-01 22:21:44+0000\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Tommi Nieminen" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "translator@legisign.org" + +#. +> trunk5 +#: diff.cpp:259 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "Leikepöydän tietojen kirjoitus väliaikaistiedostoon epäonnistui." + +#. +> trunk5 +#: diff.cpp:263 +#, kde-format +msgid "From Clipboard" +msgstr "Leikepöydältä" + +#. +> trunk5 +#: diff.cpp:564 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Odotettiin välilyöntiä sulkevan puolilainausmerkin jälkeen." + +#. +> trunk5 +#: diff.cpp:567 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Puolilainausmerkkien määrä ei täsmää." + +#. +> trunk5 +#: diff.cpp:589 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Odottamaton puolilainausmerkki parametrin sisällä." + +#. +> trunk5 +#: diff.cpp:596 +#, kde-format +msgid "No program specified." +msgstr "Ohjelmaa ei määritetty." + +#. +> trunk5 +#: diff.cpp:711 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Esikäsittely saattoi epäonnistui. Tarkista tämä komento:\n" +"\n" +" %1\n" +"\n" +"Esikäsittelykomento poistetaan nyt käytöstä." + +#. +> trunk5 +#: diff.cpp:758 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Rivinsovitusesikäsittely saattoi epäonnistui. Tarkista tämä komento:\n" +"\n" +" %1\n" +"Rivinsovitusesikäsittelykomento poistetaan nyt käytöstä." + +#. +> trunk5 +#: diff.cpp:785 +#, kde-format +msgid "File %1 too large to process. Skipping." +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, fuzzy, kde-format +#| msgid "Line not available" +msgid "File %1: Line not available" +msgstr "Rivi ei saatavilla" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, kde-format +msgid "Encoding:" +msgstr "Koodaus:" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3377 optiondialog.cpp:921 +#, kde-format +msgid "Line end style:" +msgstr "Rivinlopetustapa:" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Encoding: %1" +msgstr "Koodaus:" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3422 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3423 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, fuzzy, kde-format +#| msgid "Line end style:" +msgid "Line end style: %1" +msgstr "Rivinlopetustapa:" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:871 +#, kde-format +msgid "Top line" +msgstr "Ylin rivi" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, kde-format +msgid "End" +msgstr "Loppu" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, fuzzy, kde-format +#| msgid "Opening files..." +msgid "Open File" +msgstr "Avataan tiedostoja…" + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8-bittinen" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, kde-format +msgid "Other" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "Ratkaisematon" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "Ratkaistu" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "Ei-tyhje" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "Tyhje" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "Kopioi A B:hen" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "Kopioi B A:hen" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "Poista A" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "Poista B" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Poista A ja B" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "Yhdistä A:han" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "Yhdistä B:hen" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Yhdistä A:han ja B:hen" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "Poista (jos olemassa)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1019 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Yhdistä" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Yhdistä (käsin)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Virhe: Tiedostotyypit ristiriidassa-" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Virhe: Muuttunut ja poistettu" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Virhe: Päiväykset yhtenevät mutta tiedostot eivät." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgid "Done." +msgid "Done" +msgstr "Valmis." + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "Virhe" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Ohitettu." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Ei tallennettu." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "Käynnissä…" + +# *** TARKISTA: Kun tietäisi kontekstin, olisi helpompi keksiä käännös! +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "Tehtäviä." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "Nimi" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "Toiminto" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "Tila" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Sekoitus linkkejä ja tavallisia tiedostoja." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Linkki: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Koko: " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Päiväys ja koko: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Väliaikaiskopion luominen tiedostosta %1 epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Tiedoston %1 avaus epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Verrataan tiedostoa…" + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Virhe luettaessa tiedostoa %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "Kansioita yhdistetään paraikaa. Haluatko varmasti keskeyttää yhdistämisen ja tutkia kansion uudelleen?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:695 kdiff3.cpp:705 kdiff3.cpp:717 +#: mergeresultwindow.cpp:341 pdiff.cpp:1034 pdiff.cpp:1926 pdiff.cpp:1936 +#, kde-format +msgid "Warning" +msgstr "Varoitus" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "Tutki uudelleen" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1036 +#, kde-format +msgid "Continue Merging" +msgstr "Jatka yhdistämistä" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Kansioiden avaus epäonnistui:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "A-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "B-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "C-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Kansion avausvirhe" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"Kohdekansio ei saa olla sama kuin A tai B, kun kolmea kansiota yhdistetään.\n" +"Tarkista vielä ennen kuin jatkat." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Parametrivaroitus" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Tutkitaan kansioita…" + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Luetaan A-kansiota" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Luetaan B-kansiota" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Luetaan C-kansiota" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Jotkin alikansiot eivät ole luettavissa kansiossa" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Tarkista alikansioiden oikeudet." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:663 kdiff3.cpp:750 kdiff3.cpp:774 +#: kdiff3.cpp:1063 kdiff3.cpp:1084 pdiff.cpp:1115 pdiff.cpp:1187 +#: pdiff.cpp:1232 pdiff.cpp:1248 pdiff.cpp:1291 pdiff.cpp:1314 +#, kde-format +msgid "Ready." +msgstr "Valmis." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of equal files:" +msgid "Number of manual merges: %1" +msgstr "Yhtenevien tiedostojen määrä:" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "Tämä vaikuttaa kaikkiin yhdistämistoimintoihin." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Muutetaan kaikkia yhdistämistoimintoja" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgid "Processing " +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "Käsitellään: " + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Tämä toiminto ei ole nyt mahdollinen." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "Toiminto ei mahdollinen" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "Kopioitaessa sattui virhe.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "Yhdistämisvirhe" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Tuntematon yhdistämistoiminto. (Näin ei koskaan pitäisi käydä!)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "Tuntematon yhdistämistoiminto." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" +"Yhdistäminen on alkamassa.\n" +"\n" +"Valitse ”Toteuta”, jos olet lukenut ohjeet ja tiedät, mitä teet.\n" +"”Simuloi” näyttää sinulle, mitä tulee tapahtumaan.\n" +"\n" +"Huomaa, että ohjelma on yhä beetavaiheessa eikä MINKÄÄNLAISTA TAKUUTA anneta! Tee varmuuskopiot tärkeistä tiedoistasi!" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "Aloitetaan yhdistäminen" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "Toteuta" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "Simuloi" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "Korostettu kohde on eri tyyppiä eri kansioissa. Valitse, mitä tehdään." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "Tiedostojen muutospäivämäärät ovat samat mutta tiedostot eivät. Valitse, mitä tehdään." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "Korostettua kohdetta on muutettu toisessa kansiossa ja se on poistettu toisesta. Valitse, mitä tehdään." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "Tämä toiminto ei juuri nyt ole mahdollinen, koska kansioita yhdistetään paraikaa." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" +"Viime vaiheessa sattui virhe.\n" +"Haluatko jatkaa kohteesta, joka aiheutti virheen, vai ohittaa tämän kohteen?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "Jatka yhdistämistä virheen jälkeen" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "Jatka viimeisimmästä kohteesta" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "Ohita kohde" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "Yhdistämistoiminto valmis." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "Yhdistäminen valmis" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Simuloitu yhdistäminen valmis: Tarkista, että olet samaa mieltä ehdotettujen toimintojen kanssa." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "Sattui virhe. Näet lisätietoja, kun painat OK.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Virhe: Poistettaessa kohdetta %1: Varmuuskopion luonti epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "poista kansio alikansioineen (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "poista (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Virhe: kansionpoistotoimenpide epäonnistui yritettäessä lukea kansiota." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Virhe: rmdir-toimenpide (%1) epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Virhe: poistotoimenpide epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "yhdistäminen itse (%1, %2, %3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Huomaa: Itse tehdyn yhdistämisen jälkeen käyttäjän tulisi jatkaa painamalla F7." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Virhe: kopiointi %1 -> %2 epäonnistui. Olemassa olevaa kohdetta ei voida poistaa." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "kopioi linkki %1 -> %2" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Virhe: linkin kopiointi epäonnistui. Etälinkkejä ei vielä tueta." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Virhe: linkin kopiointi epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "kopioi %1 -> %2" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Virhe muutettaessa nimeä %1 -> %2: Olemassa olevaa kohdetta ei voida poistaa." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "muuta nimeä %1 -> %2" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "Virhe: Nimen muuttaminen epäonnistui." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Virhe komennossa luotaessa kansiota %1. Olemassa olevaa tiedostoa ei voida poistaa." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "makeDir( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "Virhe luotaessa kansiota." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "Kohde" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "Kansio" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "Tyyppi" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "Koko" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "Määr" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "Viim. muutos" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "Linkin kohde" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "Tiedosto" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "ei saatavilla" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (kohde): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (perusta): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (kohde): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (kohde): " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "Kohde: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Tallenna kansioiden yhdistämisen tila nimellä…" + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Aloita kansioiden yhdistäminen tai jatka sitä" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Käynnistä toimenpide nykyiselle tietueelle" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "Vertaa valittua tiedostoa" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "Yhdistä nykyinen tiedosto" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Yhdistä\n" +"tiedosto" + +# *** TARKISTA: Vai onko ympäristö sellainen, että jokin *toimenpide* voi kohdistua alikansioihinkin? +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Piilota alikansiot" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Näytä alikansiot" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "Valitse A kaikkiin kohteisiin" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "Valitse B kaikkiin kohteisiin" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "Valitse C kaikkiin kohteisiin" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Valitse toiminto automaattisesti kaikkiin kohteisiin" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "Ei toimintoa kaikkiin kohteisiin" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "Näytä identtiset tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"Identtiset\n" +"tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "Näytä eroavat tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "Näytä vain A:ssa olevat tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"Tiedostot\n" +"vain A:ssa" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "Näytä vain B:ssä olevat tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"Tiedostot\n" +"vain B:ssä" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "Näytä vain C:ssä olevat tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"Tiedostot\n" +"vain C:ssä" + +# Mahdoton sanoa, verrataanko vai valitaanko eksplisiittisesti :/ +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Vertaa eksplisiittisesti valittuja tiedostoja" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Yhdistä eksplisiittisesti valitut tiedostot" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "Älä tee mitään" + +#. +> trunk5 +#: directorymergewindow.cpp:3660 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: directorymergewindow.cpp:3661 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: directorymergewindow.cpp:3662 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "Poista A ja B" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "Yhdistä A:han ja B:hen" + +#. +> trunk5 +#: fileaccess.cpp:917 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"Yritettäessä tehdä varmuuskopiota vanhemman varmuuskopion poisto epäonnistui.\n" +"Tiedostonimi: " + +#. +> trunk5 +#: fileaccess.cpp:924 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"Yritettäessä tehdä varmuuskopiota nimen muuttaminen epäonnistui.\n" +"Tiedostonimet: " + +#. +> trunk5 +#: fileaccess.cpp:948 +#, kde-format +msgid "Getting file status: %1" +msgstr "Noudetaan tiedoston tilaa: %1" + +#. +> trunk5 +#: fileaccess.cpp:990 +#, kde-format +msgid "Reading file: %1" +msgstr "Luetaan tiedostoa: %1" + +#. +> trunk5 +#: fileaccess.cpp:1028 +#, kde-format +msgid "Writing file: %1" +msgstr "Kirjoitetaan tiedostoa: %1" + +#. +> trunk5 +#: fileaccess.cpp:1061 +#, kde-format +msgid "Out of memory" +msgstr "Muisti lopussa" + +#. +> trunk5 +#: fileaccess.cpp:1096 +#, kde-format +msgid "Making directory: %1" +msgstr "Tehdään kansiota: %1" + +#. +> trunk5 +#: fileaccess.cpp:1116 +#, kde-format +msgid "Removing directory: %1" +msgstr "Poistetaan kansiota: %1" + +#. +> trunk5 +#: fileaccess.cpp:1131 +#, kde-format +msgid "Removing file: %1" +msgstr "Poistetaan tiedostoa: %1" + +#. +> trunk5 +#: fileaccess.cpp:1147 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Luodaan symbolista linkkiä: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1175 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Muutetaan tiedoston nimeä: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1207 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Kopioidaan tiedostoa: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1221 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Virhe tiedostoa kopioitaessa: Tiedoston avaus luettavaksi epäonnistui. Tiedostonimi: %1" + +#. +> trunk5 +#: fileaccess.cpp:1227 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Virhe tiedostoa kopioitaessa: Tiedoston avaus kirjoitettavaksi epäonnistui. Tiedostonimi: %1" + +#. +> trunk5 +#: fileaccess.cpp:1239 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Virhe tiedostoa kopioitaessa: luku epäonnistui. Tiedostonimi: %1" + +#. +> trunk5 +#: fileaccess.cpp:1248 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Virhe tiedostoa kopioitaessa: kirjoitus epäonnistui. Tiedostonimi: %1" + +#. +> trunk5 +#: fileaccess.cpp:1531 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "Luetaan kansiota: " + +#. +> trunk5 +#: fileaccess.cpp:1652 +#, kde-format +msgid "Listing directory: %1" +msgstr "Luetellaan kansiota: %1" + +#. +> trunk5 +#: kdiff3.cpp:178 +#, kde-format +msgid "Current Configuration:" +msgstr "Nykyiset asetukset:" + +#. +> trunk5 +#: kdiff3.cpp:183 +#, kde-format +msgid "Config Option Error:" +msgstr "Asetusvirhe:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:229 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "--auto-valitsinta käytetty antamatta tulostiedostoa." + +#. +> trunk5 +#: kdiff3.cpp:406 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "--auto-valitsin ohitettu kansiovertailussa." + +#. +> trunk5 +#: kdiff3.cpp:453 +#, kde-format +msgid "Saving failed." +msgstr "Tallennus epäonnistui." + +#. +> trunk5 +#: kdiff3.cpp:488 pdiff.cpp:1097 pdiff.cpp:1168 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Näiden tiedostojen avaus epäonnistui:" + +#. +> trunk5 +#: kdiff3.cpp:497 +#, kde-format +msgid "File Open Error" +msgstr "Tiedoston avausvirhe" + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Avaa tiedostot vertailtavaksi…" + +#. +> trunk5 +#: kdiff3.cpp:527 +#, kde-format +msgid "Reload" +msgstr "Lataa uudelleen" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Tallentaa yhdistämisen tuloksen. Kaikki ristiriidat on ratkaistava!" + +#. +> trunk5 +#: kdiff3.cpp:532 +#, kde-format +msgid "Saves the current document as..." +msgstr "Tallentaa nykyisen tiedoston toisella nimellä" + +#. +> trunk5 +#: kdiff3.cpp:535 +#, kde-format +msgid "Print the differences" +msgstr "Tulostaa erot" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Quits the application" +msgstr "Lopettaa ohjelman" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Leikkaa valitun alueen ja vie sen leikepöydälle" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Kopioi valitun alueen leikepöydälle" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Liittää leikepöydän sisällön nykyiseen sijaintiin" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Select everything in current window" +msgstr "Valitsee kaiken nykyisestä ikkunasta" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search for a string" +msgstr "Etsi merkkijonoa" + +#. +> trunk5 +#: kdiff3.cpp:550 +#, kde-format +msgid "Search again for the string" +msgstr "Etsi merkkijonoa uudelleen" + +#. +> trunk5 +#: kdiff3.cpp:555 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Näyttää tai piilottaa tilarivin" + +#. +> trunk5 +#: kdiff3.cpp:559 +#, kde-format +msgid "Configure KDiff3..." +msgstr "KDiff3:n asetukset…" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to Current Delta" +msgstr "Siirry nykyiseen muutokseen" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Nykyinen\n" +"muutos" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to First Delta" +msgstr "Siirry ensimmäiseen muutokseen" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"Ensimmäinen\n" +"muutos" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "Go to Last Delta" +msgstr "Siirry viimeiseen muutokseen" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Viimeisin\n" +"delta" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Ohittaa tyhjemerkkierot, kun ”Näytä tyhjemerkit” on poissa käytöstä.)" + +#. +> trunk5 +#: kdiff3.cpp:586 +#, kde-format +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Ei ohita tyhjemerkkieroja silloinkaan, kun ”Näytä tyhjemerkit” on poissa käytöstä.)" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Siirry edelliseen muutokseen" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Edellinen\n" +"muutos" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Next Delta" +msgstr "Siirry seuraavaan muutokseen" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Seuraava\n" +"muutos" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Siirry edelliseen ristiriitaan" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Edellinen\n" +"ristiriita" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Siirry seuraavaan ristiriitaan" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Seuraava\n" +"ristiriita" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Siirry edelliseen ratkaisemattomaan ristiriitaan" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Edellinen\n" +"ratkaisematon" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Siirry seuraavaan ratkaisemattomaan ristiriitaan" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Seuraava\n" +"ratkaisematon" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Valitse rivejä A:sta" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Valitse\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Valitse rivejä B:stä" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Valitse\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:601 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Valitse rivejä C:stä" + +#. +> trunk5 +#: kdiff3.cpp:601 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Valitse\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Siirry automaattisesti seuraavaan ratkaisemattomaan ristiriitaan lähteen valinnan jälkeen" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Autom.\n" +"seuraava" + +#. +> trunk5 +#: kdiff3.cpp:604 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters for Differences" +msgid "Show Space && Tabulator Characters" +msgstr "Näytä eroissa tyhjemerkit" + +#. +> trunk5 +#: kdiff3.cpp:604 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show White Space" +msgstr "Näytä tyhjemerkit" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Show Line Numbers" +msgstr "Näytä rivinumerot" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Rivi-\n" +"numerot" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Valitse A kaikkialla" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Valitse B kaikkialla" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Valitse C kaikkialla" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Valitse A kaikissa ratkaisemattomissa ristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Valitse B kaikissa ratkaisemattomissa ristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Valitse C kaikissa ratkaisemattomissa ristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Valitse A kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Valitse B kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Valitse C kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Ratkaise yksinkertaiset ristiriidat automaattisesti" + +# *** TARKISTA: Hmmh +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Aseta ristiriidat muutoksiksi" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Suorita sääntölausekkeinen automaattiyhdistäminen" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Ratkaisu historiaristiriidat automaattisesti" + +#. +> trunk5 +#: kdiff3.cpp:621 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Jaa diff valinnan kohdalta" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Yhdistä valitut diffit" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window A" +msgstr "Näytä A-ikkuna" + +#. +> trunk5 +#: kdiff3.cpp:625 +#, kde-format +msgid "Show Window B" +msgstr "Näytä B-ikkuna" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Show Window C" +msgstr "Näytä C-ikkuna" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "Normal Overview" +msgstr "Tavallinen yhteenveto" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "A vs. B Overview" +msgstr "A–B-erojen yhteenveto" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "A vs. C Overview" +msgstr "A–C-erojen yhteenveto" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "B vs. C Overview" +msgstr "B–C-erojen yhteenveto" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Rivitä vertailuikkunat" + +#. +> trunk5 +#: kdiff3.cpp:633 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Lisää oma vertailutasauskohta" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Tyhjennä kaikki omat vertailutasauskohdat" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Focus Next Window" +msgstr "Kohdista seuraavaan ikkunaan" + +#. +> trunk5 +#: kdiff3.cpp:637 +#, kde-format +msgid "Focus Prev Window" +msgstr "Kohdista edellinen ikkuna" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Vaihda jaon suuntaa" + +# *** TARKISTA: Tässä oletettu (split (dir + text) view), mutta voi olla myös ((dir) + (split text) view) +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Jaettu kansio- ja tekstinäkymä" + +#. +> trunk5 +#: kdiff3.cpp:642 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Vaihda kansio- ja tekstinäkymien välillä" + +#. +> trunk5 +#: kdiff3.cpp:694 pdiff.cpp:1925 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "Yhdistämisen tulosta ei ole vielä tallennettu" + +#. +> trunk5 +#: kdiff3.cpp:696 +#, kde-format +msgid "Save && Quit" +msgstr "Tallenna ja lopeta" + +#. +> trunk5 +#: kdiff3.cpp:697 +#, kde-format +msgid "Quit Without Saving" +msgstr "Lopeta tallentamatta" + +#. +> trunk5 +#: kdiff3.cpp:705 pdiff.cpp:1936 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Yhdistämisen tulosten tallennus epäonnistui." + +#. +> trunk5 +#: kdiff3.cpp:716 pdiff.cpp:1033 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Olet tekemässä kansioiden yhdistämistä. Oletko varma vai haluatko keskeyttää?" + +#. +> trunk5 +#: kdiff3.cpp:739 +#, kde-format +msgid "Saving file..." +msgstr "Tallennetaan tiedostoa…" + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Tallennetaan tiedostoa uudella nimellä…" + +#. +> trunk5 +#: kdiff3.cpp:758 +#, kde-format +msgid "Save As..." +msgstr "Tallenna nimellä…" + +#. +> trunk5 +#: kdiff3.cpp:817 +#, kde-format +msgid "Printing not implemented." +msgstr "Tulostusta ei ole toteutettu." + +#. +> trunk5 +#: kdiff3.cpp:855 +#, kde-format +msgid "Printing..." +msgstr "Tulostetaan…" + +#. +> trunk5 +#: kdiff3.cpp:941 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:998 +#, fuzzy, kde-format +#| msgid "Selection" +msgid " (Selection)" +msgstr "Valinta" + +#. +> trunk5 +#: kdiff3.cpp:1025 +#, kde-format +msgid "Printing completed." +msgstr "Tulostus valmis." + +#. +> trunk5 +#: kdiff3.cpp:1029 +#, kde-format +msgid "Printing aborted." +msgstr "Tulostus keskeytettiin." + +#. +> trunk5 +#: kdiff3.cpp:1036 +#, kde-format +msgid "Exiting..." +msgstr "Lopetetaan…" + +#. +> trunk5 +#: kdiff3.cpp:1047 +#, kde-format +msgid "Toggling toolbar..." +msgstr "Näytetään tai piilotetaan työkaluriviä…" + +#. +> trunk5 +#: kdiff3.cpp:1068 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "Näytetään tai piilotetaan tilariviä…" + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "Vertailtavia tiedostoja ei löytynyt." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "KDiff3:n asetukset" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:112 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"KDiff3-osaa ei saatu alustetuksi.\n" +"Näin käy yleensä asennusvirheen takia. Lisätietoja saat lukemalla lähdepaketin README-tiedoston." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "&Tiedosto" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "&Kansio" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Nykyisen tietueen yhdistystoimenpide" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Nykyisen tietueen synkronointitoimenpide" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgid "&Movement" +msgid "M&ovement" +msgstr "&Siirtyminen" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "&Diff-näkymä" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +#| msgid "Merge" +msgid "M&erge" +msgstr "Yhdistä" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "&Ikkuna" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Päätyökalurivi" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Ohitettu. (Käyttäjän määritys.)" + +#. +> trunk5 +#: main.cpp:118 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Työkalu tiedostojen ja kansioiden vertailemiseksi ja yhdistämiseksi" + +#. +> trunk5 +#: main.cpp:119 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:138 +#, kde-format +msgid "Merge the input." +msgstr "Yhdistä tulos." + +#. +> trunk5 +#: main.cpp:139 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Eksplisiittinen pohjatiedosto. Yhteensopivuussyistä tiettyjen työkalujen kanssa." + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Tulostiedosto taas. (Yhteensopivuussyistä tiettyjen työkalujen kanssa.)" + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "Ei käyttöliittymää, jos kaikki ristiriidat voi ratkaista automaattisesti. (Vaatii -o tiedosto)" + +#. +> trunk5 +#: main.cpp:143 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically. (For compatibility...)" +msgid "Do not solve conflicts automatically." +msgstr "Älä ratkaise ristiriitoja automaattisesti. (Yhteensopivuussyistä.)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "" + +#. +> trunk5 +#: main.cpp:145 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "" + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "" + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Ohita yksittäinen asetus. Käytä kerran kullekin asetukselle. Esim. --cs \"AutoAdvance=1\"" + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "Näyttää nykyisten asetusten ja arvojen luettelon." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "Use a different config file." +msgstr "Käytä toista asetustiedostoa." + +#. +> trunk5 +#: main.cpp:153 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "avattava tiedosto1 (pohja, ellei annettu --base)" + +#. +> trunk5 +#: main.cpp:154 +#, kde-format +msgid "file2 to open" +msgstr "avattava tiedosto2" + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file3 to open" +msgstr "avattava tiedosto3" + +#. +> trunk5 +#: main.cpp:166 +#, kde-format +msgid "See kdiff3 --help for supported options." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Ratkaisemattomia ristiriitoja jäljellä: %1 (joista %2 liittyy tyhjemerkkeihn)" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Tulostetta on muutettu.\n" +"Jos jatkat, muutoksesi menetetään." + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:777 +#, kde-format +msgid "All input files are binary equal." +msgstr "Kaikki syötetiedostot ovat binaarisesti samat." + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "Kaikki syötetiedostot sisältävät saman tekstin." + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:783 pdiff.cpp:787 pdiff.cpp:791 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Tiedostot %1 ja %2 ovat binaarisesti samat.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Tiedostojen %1 ja %2 tekstit ovat samat.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, kde-format +msgid "Conflicts" +msgstr "Ristiriidat" + +#. +> trunk5 +#: mergeresultwindow.cpp:1838 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1846 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 mergeresultwindow.cpp:2707 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2919 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"Kaikkia ristiriitoja ei vielä ratkaistu.\n" +"Tiedostoa ei tallennettu.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2921 mergeresultwindow.cpp:2930 +#, kde-format +msgid "Conflicts Left" +msgstr "Ristiriitoja jäljellä" + +#. +> trunk5 +#: mergeresultwindow.cpp:2928 +#, fuzzy, kde-format +#| msgid "" +#| "There is a line end style conflict. Please choose the line end style manually.\n" +#| "File not saved.\n" +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved." +msgstr "" +"Rivinloppumerkeissä on ristiriita. Valitse rivinlopetusmerkki itse.\n" +"Tiedostoa ei tallennettu.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2942 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Varmuuskopion luonti epäonnistui. Tiedostoa ei tallennettu." + +#. +> trunk5 +#: mergeresultwindow.cpp:2942 mergeresultwindow.cpp:2990 +#, kde-format +msgid "File Save Error" +msgstr "Tiedoston tallennusvirhe" + +#. +> trunk5 +#: mergeresultwindow.cpp:2990 +#, kde-format +msgid "Error while writing." +msgstr "Virhe kirjoitettaessa." + +#. +> trunk5 +#: mergeresultwindow.cpp:3350 +#, fuzzy, kde-format +#| msgid "Output" +msgid "Output:" +msgstr "Tuloste" + +#. +> trunk5 +#: mergeresultwindow.cpp:3362 mergeresultwindow.cpp:3553 +#, kde-format +msgid "[Modified]" +msgstr "[Muutettu]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3369 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "Tallennettaessa käytettävä koodaus" + +#. +> trunk5 +#: mergeresultwindow.cpp:3468 +#, kde-format +msgid "Conflict" +msgstr "Ristiriita" + +#. +> trunk5 +#: mergeresultwindow.cpp:3500 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from A: %1" +msgstr "Merkistöstä" + +#. +> trunk5 +#: mergeresultwindow.cpp:3502 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from B: %1" +msgstr "Merkistöstä" + +#. +> trunk5 +#: mergeresultwindow.cpp:3504 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from C: %1" +msgstr "Merkistöstä" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin-1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Valitse tämä, ellei ei-ASCII-merkkejä näytetä oikein." + +#. +> trunk5 +#: optiondialog.cpp:614 +#, kde-format +msgid "Configure" +msgstr "Asetukset" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Font" +msgstr "Fontti" + +#. +> trunk5 +#: optiondialog.cpp:694 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Muokkaimen ja vertailutulosteen fontti" + +#. +> trunk5 +#: optiondialog.cpp:712 +#, kde-format +msgid "Application font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:716 +#, fuzzy, kde-format +#| msgid "File Save Error" +msgid "File view font" +msgstr "Tiedoston tallennusvirhe" + +#. +> trunk5 +#: optiondialog.cpp:734 +#, kde-format +msgid "Color" +msgstr "Väri" + +#. +> trunk5 +#: optiondialog.cpp:735 +#, kde-format +msgid "Colors Settings" +msgstr "Väriasetukset" + +#. +> trunk5 +#: optiondialog.cpp:752 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Muokkain- ja diff-näkymät:" + +#. +> trunk5 +#: optiondialog.cpp:760 +#, kde-format +msgid "Foreground color:" +msgstr "Tekstiväri:" + +#. +> trunk5 +#: optiondialog.cpp:767 +#, kde-format +msgid "Background color:" +msgstr "Taustaväri:" + +#. +> trunk5 +#: optiondialog.cpp:776 +#, kde-format +msgid "Diff background color:" +msgstr "Diff-taustaväri:" + +#. +> trunk5 +#: optiondialog.cpp:784 +#, kde-format +msgid "Color A:" +msgstr "A-väri:" + +#. +> trunk5 +#: optiondialog.cpp:792 +#, kde-format +msgid "Color B:" +msgstr "B-väri:" + +#. +> trunk5 +#: optiondialog.cpp:800 +#, kde-format +msgid "Color C:" +msgstr "C-väri:" + +#. +> trunk5 +#: optiondialog.cpp:807 +#, kde-format +msgid "Conflict color:" +msgstr "Ristiriitaväri:" + +#. +> trunk5 +#: optiondialog.cpp:815 +#, kde-format +msgid "Current range background color:" +msgstr "Nykyisen alueen taustaväri:" + +#. +> trunk5 +#: optiondialog.cpp:823 +#, kde-format +msgid "Current range diff background color:" +msgstr "Nykyisen alueen diff-taustaväri:" + +#. +> trunk5 +#: optiondialog.cpp:830 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Omien tasauskohta-alueiden väri:" + +#. +> trunk5 +#: optiondialog.cpp:836 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Kansiovertailunäkymä:" + +#. +> trunk5 +#: optiondialog.cpp:842 +#, kde-format +msgid "Newest file color:" +msgstr "Uusimman tiedoston väri:" + +#. +> trunk5 +#: optiondialog.cpp:846 +#, kde-format +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Tämän värin vaihtamisella on vaikutusta vasta käynnistettäessä seuraava kansiovertailu." + +#. +> trunk5 +#: optiondialog.cpp:851 +#, kde-format +msgid "Oldest file color:" +msgstr "Vanhimman tiedoston väri:" + +#. +> trunk5 +#: optiondialog.cpp:859 +#, kde-format +msgid "Middle age file color:" +msgstr "Keski-ikäisen tiedoston väri:" + +#. +> trunk5 +#: optiondialog.cpp:867 +#, kde-format +msgid "Color for missing files:" +msgstr "Puuttuvien tiedostojen väri:" + +#. +> trunk5 +#: optiondialog.cpp:880 +#, kde-format +msgid "Editor" +msgstr "Muokkain" + +#. +> trunk5 +#: optiondialog.cpp:881 +#, kde-format +msgid "Editor Behavior" +msgstr "Muokkaimen toiminta" + +#. +> trunk5 +#: optiondialog.cpp:894 +#, kde-format +msgid "Tab inserts spaces" +msgstr "Sarkain lisää välilyöntejä" + +#. +> trunk5 +#: optiondialog.cpp:897 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Käytössä: Sarkaimen painallus luo sopivan määrän välilyöntejä.\n" +"Poissa käytöstä: Lisätään sarkainmerkki." + +#. +> trunk5 +#: optiondialog.cpp:902 +#, kde-format +msgid "Tab size:" +msgstr "Sarkainleveys:" + +#. +> trunk5 +#: optiondialog.cpp:908 +#, kde-format +msgid "Auto indentation" +msgstr "Automaattisisennys" + +#. +> trunk5 +#: optiondialog.cpp:911 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Käytössä: Edellisen rivin sisennystä käytetään uudelle riville.\n" + +#. +> trunk5 +#: optiondialog.cpp:914 +#, kde-format +msgid "Auto copy selection" +msgstr "Kopioi valinta automaattisesti" + +#. +> trunk5 +#: optiondialog.cpp:917 +#, fuzzy, kde-format +#| msgid "" +#| "On: Any selection is immediately written to the clipboard.\n" +#| "Off: You must explicitely copy e.g. via Ctrl-C." +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" +"Käytössä: Valinta kopioidaan välittömästi leikepöydälle.\n" +"Poissa käytöstä: Kopiointi on tehtävä itse (esim. Ctrl-C)." + +#. +> trunk5 +#: optiondialog.cpp:931 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Asettaa muokkattuja tiedostoja tallennettaessa käytettävät rivinloppumerkit.\n" +"DOS/Windows: CR+LF, UNIX: LF (missä CR=0D, LF=0A)." + +#. +> trunk5 +#: optiondialog.cpp:941 +#, kde-format +msgid "Diff" +msgstr "Diff" + +#. +> trunk5 +#: optiondialog.cpp:942 +#, kde-format +msgid "Diff Settings" +msgstr "Diff-asetukset" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:966 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore numbers (treat as white space)" +msgstr "Kohtele tyhjemerkkeinä." + +#. +> trunk5 +#: optiondialog.cpp:969 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Ohita numerot rivien täsmäysvaiheessa. (Samankaltainen kuin tyhjemerkkien ohitus.)\n" +"Voi helpottaa numeerista tietoa sisältävien tiedostojen vertailua." + +#. +> trunk5 +#: optiondialog.cpp:973 +#, fuzzy, kde-format +#| msgid "Treat C/C++ comments like white space." +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "Kohtele C:n/C++:n kommentteja tyhjemerkkeinä." + +#. +> trunk5 +#: optiondialog.cpp:975 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Kohtele C:n/C++:n kommentteja tyhjemerkkeinä." + +#. +> trunk5 +#: optiondialog.cpp:978 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore case (treat as white space)" +msgstr "Kohtele tyhjemerkkeinä." + +#. +> trunk5 +#: optiondialog.cpp:981 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Kohtele eroja suur- tai pienaakkostuksessa kuten tyhjemerkkejä (”a” <=> ”A”)." + +#. +> trunk5 +#: optiondialog.cpp:984 +#, kde-format +msgid "Preprocessor command:" +msgstr "Esikäsittelykomento:" + +#. +> trunk5 +#: optiondialog.cpp:988 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Käyttäjän määrittämä esikäsittely. (Katso lisätietoja ohjeista.)" + +#. +> trunk5 +#: optiondialog.cpp:991 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:995 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Tätä esikäsittelyä käytetään vain rivejä täsmättäessä.\n" +"(Katso lisätietoja ohjeista.)" + +#. +> trunk5 +#: optiondialog.cpp:998 +#, kde-format +msgid "Try hard (slower)" +msgstr "Yritä kovemmin (hitaampaa)" + +#. +> trunk5 +#: optiondialog.cpp:1001 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Ottaa käyttöön --minimal-asetukset ulkoiselle diffille.\n" +"Suurempien tiedostojen tarkastelu hidastuu huomattavasti." + +#. +> trunk5 +#: optiondialog.cpp:1005 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Kohdista B ja C kolmelle syötetiedostolle" + +#. +> trunk5 +#: optiondialog.cpp:1008 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Yritä kohdistaa B ja C vertailtaessa tai yhdistettäessä kolmea syötetiedostoa.\n" +"Ei suositeltavaa yhdistämisessä, koska se voi huomattavasti mutkistua.\n" +"(Oletus on poissa käytöstä.)" + +#. +> trunk5 +#: optiondialog.cpp:1020 +#, kde-format +msgid "Merge Settings" +msgstr "Yhdistämisasetukset" + +#. +> trunk5 +#: optiondialog.cpp:1034 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Automaattietenemisen viive (ms):" + +#. +> trunk5 +#: optiondialog.cpp:1039 +#, kde-format +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 "" +"Automaattietenemistilassa nykyisen valinnan tulos näytetään annetun ajan\n" +"ennen siirtymistä seuraavaan ristiriitaan. Väli: 0–2000 ms" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, kde-format +msgid "Show info dialogs" +msgstr "Näytä viesti-ikkunat" + +#. +> trunk5 +#: optiondialog.cpp:1045 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Näytä viesti-ikkuna ristiriitojen määrästä." + +#. +> trunk5 +#: optiondialog.cpp:1048 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1052 optiondialog.cpp:1064 +#, kde-format +msgid "Manual Choice" +msgstr "Käyttäjän valinta" + +#. +> trunk5 +#: optiondialog.cpp:1056 optiondialog.cpp:1069 +#, kde-format +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1060 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1073 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1081 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1085 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1093 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1098 +#, kde-format +msgid "Version Control History Merging" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1106 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1110 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1116 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1128 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "History merge sorting" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1138 +#, kde-format +msgid "Sort version control history by a key." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1148 +#, kde-format +msgid "History entry start sort key order:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1152 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1165 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1169 +#, kde-format +msgid "Max number of history entries:" +msgstr "Historiatietueiden enimmäismäärä:" + +#. +> trunk5 +#: optiondialog.cpp:1172 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Katkaise annetun määrän jälkeen. -1 sallii rajattoman tietuemäärän." + +#. +> trunk5 +#: optiondialog.cpp:1176 +#, kde-format +msgid "Test your regular expressions" +msgstr "Kokeile säännöllisiä lausekkeitasi" + +#. +> trunk5 +#: optiondialog.cpp:1181 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1185 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1190 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1193 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1204 optiondialog.cpp:1205 +#, kde-format +msgid "Directory" +msgstr "Kansio" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Recursive directories" +msgstr "Myös alikansiot" + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Tarkistetaanko alikansiotkin vai ei." + +#. +> trunk5 +#: optiondialog.cpp:1221 +#, kde-format +msgid "File pattern(s):" +msgstr "Tiedostohahmo(t):" + +#. +> trunk5 +#: optiondialog.cpp:1226 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Tutkittavien tiedostonimien hahmo(t).\n" +"Jokerit: ”*” ja ”?”.\n" +"Useampia hahmoja voi antaa erottamalla ne puolipistein ”;”." + +#. +> trunk5 +#: optiondialog.cpp:1231 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1236 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1241 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1246 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1251 +#, kde-format +msgid "Use .cvsignore" +msgstr "Käytä .cvsignore-tiedostoa" + +#. +> trunk5 +#: optiondialog.cpp:1254 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1258 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Etsi piilotiedostoja ja -kansioita" + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Etsii tiedostoja ja -kansioita, jotka on piilotettu" + +#. +> trunk5 +#: optiondialog.cpp:1263 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Etsii tiedostoja ja kansioita ”.”:sta alkaen" + +#. +> trunk5 +#: optiondialog.cpp:1267 +#, kde-format +msgid "Follow file links" +msgstr "Seuraa tiedostolinkkejä" + +#. +> trunk5 +#: optiondialog.cpp:1270 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Käytössä: Vertaa linkin osoittamaa tiedostoa.\n" +"Poissa käytöstä: Vertaa linkkejä." + +#. +> trunk5 +#: optiondialog.cpp:1274 +#, kde-format +msgid "Follow directory links" +msgstr "Seuraa kansiolinkkejä" + +#. +> trunk5 +#: optiondialog.cpp:1277 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Käytössä: Vertaa linkin osoittamaa kansiota.\n" +"Poissa käytöstä: Vertaa linkkejä." + +#. +> trunk5 +#: optiondialog.cpp:1292 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Erota pien- ja suuraakkoset tiedostonimiä vertailtaessa" + +#. +> trunk5 +#: optiondialog.cpp:1295 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" +"Kansiovertailu vertaa saman nimisiä tiedostoja ja kansioita.\n" +"Aseta tämä, jos tiedostonimien täytyy täsmätä tarkasti. (Windowsissa oletus on pois käytöstä, muuten käytössä.)" + +#. +> trunk5 +#: optiondialog.cpp:1299 +#, fuzzy, kde-format +#| msgid "Unfold All Subdirs" +msgid "Unfold all subdirectories on load" +msgstr "Näytä alikansiot" + +#. +> trunk5 +#: optiondialog.cpp:1302 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1306 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1309 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1313 +#, kde-format +msgid "File Comparison Mode" +msgstr "Tiedostonvertailutapa" + +#. +> trunk5 +#: optiondialog.cpp:1318 +#, kde-format +msgid "Binary comparison" +msgstr "Binaarivertailu" + +#. +> trunk5 +#: optiondialog.cpp:1319 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Kunkin tiedoston binaarivertailu (oletus)." + +#. +> trunk5 +#: optiondialog.cpp:1322 +#, kde-format +msgid "Full analysis" +msgstr "Täysi analyysi" + +#. +> trunk5 +#: optiondialog.cpp:1323 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Tee täysi analyysi ja näytä tilastotiedot lisäsarakkeina.\n" +"(Hitaampaa kuin binaarivertailu etenkin binaaritiedostoille.)" + +#. +> trunk5 +#: optiondialog.cpp:1327 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Luota kokoon ja muutospäivään (turvatonta)" + +#. +> trunk5 +#: optiondialog.cpp:1328 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Oleta, että tiedostot ovat samat, jos muutospäivä ja tiedoston koko yhtenevät.\n" +"Tiedostot, joilla on sama sisältö mutta eri muutospäivä näytetään eroavina.\n" +"Kätevä suurille kansioille tai hitaille verkoille." + +#. +> trunk5 +#: optiondialog.cpp:1333 +#, kde-format +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Luota kokoon ja päiväykseen mutta käytä binaarivertailua, elleivät päiväykset vastaa (turvatonta)" + +#. +> trunk5 +#: optiondialog.cpp:1334 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Oleta, että tiedostot ovat samat, jos muutospäivä ja tiedoston koko yhtenevät.\n" +"Elleivät päiväykset ole samat mutta koot ovat, käytetään binaarivertailua.\n" +"Kätevä suurille kansioille tai hitaille verkoille." + +#. +> trunk5 +#: optiondialog.cpp:1339 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Luota kokoon (turvatonta)" + +#. +> trunk5 +#: optiondialog.cpp:1340 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" +"Oleta tiedostot yhteneviksi, jos niiden tiedostokoko on sama.\n" +"Kätevä suurille kansioille tai hitaille verkoille, jos päiväys muuttuu ladattaessa." + +#. +> trunk5 +#: optiondialog.cpp:1347 +#, kde-format +msgid "Synchronize directories" +msgstr "Synkronoi kansiot" + +#. +> trunk5 +#: optiondialog.cpp:1350 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Tarjoaa tiedostojen tallentamista kumpaankin kansioon,\n" +"jolloin kummankin kansion sisältö tulee samaksi.\n" +"Toimii vain verrattaessa kahta kansiota ilman kohdetta." + +#. +> trunk5 +#: optiondialog.cpp:1356 +#, kde-format +msgid "White space differences considered equal" +msgstr "Tyhjemerkit eivät vaikuta lopputulokseen" + +#. +> trunk5 +#: optiondialog.cpp:1359 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Jos tiedostot eroavat vain tyhjemerkeiltään, pidä niitä yhtäläisinä.\n" +"Tämä on aktiivinen vain, kun täysi analyysi on valittu." + +#. +> trunk5 +#: optiondialog.cpp:1365 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Kopioi uudempi yhdistämisen sijaan (turvatonta)" + +#. +> trunk5 +#: optiondialog.cpp:1368 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"Älä katso sisemmäs, valitse vain uusin tiedosto.\n" +"(Käytä tätä vain, jos tiedät mitä teet!)\n" +"Tällä on vaikutusta vain verrattaessa kahta kansiota." + +#. +> trunk5 +#: optiondialog.cpp:1373 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Varmuuskopioi tiedostot (.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1376 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Jos tiedosto tallennettaisiin vanhemman päälle, vanhan tiedoston\n" +"nimeen lisätään pääte ”.orig” sen sijaan, että se poistettaisiin." + +#. +> trunk5 +#: optiondialog.cpp:1452 optiondialog.cpp:1453 +#, kde-format +msgid "Regional Settings" +msgstr "Maa-asetukset" + +#. +> trunk5 +#: optiondialog.cpp:1467 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Käytä samaa merkkikoodausta kaikille:" + +#. +> trunk5 +#: optiondialog.cpp:1470 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Jos asetettu, mahdollistaa kaikki koodausten vaihtamisen ensimmäistä vaihtamalla.\n" +"Poista käytöstä, jos tiedostot käyttävät eri merkkikoodauksia." + +#. +> trunk5 +#: optiondialog.cpp:1474 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "Huomaa: Paikallinen merkkikoodaus on " + +#. +> trunk5 +#: optiondialog.cpp:1478 +#, kde-format +msgid "File Encoding for A:" +msgstr "A-tiedoston koodaus:" + +#. +> trunk5 +#: optiondialog.cpp:1484 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Jos asetettu, Unicode-koodaukset (UTF-16 ja UTF-8) tunnistetaan.\n" +"Ellei tiedosto ole Unicodea, käytetään varalla valittua merkkikoodausta.\n" +"(Unicode-tunnistus tapahtuu tiedoston ensitavusta.)" + +#. +> trunk5 +#: optiondialog.cpp:1487 optiondialog.cpp:1496 optiondialog.cpp:1505 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Tunnista Unicode automaattisesti" + +#. +> trunk5 +#: optiondialog.cpp:1492 +#, kde-format +msgid "File Encoding for B:" +msgstr "B-tiedoston koodaus:" + +#. +> trunk5 +#: optiondialog.cpp:1501 +#, kde-format +msgid "File Encoding for C:" +msgstr "C-tiedoston koodaus:" + +#. +> trunk5 +#: optiondialog.cpp:1510 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Yhdistämisen tulosteen ja tallennuksen merkkikoodaus:" + +#. +> trunk5 +#: optiondialog.cpp:1514 +#, kde-format +msgid "Auto Select" +msgstr "Valitse automaattisesti" + +#. +> trunk5 +#: optiondialog.cpp:1517 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Jos asetettu, käytetään syötetiedostojen merkkikoodausta.\n" +"Epäselvissä tilanteissa käyttäjää pyydetään asettamaan tallennuksen merkkikoodaus." + +#. +> trunk5 +#: optiondialog.cpp:1520 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Esikäsittelytiedostojen merkkikoodaus:" + +#. +> trunk5 +#: optiondialog.cpp:1531 +#, kde-format +msgid "Right To Left Language" +msgstr "Oikealta vasemmalle -kieli" + +#. +> trunk5 +#: optiondialog.cpp:1534 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Joitakin kieliä luetaan oikealta vasemmalle.\n" +"Tämä asetus asettaa katselimen ja muokkaimen vastaavasti." + +#. +> trunk5 +#: optiondialog.cpp:1544 +#, kde-format +msgid "Integration" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1545 +#, kde-format +msgid "Integration Settings" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1558 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Ohitettavat komentorivivalitsimet:" + +#. +> trunk5 +#: optiondialog.cpp:1563 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Luettelo komentorivivalitsimista, jotka tulisi ohittaa, kun toinen työkalu käyttää KDiff3:a.\n" +"Puolipistein ”;” erotettuna voi antaa useita arvoja.\n" +"Tämä estää ”Tuntematon asetus” -virheen." + +# Eihän siinä koskaan taida Suomessa lukea koko ”Escape” +#. +> trunk5 +#: optiondialog.cpp:1568 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Lopeta myös Esc-näppäimellä" + +#. +> trunk5 +#: optiondialog.cpp:1571 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Nopea lopetustapa.\n" +"Sopii niille, jotka ovat Escin käyttöön tottuneet." + +#. +> trunk5 +#: optiondialog.cpp:1655 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "Alustaa kaikki asetukset (ei vain nykyisen kohdan)." + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Tiedonmenetysvirhe:\n" +"Jos se on toistettavissa, ota yhteys tekijään.\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "Vakava sisäinen virhe" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Esikäsittelykomento: " + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "Seuraavat valitsemasi asetukset voivat muuttaa tietoja:\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Tätä ei todennäköisesti haluta yhdistettäessä.\n" +"Haluatko poistaa nämä käytöstä vai jatkaa samoilla asetuksilla?" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Turvattomat yhdistämisasetukset" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Käytä näitä asetuksia yhdistettäessä" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Poista turvattomat asetukset käytöstä" + +#. +> trunk5 +#: pdiff.cpp:170 +#, kde-format +msgid "Loading A" +msgstr "Ladataan A:ta" + +#. +> trunk5 +#: pdiff.cpp:177 +#, kde-format +msgid "Errors occurred during pre-processing of file A." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:181 +#, kde-format +msgid "Loading B" +msgstr "Ladataan B:tä" + +#. +> trunk5 +#: pdiff.cpp:188 +#, kde-format +msgid "Errors occurred during pre-processing of file B." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Diff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Linediff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:223 +#, kde-format +msgid "Loading C" +msgstr "Ladataan C:tä" + +#. +> trunk5 +#: pdiff.cpp:230 +#, kde-format +msgid "Errors occurred during pre-processing of file C." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Diff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Diff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Linediff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Linediff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:779 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "Kaikissa syötetiedostoissa on sama teksti mutta eroja esiintyy binaarisella tasolla." + +#. +> trunk5 +#: pdiff.cpp:785 pdiff.cpp:789 pdiff.cpp:793 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Tiedostoissa %1 ja %2 on sama teksti mutta eroja esiintyy binaarisella tasolla.\n" + +#. +> trunk5 +#: pdiff.cpp:803 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"Jotkin syötetiedostot eivät vaikuta puhtailta tekstitiedostoilta.\n" +"Huomaa, ettei KDiff3:n yhdistystoimintoa ole tarkoitettu binaaridatalle.\n" +"Jatka omalla vastuullasi." + +# %1 sisältää ”A”, ”B”, ”C” tai jonkin näiden yhdistelmän pilkuin erotettuna. +#. +> trunk5 +#: pdiff.cpp:817 +#, fuzzy, kde-format +#| msgid "" +#| "Some input characters could not be converted to valid unicode.\n" +#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +#| "Don't save the result if unsure. Continue at your own risk.\n" +#| "Affected input files are in %1." +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Joitakin syötemerkkejä ei saatu muunnetuksi kelvolliseksi Unicodeksi.\n" +"Käytät ehkä väärää merkistöä (esim. UTF-8:aa ei-UTF-8-tiedostolle).\n" +"Älä tallenna tulosta, ellet ole varma. Jatka omalla vastuullasi.\n" +"Viesti koskee tiedostoja kohteessa %1." + +#. +> trunk5 +#: pdiff.cpp:1035 +#, kde-format +msgid "Abort" +msgstr "Keskeytä" + +#. +> trunk5 +#: pdiff.cpp:1041 pdiff.cpp:1129 +#, kde-format +msgid "Opening files..." +msgstr "Avataan tiedostoja…" + +#. +> trunk5 +#: pdiff.cpp:1106 pdiff.cpp:1177 +#, kde-format +msgid "File open error" +msgstr "Tiedoston avausvirhe" + +#. +> trunk5 +#: pdiff.cpp:1216 +#, kde-format +msgid "Cutting selection..." +msgstr "Leikataan valintaa…" + +#. +> trunk5 +#: pdiff.cpp:1237 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Kopioidaan valintaa leikepöydälle…" + +#. +> trunk5 +#: pdiff.cpp:1253 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Liitetään leikepöydän sisältöä…" + +#. +> trunk5 +#: pdiff.cpp:1715 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1716 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1927 +#, kde-format +msgid "Save && Continue" +msgstr "Tallenna ja jatka" + +#. +> trunk5 +#: pdiff.cpp:1928 +#, kde-format +msgid "Continue Without Saving" +msgstr "Jatka tallentamatta" + +#. +> trunk5 +#: pdiff.cpp:2140 +#, kde-format +msgid "Search complete." +msgstr "Haku valmis." + +#. +> trunk5 +#: pdiff.cpp:2140 +#, kde-format +msgid "Search Complete" +msgstr "Haku valmis" + +#. +> trunk5 +#: pdiff.cpp:2407 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Mitään ei ole valittu kummassakaan diff-syöteikkunassa." + +#. +> trunk5 +#: pdiff.cpp:2407 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Virhe lisättäessä käsin diff-aluetta" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "&Peru" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (perusta):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "Tiedosto…" + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Kansio…" + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (valinnainen):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "Vaihda/kopioi nimet…" + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Vaihda %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Kopioi %1–>tuloste" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Vaihda %1<->tuloste" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Tuloste (valinnainen):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Asetukset…" + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, fuzzy, kde-format +#| msgid "Directory" +msgid "Open Directory" +msgstr "Kansio" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format +msgid "Select Output File" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Etsi tekstiä:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Erota pien- ja suuraakkoset" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Etsi A:sta" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Etsi B:stä" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Etsi C:stä" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Etsi tulosteesta" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Etsi" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Säännöllisen lausekkeen testaus" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Automaattiyhdistämisen esimerkkirivi:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "Kokeillaksesi automaattiyhdistämistä kopioi rivi niin kuin se esiintyy tiedostoissasi." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Haun tulos:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Esimerkkihistorian aloitusrivi (edeltävällä kommentilla):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Kopioi historian aloitusrivi niin kuin se esiintyy tiedostoissasi\n" +"edeltävä kommentti mukaan lukien." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Historian lajittelujärjestys:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "Historiatietueen aloitusrivin esimerkki (ilman alkukommenttia):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Kopioi tiedostoissasi käytetty historiatietueen aloitusrivi\n" +"mutta ilman alun kommenttia." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Haku onnistui." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Haku epäonnistui." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Säännöllisen lausekkeen alkavien ja päättävien sulkujen määrä ei täsmää." + +#~ msgid "&Merge" +#~ msgstr "&Yhdistä" + +#~ msgid "Line" +#~ msgstr "Rivi" + +#~ msgid "Directory Comparison Status" +#~ msgstr "Kansiovertailun tila" + +#~ msgid "Number of subdirectories:" +#~ msgstr "Alikansioiden määrä:" + +#~ msgid "Number of different files:" +#~ msgstr "Eroavien tiedostojen määrä:" + +#~ msgid "Cancel" +#~ msgstr "Peru" + +#~ msgid "Help" +#~ msgstr "Ohje" + +#~ msgid "Defaults" +#~ msgstr "Oletukset" + +#~ msgid "&Edit" +#~ msgstr "&Muokkaa" + +#~ msgid "&Settings" +#~ msgstr "&Asetukset" + +#~ msgid "&Help" +#~ msgstr "&Ohje" + +#~ msgid "&About" +#~ msgstr "&Tietoa" + +#~ msgid "A&uthor" +#~ msgstr "Teki&jä" + +#~ msgid "&Thanks To" +#~ msgstr "K&iitokset" + +#~ msgid "Open" +#~ msgstr "Avaa" + +#~ msgid "Save" +#~ msgstr "Tallenna" + +#~ msgid "Print..." +#~ msgstr "Tulosta…" + +#~ msgid "Quit" +#~ msgstr "Lopeta" + +#~ msgid "Cut" +#~ msgstr "Leikkaa" + +#~ msgid "Copy" +#~ msgstr "Kopioi" + +#~ msgid "Paste" +#~ msgstr "Liitä" + +#~ msgid "Select All" +#~ msgstr "Valitse kaikki" + +#~ msgid "Show Toolbar" +#~ msgstr "Näytä työkalurivi" + +#~ msgid "Show &Status Bar" +#~ msgstr "Näytä &tilarivi" + +# *** TARKISTA: Voiko tähän saada %1:stä genetiivin, jolloin voisi olla ”%1 asetukset”? +#~ msgid "&Configure %1..." +#~ msgstr "&Asetukset: %1…" + +#~ msgid "About" +#~ msgstr "Tietoa" + +#~ msgid "Find" +#~ msgstr "Etsi" + +#~ msgid "Find Next" +#~ msgstr "Etsi seuraava" + +#~ msgid "For more documentation, see the help-menu or the subdirectory doc." +#~ msgstr "Lisätietoa saa Ohje-valikosta tai alikansiosta doc." + +#~ msgid "KDiff3-Usage" +#~ msgstr "Kdiff3:n käyttö" + +#~ msgid "Ignore" +#~ msgstr "Jätä huomiotta" + +#~ msgid "Exit" +#~ msgstr "Lopeta" + +#~ msgid "Continue" +#~ msgstr "Jatka" + +#~ msgid "Total number of conflicts: " +#~ msgstr "Ristiriitoja kaikkiaan: " + +#~ msgid "" +#~ "\n" +#~ "Nr of automatically solved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Automaattisesti ratkaistuja ristiriitoja: " + +#~ msgid "" +#~ "\n" +#~ "Nr of unsolved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Ratkaisemattomia ristiriitoja: " + +#~ msgid "Ignore numbers" +#~ msgstr "Ohita numerot" + +#~ msgid "Ignore C/C++ comments" +#~ msgstr "Ohita C:n/C++:n kommentit" + +#~ msgid "Ignore case" +#~ msgstr "Älä erota pien- ja suuraakkosia" + +#~ msgid "Language (restart required)" +#~ msgstr "Kieli (vaatii uudelleenkäynnistyksen)" + +#~ msgid "" +#~ "Choose the language of the GUI strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "Valitse käyttöliittymän kieli tai ”automaattinen”.\n" +#~ "Vaihtaaksesi kieltä lopeta KDiff3 ja käynnistä se uudelleen." + +# pmap: =/gen=kdiff3:n/ +# pmap: =/elat=kdiff3:sta/ +#~ msgid "kdiff3" +#~ msgstr "kdiff3" + +#~ msgid "&OK" +#~ msgstr "&OK" + +#~ msgid "OK" +#~ msgstr "OK" + +#, fuzzy +#~| msgid "(c) 2002-2011 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "© 2002–2011 Joachim Eibl" + +#~ 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äin ei koskaan pitäisi käydä:\n" +#~ "\n" +#~ "mergeResultSaved: m_pMFI=0\n" +#~ "\n" +#~ "Jos tiedät miten toistaa tämä, ota yhteys ohjelman tekijään." + +#~ msgid "Program Error" +#~ msgstr "Ohjelmavirhe" + +#~ msgid "Error." +#~ msgstr "Virhe." + +#~ msgid "Select Font" +#~ msgstr "Valitse fontti" + +#~ 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 "" +#~ "Valitsit vaihtuvalevyisen fontin.\n" +#~ "\n" +#~ "Koska ohjelma ei osaa käyttää vaihtuvalevyisiä fontteja\n" +#~ "oikein, voit törmätä ongelmiin muokkauksessa.\n" +#~ "\n" +#~ "Haluatko jatkaa vai vaihtaa fonttia?" + +#~ msgid "Incompatible font." +#~ msgstr "Yhteensopimaton fontti." + +#~ msgid "Continue at my own risk" +#~ msgstr "Jatkan omalla vastuullani" + +#~ msgid "Select another font" +#~ msgstr "Valitse toinen fontti" + +#~ msgid "Eike Sauer" +#~ msgstr "Eike Sauer" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "Virheenkorjaukset, Debian-paketin ylläpitäjä" + +#~ msgid "Sebastien Fricker" +#~ msgstr "Sebastien Fricker" + +#~ msgid "Windows installer" +#~ msgstr "Windows-asennusohjelma" + +#~ msgid "Stephan Binner" +#~ msgstr "Stephan Binner" + +#~ msgid "i18n-help" +#~ msgstr "i18n-ohje" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "Stefan Partheymueller" + +#~ msgid "Clipboard-patch" +#~ msgstr "Leikepöytäpaikkaus" + +#~ msgid "David Faure" +#~ msgstr "David Faure" + +#~ msgid "KIO-Help" +#~ msgstr "KIO-ohje" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "Bernd Gehrmann" + +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Cervisian CvsIgnoreList-luokka" + +#~ msgid "Andre Woebbeking" +#~ msgstr "Andre Woebbeking" + +#~ msgid "Class StringMatcher" +#~ msgstr "StringMatcher-luokka" + +#~ msgid "Michael Denio" +#~ msgstr "Michael Denio" + +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "Kansion yhtenevyysvärityksen korjaus" + +#~ msgid "Manfred Koehler" +#~ msgstr "Manfred Koehler" + +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Korjaus hitaaseen käynnistykseen Windowsissa" + +#~ msgid "Sergey Zorin" +#~ msgstr "Sergey Zorin" + +#~ msgid "Diff Ext for Windows" +#~ msgstr "Diff-laajennus Windowsiin" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#~ msgid "GNU-Diffutils" +#~ msgstr "GNU Diffutils" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "Tino Boellsterling, Timothy Mee" + +#~ msgid "Intensive test, use and feedback" +#~ msgstr "Intensiivinen testaus, käyttö ja palaute" + +#~ msgid "Michael Schmidt" +#~ msgstr "Michael Schmidt" + +#~ msgid "Mac support" +#~ msgstr "Mac-tuki" + +#~ msgid "Valentin Rusu" +#~ msgstr "Valentin Rusu" + +#~ msgid "KDE4 porting" +#~ msgstr "KDE 4 -siirros" + +#~ msgid "Albert Astals Cid" +#~ msgstr "Albert Astals Cid" + +#~ msgid "Silvan Scherrer" +#~ msgstr "Silvan Scherrer" + +#~ msgid "OS2 port" +#~ msgstr "OS/2-siirros" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "+ Monet kiitokset kaikille virheitä raportoineille ja ohjelmaa ideoineille!" + +#~ msgid "Italic font for deltas" +#~ msgstr "Kursiivifontti muutoksille" + +#~ msgid "" +#~ "Selects the italic version of the font for differences.\n" +#~ "If the font doesn't support italic characters, then this does nothing." +#~ msgstr "" +#~ "Valitsee fontin kursiivimuodon eroavuuksille.\n" +#~ "Ellei fontilla ole kursiivia, ei tehdä mitään." + +#~ msgid "Incompatible Font" +#~ msgstr "Yhteensopimaton fontti" + +#~ msgid "Continue at Own Risk" +#~ msgstr "Jatka omalla vastuullasi" + +#~ msgid "Select Another Font" +#~ msgstr "Valitse toinen fontti" Index: trunk/l10n-support/fi/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/fi/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/fi/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,124 @@ +# Copyright © 2012 This_file_is_part_of_KDE +# This file is distributed under the same license as the kdiff3 package. +# Tommi Nieminen , 2012. +# Lasse Liehu , 2013, 2014. +# +# KDE Finnish translation sprint participants: +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2014-11-08 04:12+0200\n" +"Last-Translator: Lasse Liehu \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-POT-Import-Date: 2012-12-01 22:21:45+0000\n" +"X-Generator: Lokalize 1.5\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, fuzzy, kde-format +#| msgid "KDiff3 ..." +msgid "KDiff3..." +msgstr "KDiff3…" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Vertaa tiedostoon %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Yhdistä tiedostoon %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Tallenna ”%1” tuonnemmaksi" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "Kolmivaiheinen yhdistäminen pohjaan" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, fuzzy, kde-format +#| msgid "Compare with ..." +msgid "Compare with..." +msgstr "Vertaa tiedostoon…" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Tyhjennä luettelo" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Vertaa" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "Kolmivaiheinen vertailu" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, fuzzy, kde-format +#| msgid "About KDiff3 menu plugin ..." +msgid "About KDiff3 menu plugin..." +msgstr "Tietoa KDiff3-valikkoliitännäisestä…" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Tiedostojen KDiff3-toimintoliitännäinen: Copyright © 2011 Joachim Eibl\n" +"KDiff3-kotisivu: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, fuzzy, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Kontekstivalikkolaajennuksen käyttö:\n" +"Verrataksesi yksinkertaisesti kahta valittua tiedostoa valitse ”Vertaa”.\n" +"Jos toinen tiedosto on muualla, ”Tallenna” ensimmäinen tiedosto tuonnemmaksi, jolloin se näkyy ”Vertaa tiedostoon…”-alivalikossa. Valitse sitten toiselle tiedostolle ”Vertaa tiedostoon”.\n" +"Kolmivaiheisessa yhdistämisessä ”Tallenna” ensin pohjatiedosto ja yhdistettävä haara. Sitten valitse ”Kolmivaiheinen yhdistäminen pohjaan” kohteena käytettävässä toisessa haarassa.\n" +"Sama pätee myös kansioiden vertailuun ja yhdistämiseen." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "Tietoa tiedostojen KDiff3-toimintoliitännäisestä" Index: trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4221 +0,0 @@ -# KDE Finnish translation sprint participants: -# Author: Artnay -# Author: Lliehu -# Author: Niklas Laxström -# Tommi Nieminen , 2012, 2013, 2015, 2016. -# Lasse Liehu , 2012, 2013, 2014, 2016. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-01 10:31+0200\n" -"PO-Revision-Date: 2016-03-05 20:27+0200\n" -"Last-Translator: Tommi Nieminen \n" -"Language-Team: Finnish \n" -"Language: fi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2012-12-01 22:21:44+0000\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Tommi Nieminen" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "translator@legisign.org" - -#. +> trunk5 -#: diff.cpp:259 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "Leikepöydän tietojen kirjoitus väliaikaistiedostoon epäonnistui." - -#. +> trunk5 -#: diff.cpp:263 -#, kde-format -msgid "From Clipboard" -msgstr "Leikepöydältä" - -#. +> trunk5 -#: diff.cpp:564 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Odotettiin välilyöntiä sulkevan puolilainausmerkin jälkeen." - -#. +> trunk5 -#: diff.cpp:567 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Puolilainausmerkkien määrä ei täsmää." - -#. +> trunk5 -#: diff.cpp:589 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Odottamaton puolilainausmerkki parametrin sisällä." - -#. +> trunk5 -#: diff.cpp:596 -#, kde-format -msgid "No program specified." -msgstr "Ohjelmaa ei määritetty." - -#. +> trunk5 -#: diff.cpp:711 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Esikäsittely saattoi epäonnistui. Tarkista tämä komento:\n" -"\n" -" %1\n" -"\n" -"Esikäsittelykomento poistetaan nyt käytöstä." - -#. +> trunk5 -#: diff.cpp:758 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Rivinsovitusesikäsittely saattoi epäonnistui. Tarkista tämä komento:\n" -"\n" -" %1\n" -"Rivinsovitusesikäsittelykomento poistetaan nyt käytöstä." - -#. +> trunk5 -#: diff.cpp:785 -#, kde-format -msgid "File %1 too large to process. Skipping." -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line %2" -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, fuzzy, kde-format -#| msgid "Line not available" -msgid "File %1: Line not available" -msgstr "Rivi ei saatavilla" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, kde-format -msgid "Encoding:" -msgstr "Koodaus:" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3377 optiondialog.cpp:921 -#, kde-format -msgid "Line end style:" -msgstr "Rivinlopetustapa:" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, fuzzy, kde-format -#| msgid "Encoding:" -msgid "Encoding: %1" -msgstr "Koodaus:" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3422 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3423 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, fuzzy, kde-format -#| msgid "Line end style:" -msgid "Line end style: %1" -msgstr "Rivinlopetustapa:" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:871 -#, kde-format -msgid "Top line" -msgstr "Ylin rivi" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, kde-format -msgid "End" -msgstr "Loppu" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, fuzzy, kde-format -#| msgid "Opening files..." -msgid "Open File" -msgstr "Avataan tiedostoja…" - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8-bittinen" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, kde-format -msgid "Other" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "Ratkaisematon" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "Ratkaistu" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "Ei-tyhje" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "Tyhje" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "Kopioi A B:hen" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "Kopioi B A:hen" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "Poista A" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "Poista B" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Poista A ja B" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "Yhdistä A:han" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "Yhdistä B:hen" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Yhdistä A:han ja B:hen" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "Poista (jos olemassa)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1019 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Yhdistä" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Yhdistä (käsin)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Virhe: Tiedostotyypit ristiriidassa-" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Virhe: Muuttunut ja poistettu" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Virhe: Päiväykset yhtenevät mutta tiedostot eivät." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgid "Done." -msgid "Done" -msgstr "Valmis." - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "Virhe" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Ohitettu." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Ei tallennettu." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "Käynnissä…" - -# *** TARKISTA: Kun tietäisi kontekstin, olisi helpompi keksiä käännös! -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "Tehtäviä." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "Nimi" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "Toiminto" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "Tila" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Sekoitus linkkejä ja tavallisia tiedostoja." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Linkki: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Koko: " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Päiväys ja koko: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Väliaikaiskopion luominen tiedostosta %1 epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Tiedoston %1 avaus epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Verrataan tiedostoa…" - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Virhe luettaessa tiedostoa %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "Kansioita yhdistetään paraikaa. Haluatko varmasti keskeyttää yhdistämisen ja tutkia kansion uudelleen?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:695 kdiff3.cpp:705 kdiff3.cpp:717 -#: mergeresultwindow.cpp:341 pdiff.cpp:1034 pdiff.cpp:1926 pdiff.cpp:1936 -#, kde-format -msgid "Warning" -msgstr "Varoitus" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "Tutki uudelleen" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1036 -#, kde-format -msgid "Continue Merging" -msgstr "Jatka yhdistämistä" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Kansioiden avaus epäonnistui:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "A-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "B-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "C-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Kansion avausvirhe" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"Kohdekansio ei saa olla sama kuin A tai B, kun kolmea kansiota yhdistetään.\n" -"Tarkista vielä ennen kuin jatkat." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Parametrivaroitus" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Tutkitaan kansioita…" - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Luetaan A-kansiota" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Luetaan B-kansiota" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Luetaan C-kansiota" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Jotkin alikansiot eivät ole luettavissa kansiossa" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Tarkista alikansioiden oikeudet." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:663 kdiff3.cpp:750 kdiff3.cpp:774 -#: kdiff3.cpp:1063 kdiff3.cpp:1084 pdiff.cpp:1115 pdiff.cpp:1187 -#: pdiff.cpp:1232 pdiff.cpp:1248 pdiff.cpp:1291 pdiff.cpp:1314 -#, kde-format -msgid "Ready." -msgstr "Valmis." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of equal files:" -msgid "Number of manual merges: %1" -msgstr "Yhtenevien tiedostojen määrä:" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "Tämä vaikuttaa kaikkiin yhdistämistoimintoihin." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Muutetaan kaikkia yhdistämistoimintoja" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgid "Processing " -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "Käsitellään: " - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Tämä toiminto ei ole nyt mahdollinen." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "Toiminto ei mahdollinen" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "Kopioitaessa sattui virhe.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "Yhdistämisvirhe" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Tuntematon yhdistämistoiminto. (Näin ei koskaan pitäisi käydä!)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "Tuntematon yhdistämistoiminto." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" -"Yhdistäminen on alkamassa.\n" -"\n" -"Valitse ”Toteuta”, jos olet lukenut ohjeet ja tiedät, mitä teet.\n" -"”Simuloi” näyttää sinulle, mitä tulee tapahtumaan.\n" -"\n" -"Huomaa, että ohjelma on yhä beetavaiheessa eikä MINKÄÄNLAISTA TAKUUTA anneta! Tee varmuuskopiot tärkeistä tiedoistasi!" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "Aloitetaan yhdistäminen" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "Toteuta" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "Simuloi" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "Korostettu kohde on eri tyyppiä eri kansioissa. Valitse, mitä tehdään." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "Tiedostojen muutospäivämäärät ovat samat mutta tiedostot eivät. Valitse, mitä tehdään." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "Korostettua kohdetta on muutettu toisessa kansiossa ja se on poistettu toisesta. Valitse, mitä tehdään." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "Tämä toiminto ei juuri nyt ole mahdollinen, koska kansioita yhdistetään paraikaa." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" -"Viime vaiheessa sattui virhe.\n" -"Haluatko jatkaa kohteesta, joka aiheutti virheen, vai ohittaa tämän kohteen?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "Jatka yhdistämistä virheen jälkeen" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "Jatka viimeisimmästä kohteesta" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "Ohita kohde" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "Yhdistämistoiminto valmis." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "Yhdistäminen valmis" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Simuloitu yhdistäminen valmis: Tarkista, että olet samaa mieltä ehdotettujen toimintojen kanssa." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "Sattui virhe. Näet lisätietoja, kun painat OK.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Virhe: Poistettaessa kohdetta %1: Varmuuskopion luonti epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "poista kansio alikansioineen (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "poista (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Virhe: kansionpoistotoimenpide epäonnistui yritettäessä lukea kansiota." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Virhe: rmdir-toimenpide (%1) epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Virhe: poistotoimenpide epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "yhdistäminen itse (%1, %2, %3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Huomaa: Itse tehdyn yhdistämisen jälkeen käyttäjän tulisi jatkaa painamalla F7." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Virhe: kopiointi %1 -> %2 epäonnistui. Olemassa olevaa kohdetta ei voida poistaa." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "kopioi linkki %1 -> %2" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Virhe: linkin kopiointi epäonnistui. Etälinkkejä ei vielä tueta." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Virhe: linkin kopiointi epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "kopioi %1 -> %2" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Virhe muutettaessa nimeä %1 -> %2: Olemassa olevaa kohdetta ei voida poistaa." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "muuta nimeä %1 -> %2" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "Virhe: Nimen muuttaminen epäonnistui." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Virhe komennossa luotaessa kansiota %1. Olemassa olevaa tiedostoa ei voida poistaa." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "makeDir( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "Virhe luotaessa kansiota." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "Kohde" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "Kansio" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "Tyyppi" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "Koko" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "Määr" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "Viim. muutos" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "Linkin kohde" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "Tiedosto" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "ei saatavilla" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (kohde): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (perusta): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (kohde): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (kohde): " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "Kohde: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Tallenna kansioiden yhdistämisen tila nimellä…" - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Aloita kansioiden yhdistäminen tai jatka sitä" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Käynnistä toimenpide nykyiselle tietueelle" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "Vertaa valittua tiedostoa" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "Yhdistä nykyinen tiedosto" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Yhdistä\n" -"tiedosto" - -# *** TARKISTA: Vai onko ympäristö sellainen, että jokin *toimenpide* voi kohdistua alikansioihinkin? -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Piilota alikansiot" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Näytä alikansiot" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "Valitse A kaikkiin kohteisiin" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "Valitse B kaikkiin kohteisiin" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "Valitse C kaikkiin kohteisiin" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Valitse toiminto automaattisesti kaikkiin kohteisiin" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "Ei toimintoa kaikkiin kohteisiin" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "Näytä identtiset tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"Identtiset\n" -"tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "Näytä eroavat tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "Näytä vain A:ssa olevat tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"Tiedostot\n" -"vain A:ssa" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "Näytä vain B:ssä olevat tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"Tiedostot\n" -"vain B:ssä" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "Näytä vain C:ssä olevat tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"Tiedostot\n" -"vain C:ssä" - -# Mahdoton sanoa, verrataanko vai valitaanko eksplisiittisesti :/ -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Vertaa eksplisiittisesti valittuja tiedostoja" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Yhdistä eksplisiittisesti valitut tiedostot" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "Älä tee mitään" - -#. +> trunk5 -#: directorymergewindow.cpp:3660 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: directorymergewindow.cpp:3661 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: directorymergewindow.cpp:3662 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "Poista A ja B" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "Yhdistä A:han ja B:hen" - -#. +> trunk5 -#: fileaccess.cpp:917 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"Yritettäessä tehdä varmuuskopiota vanhemman varmuuskopion poisto epäonnistui.\n" -"Tiedostonimi: " - -#. +> trunk5 -#: fileaccess.cpp:924 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"Yritettäessä tehdä varmuuskopiota nimen muuttaminen epäonnistui.\n" -"Tiedostonimet: " - -#. +> trunk5 -#: fileaccess.cpp:948 -#, kde-format -msgid "Getting file status: %1" -msgstr "Noudetaan tiedoston tilaa: %1" - -#. +> trunk5 -#: fileaccess.cpp:990 -#, kde-format -msgid "Reading file: %1" -msgstr "Luetaan tiedostoa: %1" - -#. +> trunk5 -#: fileaccess.cpp:1028 -#, kde-format -msgid "Writing file: %1" -msgstr "Kirjoitetaan tiedostoa: %1" - -#. +> trunk5 -#: fileaccess.cpp:1061 -#, kde-format -msgid "Out of memory" -msgstr "Muisti lopussa" - -#. +> trunk5 -#: fileaccess.cpp:1096 -#, kde-format -msgid "Making directory: %1" -msgstr "Tehdään kansiota: %1" - -#. +> trunk5 -#: fileaccess.cpp:1116 -#, kde-format -msgid "Removing directory: %1" -msgstr "Poistetaan kansiota: %1" - -#. +> trunk5 -#: fileaccess.cpp:1131 -#, kde-format -msgid "Removing file: %1" -msgstr "Poistetaan tiedostoa: %1" - -#. +> trunk5 -#: fileaccess.cpp:1147 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Luodaan symbolista linkkiä: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1175 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Muutetaan tiedoston nimeä: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1207 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Kopioidaan tiedostoa: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1221 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Virhe tiedostoa kopioitaessa: Tiedoston avaus luettavaksi epäonnistui. Tiedostonimi: %1" - -#. +> trunk5 -#: fileaccess.cpp:1227 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Virhe tiedostoa kopioitaessa: Tiedoston avaus kirjoitettavaksi epäonnistui. Tiedostonimi: %1" - -#. +> trunk5 -#: fileaccess.cpp:1239 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Virhe tiedostoa kopioitaessa: luku epäonnistui. Tiedostonimi: %1" - -#. +> trunk5 -#: fileaccess.cpp:1248 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Virhe tiedostoa kopioitaessa: kirjoitus epäonnistui. Tiedostonimi: %1" - -#. +> trunk5 -#: fileaccess.cpp:1531 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "Luetaan kansiota: " - -#. +> trunk5 -#: fileaccess.cpp:1652 -#, kde-format -msgid "Listing directory: %1" -msgstr "Luetellaan kansiota: %1" - -#. +> trunk5 -#: kdiff3.cpp:178 -#, kde-format -msgid "Current Configuration:" -msgstr "Nykyiset asetukset:" - -#. +> trunk5 -#: kdiff3.cpp:183 -#, kde-format -msgid "Config Option Error:" -msgstr "Asetusvirhe:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:229 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "--auto-valitsinta käytetty antamatta tulostiedostoa." - -#. +> trunk5 -#: kdiff3.cpp:406 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "--auto-valitsin ohitettu kansiovertailussa." - -#. +> trunk5 -#: kdiff3.cpp:453 -#, kde-format -msgid "Saving failed." -msgstr "Tallennus epäonnistui." - -#. +> trunk5 -#: kdiff3.cpp:488 pdiff.cpp:1097 pdiff.cpp:1168 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Näiden tiedostojen avaus epäonnistui:" - -#. +> trunk5 -#: kdiff3.cpp:497 -#, kde-format -msgid "File Open Error" -msgstr "Tiedoston avausvirhe" - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Avaa tiedostot vertailtavaksi…" - -#. +> trunk5 -#: kdiff3.cpp:527 -#, kde-format -msgid "Reload" -msgstr "Lataa uudelleen" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Tallentaa yhdistämisen tuloksen. Kaikki ristiriidat on ratkaistava!" - -#. +> trunk5 -#: kdiff3.cpp:532 -#, kde-format -msgid "Saves the current document as..." -msgstr "Tallentaa nykyisen tiedoston toisella nimellä" - -#. +> trunk5 -#: kdiff3.cpp:535 -#, kde-format -msgid "Print the differences" -msgstr "Tulostaa erot" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Quits the application" -msgstr "Lopettaa ohjelman" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Leikkaa valitun alueen ja vie sen leikepöydälle" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Kopioi valitun alueen leikepöydälle" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Liittää leikepöydän sisällön nykyiseen sijaintiin" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Select everything in current window" -msgstr "Valitsee kaiken nykyisestä ikkunasta" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search for a string" -msgstr "Etsi merkkijonoa" - -#. +> trunk5 -#: kdiff3.cpp:550 -#, kde-format -msgid "Search again for the string" -msgstr "Etsi merkkijonoa uudelleen" - -#. +> trunk5 -#: kdiff3.cpp:555 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Näyttää tai piilottaa tilarivin" - -#. +> trunk5 -#: kdiff3.cpp:559 -#, kde-format -msgid "Configure KDiff3..." -msgstr "KDiff3:n asetukset…" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to Current Delta" -msgstr "Siirry nykyiseen muutokseen" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Nykyinen\n" -"muutos" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to First Delta" -msgstr "Siirry ensimmäiseen muutokseen" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"Ensimmäinen\n" -"muutos" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "Go to Last Delta" -msgstr "Siirry viimeiseen muutokseen" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Viimeisin\n" -"delta" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Ohittaa tyhjemerkkierot, kun ”Näytä tyhjemerkit” on poissa käytöstä.)" - -#. +> trunk5 -#: kdiff3.cpp:586 -#, kde-format -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Ei ohita tyhjemerkkieroja silloinkaan, kun ”Näytä tyhjemerkit” on poissa käytöstä.)" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Siirry edelliseen muutokseen" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Edellinen\n" -"muutos" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Next Delta" -msgstr "Siirry seuraavaan muutokseen" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Seuraava\n" -"muutos" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Siirry edelliseen ristiriitaan" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Edellinen\n" -"ristiriita" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Siirry seuraavaan ristiriitaan" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Seuraava\n" -"ristiriita" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Siirry edelliseen ratkaisemattomaan ristiriitaan" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Edellinen\n" -"ratkaisematon" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Siirry seuraavaan ratkaisemattomaan ristiriitaan" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Seuraava\n" -"ratkaisematon" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Valitse rivejä A:sta" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Valitse\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Valitse rivejä B:stä" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Valitse\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:601 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Valitse rivejä C:stä" - -#. +> trunk5 -#: kdiff3.cpp:601 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Valitse\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Siirry automaattisesti seuraavaan ratkaisemattomaan ristiriitaan lähteen valinnan jälkeen" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Autom.\n" -"seuraava" - -#. +> trunk5 -#: kdiff3.cpp:604 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "Näytä eroissa tyhjemerkit" - -#. +> trunk5 -#: kdiff3.cpp:604 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show White Space" -msgstr "Näytä tyhjemerkit" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Show Line Numbers" -msgstr "Näytä rivinumerot" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Rivi-\n" -"numerot" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Valitse A kaikkialla" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Valitse B kaikkialla" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Valitse C kaikkialla" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Valitse A kaikissa ratkaisemattomissa ristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Valitse B kaikissa ratkaisemattomissa ristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Valitse C kaikissa ratkaisemattomissa ristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Valitse A kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Valitse B kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Valitse C kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Ratkaise yksinkertaiset ristiriidat automaattisesti" - -# *** TARKISTA: Hmmh -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Aseta ristiriidat muutoksiksi" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Suorita sääntölausekkeinen automaattiyhdistäminen" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Ratkaisu historiaristiriidat automaattisesti" - -#. +> trunk5 -#: kdiff3.cpp:621 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Jaa diff valinnan kohdalta" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Yhdistä valitut diffit" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window A" -msgstr "Näytä A-ikkuna" - -#. +> trunk5 -#: kdiff3.cpp:625 -#, kde-format -msgid "Show Window B" -msgstr "Näytä B-ikkuna" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Show Window C" -msgstr "Näytä C-ikkuna" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "Normal Overview" -msgstr "Tavallinen yhteenveto" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "A vs. B Overview" -msgstr "A–B-erojen yhteenveto" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "A vs. C Overview" -msgstr "A–C-erojen yhteenveto" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "B vs. C Overview" -msgstr "B–C-erojen yhteenveto" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Rivitä vertailuikkunat" - -#. +> trunk5 -#: kdiff3.cpp:633 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Lisää oma vertailutasauskohta" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Tyhjennä kaikki omat vertailutasauskohdat" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Focus Next Window" -msgstr "Kohdista seuraavaan ikkunaan" - -#. +> trunk5 -#: kdiff3.cpp:637 -#, kde-format -msgid "Focus Prev Window" -msgstr "Kohdista edellinen ikkuna" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Vaihda jaon suuntaa" - -# *** TARKISTA: Tässä oletettu (split (dir + text) view), mutta voi olla myös ((dir) + (split text) view) -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Jaettu kansio- ja tekstinäkymä" - -#. +> trunk5 -#: kdiff3.cpp:642 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Vaihda kansio- ja tekstinäkymien välillä" - -#. +> trunk5 -#: kdiff3.cpp:694 pdiff.cpp:1925 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "Yhdistämisen tulosta ei ole vielä tallennettu" - -#. +> trunk5 -#: kdiff3.cpp:696 -#, kde-format -msgid "Save && Quit" -msgstr "Tallenna ja lopeta" - -#. +> trunk5 -#: kdiff3.cpp:697 -#, kde-format -msgid "Quit Without Saving" -msgstr "Lopeta tallentamatta" - -#. +> trunk5 -#: kdiff3.cpp:705 pdiff.cpp:1936 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Yhdistämisen tulosten tallennus epäonnistui." - -#. +> trunk5 -#: kdiff3.cpp:716 pdiff.cpp:1033 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Olet tekemässä kansioiden yhdistämistä. Oletko varma vai haluatko keskeyttää?" - -#. +> trunk5 -#: kdiff3.cpp:739 -#, kde-format -msgid "Saving file..." -msgstr "Tallennetaan tiedostoa…" - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Tallennetaan tiedostoa uudella nimellä…" - -#. +> trunk5 -#: kdiff3.cpp:758 -#, kde-format -msgid "Save As..." -msgstr "Tallenna nimellä…" - -#. +> trunk5 -#: kdiff3.cpp:817 -#, kde-format -msgid "Printing not implemented." -msgstr "Tulostusta ei ole toteutettu." - -#. +> trunk5 -#: kdiff3.cpp:855 -#, kde-format -msgid "Printing..." -msgstr "Tulostetaan…" - -#. +> trunk5 -#: kdiff3.cpp:941 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:998 -#, fuzzy, kde-format -#| msgid "Selection" -msgid " (Selection)" -msgstr "Valinta" - -#. +> trunk5 -#: kdiff3.cpp:1025 -#, kde-format -msgid "Printing completed." -msgstr "Tulostus valmis." - -#. +> trunk5 -#: kdiff3.cpp:1029 -#, kde-format -msgid "Printing aborted." -msgstr "Tulostus keskeytettiin." - -#. +> trunk5 -#: kdiff3.cpp:1036 -#, kde-format -msgid "Exiting..." -msgstr "Lopetetaan…" - -#. +> trunk5 -#: kdiff3.cpp:1047 -#, kde-format -msgid "Toggling toolbar..." -msgstr "Näytetään tai piilotetaan työkaluriviä…" - -#. +> trunk5 -#: kdiff3.cpp:1068 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "Näytetään tai piilotetaan tilariviä…" - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "Vertailtavia tiedostoja ei löytynyt." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "KDiff3:n asetukset" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:112 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"KDiff3-osaa ei saatu alustetuksi.\n" -"Näin käy yleensä asennusvirheen takia. Lisätietoja saat lukemalla lähdepaketin README-tiedoston." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "&Tiedosto" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "&Kansio" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Nykyisen tietueen yhdistystoimenpide" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Nykyisen tietueen synkronointitoimenpide" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" -msgid "M&ovement" -msgstr "&Siirtyminen" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "&Diff-näkymä" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" -msgid "M&erge" -msgstr "Yhdistä" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "&Ikkuna" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Päätyökalurivi" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Ohitettu. (Käyttäjän määritys.)" - -#. +> trunk5 -#: main.cpp:118 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Työkalu tiedostojen ja kansioiden vertailemiseksi ja yhdistämiseksi" - -#. +> trunk5 -#: main.cpp:119 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:138 -#, kde-format -msgid "Merge the input." -msgstr "Yhdistä tulos." - -#. +> trunk5 -#: main.cpp:139 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Eksplisiittinen pohjatiedosto. Yhteensopivuussyistä tiettyjen työkalujen kanssa." - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Tulostiedosto taas. (Yhteensopivuussyistä tiettyjen työkalujen kanssa.)" - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "Ei käyttöliittymää, jos kaikki ristiriidat voi ratkaista automaattisesti. (Vaatii -o tiedosto)" - -#. +> trunk5 -#: main.cpp:143 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Do not solve conflicts automatically." -msgstr "Älä ratkaise ristiriitoja automaattisesti. (Yhteensopivuussyistä.)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "" - -#. +> trunk5 -#: main.cpp:145 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "" - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "" - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Ohita yksittäinen asetus. Käytä kerran kullekin asetukselle. Esim. --cs \"AutoAdvance=1\"" - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "Näyttää nykyisten asetusten ja arvojen luettelon." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "Use a different config file." -msgstr "Käytä toista asetustiedostoa." - -#. +> trunk5 -#: main.cpp:153 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "avattava tiedosto1 (pohja, ellei annettu --base)" - -#. +> trunk5 -#: main.cpp:154 -#, kde-format -msgid "file2 to open" -msgstr "avattava tiedosto2" - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file3 to open" -msgstr "avattava tiedosto3" - -#. +> trunk5 -#: main.cpp:166 -#, kde-format -msgid "See kdiff3 --help for supported options." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Ratkaisemattomia ristiriitoja jäljellä: %1 (joista %2 liittyy tyhjemerkkeihn)" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Tulostetta on muutettu.\n" -"Jos jatkat, muutoksesi menetetään." - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:777 -#, kde-format -msgid "All input files are binary equal." -msgstr "Kaikki syötetiedostot ovat binaarisesti samat." - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "Kaikki syötetiedostot sisältävät saman tekstin." - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:783 pdiff.cpp:787 pdiff.cpp:791 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Tiedostot %1 ja %2 ovat binaarisesti samat.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Tiedostojen %1 ja %2 tekstit ovat samat.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, kde-format -msgid "Conflicts" -msgstr "Ristiriidat" - -#. +> trunk5 -#: mergeresultwindow.cpp:1838 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1846 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 mergeresultwindow.cpp:2707 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2919 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"Kaikkia ristiriitoja ei vielä ratkaistu.\n" -"Tiedostoa ei tallennettu.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2921 mergeresultwindow.cpp:2930 -#, kde-format -msgid "Conflicts Left" -msgstr "Ristiriitoja jäljellä" - -#. +> trunk5 -#: mergeresultwindow.cpp:2928 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style manually.\n" -#| "File not saved.\n" -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved." -msgstr "" -"Rivinloppumerkeissä on ristiriita. Valitse rivinlopetusmerkki itse.\n" -"Tiedostoa ei tallennettu.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2942 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Varmuuskopion luonti epäonnistui. Tiedostoa ei tallennettu." - -#. +> trunk5 -#: mergeresultwindow.cpp:2942 mergeresultwindow.cpp:2990 -#, kde-format -msgid "File Save Error" -msgstr "Tiedoston tallennusvirhe" - -#. +> trunk5 -#: mergeresultwindow.cpp:2990 -#, kde-format -msgid "Error while writing." -msgstr "Virhe kirjoitettaessa." - -#. +> trunk5 -#: mergeresultwindow.cpp:3350 -#, fuzzy, kde-format -#| msgid "Output" -msgid "Output:" -msgstr "Tuloste" - -#. +> trunk5 -#: mergeresultwindow.cpp:3362 mergeresultwindow.cpp:3553 -#, kde-format -msgid "[Modified]" -msgstr "[Muutettu]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3369 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "Tallennettaessa käytettävä koodaus" - -#. +> trunk5 -#: mergeresultwindow.cpp:3468 -#, kde-format -msgid "Conflict" -msgstr "Ristiriita" - -#. +> trunk5 -#: mergeresultwindow.cpp:3500 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from A: %1" -msgstr "Merkistöstä" - -#. +> trunk5 -#: mergeresultwindow.cpp:3502 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from B: %1" -msgstr "Merkistöstä" - -#. +> trunk5 -#: mergeresultwindow.cpp:3504 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from C: %1" -msgstr "Merkistöstä" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin-1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Valitse tämä, ellei ei-ASCII-merkkejä näytetä oikein." - -#. +> trunk5 -#: optiondialog.cpp:614 -#, kde-format -msgid "Configure" -msgstr "Asetukset" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Font" -msgstr "Fontti" - -#. +> trunk5 -#: optiondialog.cpp:694 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Muokkaimen ja vertailutulosteen fontti" - -#. +> trunk5 -#: optiondialog.cpp:712 -#, kde-format -msgid "Application font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:716 -#, fuzzy, kde-format -#| msgid "File Save Error" -msgid "File view font" -msgstr "Tiedoston tallennusvirhe" - -#. +> trunk5 -#: optiondialog.cpp:734 -#, kde-format -msgid "Color" -msgstr "Väri" - -#. +> trunk5 -#: optiondialog.cpp:735 -#, kde-format -msgid "Colors Settings" -msgstr "Väriasetukset" - -#. +> trunk5 -#: optiondialog.cpp:752 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Muokkain- ja diff-näkymät:" - -#. +> trunk5 -#: optiondialog.cpp:760 -#, kde-format -msgid "Foreground color:" -msgstr "Tekstiväri:" - -#. +> trunk5 -#: optiondialog.cpp:767 -#, kde-format -msgid "Background color:" -msgstr "Taustaväri:" - -#. +> trunk5 -#: optiondialog.cpp:776 -#, kde-format -msgid "Diff background color:" -msgstr "Diff-taustaväri:" - -#. +> trunk5 -#: optiondialog.cpp:784 -#, kde-format -msgid "Color A:" -msgstr "A-väri:" - -#. +> trunk5 -#: optiondialog.cpp:792 -#, kde-format -msgid "Color B:" -msgstr "B-väri:" - -#. +> trunk5 -#: optiondialog.cpp:800 -#, kde-format -msgid "Color C:" -msgstr "C-väri:" - -#. +> trunk5 -#: optiondialog.cpp:807 -#, kde-format -msgid "Conflict color:" -msgstr "Ristiriitaväri:" - -#. +> trunk5 -#: optiondialog.cpp:815 -#, kde-format -msgid "Current range background color:" -msgstr "Nykyisen alueen taustaväri:" - -#. +> trunk5 -#: optiondialog.cpp:823 -#, kde-format -msgid "Current range diff background color:" -msgstr "Nykyisen alueen diff-taustaväri:" - -#. +> trunk5 -#: optiondialog.cpp:830 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Omien tasauskohta-alueiden väri:" - -#. +> trunk5 -#: optiondialog.cpp:836 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Kansiovertailunäkymä:" - -#. +> trunk5 -#: optiondialog.cpp:842 -#, kde-format -msgid "Newest file color:" -msgstr "Uusimman tiedoston väri:" - -#. +> trunk5 -#: optiondialog.cpp:846 -#, kde-format -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Tämän värin vaihtamisella on vaikutusta vasta käynnistettäessä seuraava kansiovertailu." - -#. +> trunk5 -#: optiondialog.cpp:851 -#, kde-format -msgid "Oldest file color:" -msgstr "Vanhimman tiedoston väri:" - -#. +> trunk5 -#: optiondialog.cpp:859 -#, kde-format -msgid "Middle age file color:" -msgstr "Keski-ikäisen tiedoston väri:" - -#. +> trunk5 -#: optiondialog.cpp:867 -#, kde-format -msgid "Color for missing files:" -msgstr "Puuttuvien tiedostojen väri:" - -#. +> trunk5 -#: optiondialog.cpp:880 -#, kde-format -msgid "Editor" -msgstr "Muokkain" - -#. +> trunk5 -#: optiondialog.cpp:881 -#, kde-format -msgid "Editor Behavior" -msgstr "Muokkaimen toiminta" - -#. +> trunk5 -#: optiondialog.cpp:894 -#, kde-format -msgid "Tab inserts spaces" -msgstr "Sarkain lisää välilyöntejä" - -#. +> trunk5 -#: optiondialog.cpp:897 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Käytössä: Sarkaimen painallus luo sopivan määrän välilyöntejä.\n" -"Poissa käytöstä: Lisätään sarkainmerkki." - -#. +> trunk5 -#: optiondialog.cpp:902 -#, kde-format -msgid "Tab size:" -msgstr "Sarkainleveys:" - -#. +> trunk5 -#: optiondialog.cpp:908 -#, kde-format -msgid "Auto indentation" -msgstr "Automaattisisennys" - -#. +> trunk5 -#: optiondialog.cpp:911 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "Käytössä: Edellisen rivin sisennystä käytetään uudelle riville.\n" - -#. +> trunk5 -#: optiondialog.cpp:914 -#, kde-format -msgid "Auto copy selection" -msgstr "Kopioi valinta automaattisesti" - -#. +> trunk5 -#: optiondialog.cpp:917 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" -"Käytössä: Valinta kopioidaan välittömästi leikepöydälle.\n" -"Poissa käytöstä: Kopiointi on tehtävä itse (esim. Ctrl-C)." - -#. +> trunk5 -#: optiondialog.cpp:931 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Asettaa muokkattuja tiedostoja tallennettaessa käytettävät rivinloppumerkit.\n" -"DOS/Windows: CR+LF, UNIX: LF (missä CR=0D, LF=0A)." - -#. +> trunk5 -#: optiondialog.cpp:941 -#, kde-format -msgid "Diff" -msgstr "Diff" - -#. +> trunk5 -#: optiondialog.cpp:942 -#, kde-format -msgid "Diff Settings" -msgstr "Diff-asetukset" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:966 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore numbers (treat as white space)" -msgstr "Kohtele tyhjemerkkeinä." - -#. +> trunk5 -#: optiondialog.cpp:969 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Ohita numerot rivien täsmäysvaiheessa. (Samankaltainen kuin tyhjemerkkien ohitus.)\n" -"Voi helpottaa numeerista tietoa sisältävien tiedostojen vertailua." - -#. +> trunk5 -#: optiondialog.cpp:973 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "Kohtele C:n/C++:n kommentteja tyhjemerkkeinä." - -#. +> trunk5 -#: optiondialog.cpp:975 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Kohtele C:n/C++:n kommentteja tyhjemerkkeinä." - -#. +> trunk5 -#: optiondialog.cpp:978 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore case (treat as white space)" -msgstr "Kohtele tyhjemerkkeinä." - -#. +> trunk5 -#: optiondialog.cpp:981 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Kohtele eroja suur- tai pienaakkostuksessa kuten tyhjemerkkejä (”a” <=> ”A”)." - -#. +> trunk5 -#: optiondialog.cpp:984 -#, kde-format -msgid "Preprocessor command:" -msgstr "Esikäsittelykomento:" - -#. +> trunk5 -#: optiondialog.cpp:988 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "Käyttäjän määrittämä esikäsittely. (Katso lisätietoja ohjeista.)" - -#. +> trunk5 -#: optiondialog.cpp:991 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:995 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Tätä esikäsittelyä käytetään vain rivejä täsmättäessä.\n" -"(Katso lisätietoja ohjeista.)" - -#. +> trunk5 -#: optiondialog.cpp:998 -#, kde-format -msgid "Try hard (slower)" -msgstr "Yritä kovemmin (hitaampaa)" - -#. +> trunk5 -#: optiondialog.cpp:1001 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Ottaa käyttöön --minimal-asetukset ulkoiselle diffille.\n" -"Suurempien tiedostojen tarkastelu hidastuu huomattavasti." - -#. +> trunk5 -#: optiondialog.cpp:1005 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Kohdista B ja C kolmelle syötetiedostolle" - -#. +> trunk5 -#: optiondialog.cpp:1008 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Yritä kohdistaa B ja C vertailtaessa tai yhdistettäessä kolmea syötetiedostoa.\n" -"Ei suositeltavaa yhdistämisessä, koska se voi huomattavasti mutkistua.\n" -"(Oletus on poissa käytöstä.)" - -#. +> trunk5 -#: optiondialog.cpp:1020 -#, kde-format -msgid "Merge Settings" -msgstr "Yhdistämisasetukset" - -#. +> trunk5 -#: optiondialog.cpp:1034 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Automaattietenemisen viive (ms):" - -#. +> trunk5 -#: optiondialog.cpp:1039 -#, kde-format -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 "" -"Automaattietenemistilassa nykyisen valinnan tulos näytetään annetun ajan\n" -"ennen siirtymistä seuraavaan ristiriitaan. Väli: 0–2000 ms" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, kde-format -msgid "Show info dialogs" -msgstr "Näytä viesti-ikkunat" - -#. +> trunk5 -#: optiondialog.cpp:1045 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Näytä viesti-ikkuna ristiriitojen määrästä." - -#. +> trunk5 -#: optiondialog.cpp:1048 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1052 optiondialog.cpp:1064 -#, kde-format -msgid "Manual Choice" -msgstr "Käyttäjän valinta" - -#. +> trunk5 -#: optiondialog.cpp:1056 optiondialog.cpp:1069 -#, kde-format -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1060 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1073 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1081 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1085 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1093 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1098 -#, kde-format -msgid "Version Control History Merging" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1106 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1110 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1116 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1128 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "History merge sorting" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1138 -#, kde-format -msgid "Sort version control history by a key." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1148 -#, kde-format -msgid "History entry start sort key order:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1152 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1165 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1169 -#, kde-format -msgid "Max number of history entries:" -msgstr "Historiatietueiden enimmäismäärä:" - -#. +> trunk5 -#: optiondialog.cpp:1172 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Katkaise annetun määrän jälkeen. -1 sallii rajattoman tietuemäärän." - -#. +> trunk5 -#: optiondialog.cpp:1176 -#, kde-format -msgid "Test your regular expressions" -msgstr "Kokeile säännöllisiä lausekkeitasi" - -#. +> trunk5 -#: optiondialog.cpp:1181 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1185 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1190 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1193 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1204 optiondialog.cpp:1205 -#, kde-format -msgid "Directory" -msgstr "Kansio" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Recursive directories" -msgstr "Myös alikansiot" - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Tarkistetaanko alikansiotkin vai ei." - -#. +> trunk5 -#: optiondialog.cpp:1221 -#, kde-format -msgid "File pattern(s):" -msgstr "Tiedostohahmo(t):" - -#. +> trunk5 -#: optiondialog.cpp:1226 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Tutkittavien tiedostonimien hahmo(t).\n" -"Jokerit: ”*” ja ”?”.\n" -"Useampia hahmoja voi antaa erottamalla ne puolipistein ”;”." - -#. +> trunk5 -#: optiondialog.cpp:1231 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1236 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1241 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1246 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1251 -#, kde-format -msgid "Use .cvsignore" -msgstr "Käytä .cvsignore-tiedostoa" - -#. +> trunk5 -#: optiondialog.cpp:1254 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1258 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Etsi piilotiedostoja ja -kansioita" - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Etsii tiedostoja ja -kansioita, jotka on piilotettu" - -#. +> trunk5 -#: optiondialog.cpp:1263 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Etsii tiedostoja ja kansioita ”.”:sta alkaen" - -#. +> trunk5 -#: optiondialog.cpp:1267 -#, kde-format -msgid "Follow file links" -msgstr "Seuraa tiedostolinkkejä" - -#. +> trunk5 -#: optiondialog.cpp:1270 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Käytössä: Vertaa linkin osoittamaa tiedostoa.\n" -"Poissa käytöstä: Vertaa linkkejä." - -#. +> trunk5 -#: optiondialog.cpp:1274 -#, kde-format -msgid "Follow directory links" -msgstr "Seuraa kansiolinkkejä" - -#. +> trunk5 -#: optiondialog.cpp:1277 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Käytössä: Vertaa linkin osoittamaa kansiota.\n" -"Poissa käytöstä: Vertaa linkkejä." - -#. +> trunk5 -#: optiondialog.cpp:1292 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Erota pien- ja suuraakkoset tiedostonimiä vertailtaessa" - -#. +> trunk5 -#: optiondialog.cpp:1295 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" -"Kansiovertailu vertaa saman nimisiä tiedostoja ja kansioita.\n" -"Aseta tämä, jos tiedostonimien täytyy täsmätä tarkasti. (Windowsissa oletus on pois käytöstä, muuten käytössä.)" - -#. +> trunk5 -#: optiondialog.cpp:1299 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" -msgid "Unfold all subdirectories on load" -msgstr "Näytä alikansiot" - -#. +> trunk5 -#: optiondialog.cpp:1302 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1306 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1309 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1313 -#, kde-format -msgid "File Comparison Mode" -msgstr "Tiedostonvertailutapa" - -#. +> trunk5 -#: optiondialog.cpp:1318 -#, kde-format -msgid "Binary comparison" -msgstr "Binaarivertailu" - -#. +> trunk5 -#: optiondialog.cpp:1319 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Kunkin tiedoston binaarivertailu (oletus)." - -#. +> trunk5 -#: optiondialog.cpp:1322 -#, kde-format -msgid "Full analysis" -msgstr "Täysi analyysi" - -#. +> trunk5 -#: optiondialog.cpp:1323 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Tee täysi analyysi ja näytä tilastotiedot lisäsarakkeina.\n" -"(Hitaampaa kuin binaarivertailu etenkin binaaritiedostoille.)" - -#. +> trunk5 -#: optiondialog.cpp:1327 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Luota kokoon ja muutospäivään (turvatonta)" - -#. +> trunk5 -#: optiondialog.cpp:1328 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Oleta, että tiedostot ovat samat, jos muutospäivä ja tiedoston koko yhtenevät.\n" -"Tiedostot, joilla on sama sisältö mutta eri muutospäivä näytetään eroavina.\n" -"Kätevä suurille kansioille tai hitaille verkoille." - -#. +> trunk5 -#: optiondialog.cpp:1333 -#, kde-format -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Luota kokoon ja päiväykseen mutta käytä binaarivertailua, elleivät päiväykset vastaa (turvatonta)" - -#. +> trunk5 -#: optiondialog.cpp:1334 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Oleta, että tiedostot ovat samat, jos muutospäivä ja tiedoston koko yhtenevät.\n" -"Elleivät päiväykset ole samat mutta koot ovat, käytetään binaarivertailua.\n" -"Kätevä suurille kansioille tai hitaille verkoille." - -#. +> trunk5 -#: optiondialog.cpp:1339 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Luota kokoon (turvatonta)" - -#. +> trunk5 -#: optiondialog.cpp:1340 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" -"Oleta tiedostot yhteneviksi, jos niiden tiedostokoko on sama.\n" -"Kätevä suurille kansioille tai hitaille verkoille, jos päiväys muuttuu ladattaessa." - -#. +> trunk5 -#: optiondialog.cpp:1347 -#, kde-format -msgid "Synchronize directories" -msgstr "Synkronoi kansiot" - -#. +> trunk5 -#: optiondialog.cpp:1350 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Tarjoaa tiedostojen tallentamista kumpaankin kansioon,\n" -"jolloin kummankin kansion sisältö tulee samaksi.\n" -"Toimii vain verrattaessa kahta kansiota ilman kohdetta." - -#. +> trunk5 -#: optiondialog.cpp:1356 -#, kde-format -msgid "White space differences considered equal" -msgstr "Tyhjemerkit eivät vaikuta lopputulokseen" - -#. +> trunk5 -#: optiondialog.cpp:1359 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Jos tiedostot eroavat vain tyhjemerkeiltään, pidä niitä yhtäläisinä.\n" -"Tämä on aktiivinen vain, kun täysi analyysi on valittu." - -#. +> trunk5 -#: optiondialog.cpp:1365 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Kopioi uudempi yhdistämisen sijaan (turvatonta)" - -#. +> trunk5 -#: optiondialog.cpp:1368 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"Älä katso sisemmäs, valitse vain uusin tiedosto.\n" -"(Käytä tätä vain, jos tiedät mitä teet!)\n" -"Tällä on vaikutusta vain verrattaessa kahta kansiota." - -#. +> trunk5 -#: optiondialog.cpp:1373 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Varmuuskopioi tiedostot (.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1376 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Jos tiedosto tallennettaisiin vanhemman päälle, vanhan tiedoston\n" -"nimeen lisätään pääte ”.orig” sen sijaan, että se poistettaisiin." - -#. +> trunk5 -#: optiondialog.cpp:1452 optiondialog.cpp:1453 -#, kde-format -msgid "Regional Settings" -msgstr "Maa-asetukset" - -#. +> trunk5 -#: optiondialog.cpp:1467 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Käytä samaa merkkikoodausta kaikille:" - -#. +> trunk5 -#: optiondialog.cpp:1470 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Jos asetettu, mahdollistaa kaikki koodausten vaihtamisen ensimmäistä vaihtamalla.\n" -"Poista käytöstä, jos tiedostot käyttävät eri merkkikoodauksia." - -#. +> trunk5 -#: optiondialog.cpp:1474 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "Huomaa: Paikallinen merkkikoodaus on " - -#. +> trunk5 -#: optiondialog.cpp:1478 -#, kde-format -msgid "File Encoding for A:" -msgstr "A-tiedoston koodaus:" - -#. +> trunk5 -#: optiondialog.cpp:1484 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Jos asetettu, Unicode-koodaukset (UTF-16 ja UTF-8) tunnistetaan.\n" -"Ellei tiedosto ole Unicodea, käytetään varalla valittua merkkikoodausta.\n" -"(Unicode-tunnistus tapahtuu tiedoston ensitavusta.)" - -#. +> trunk5 -#: optiondialog.cpp:1487 optiondialog.cpp:1496 optiondialog.cpp:1505 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Tunnista Unicode automaattisesti" - -#. +> trunk5 -#: optiondialog.cpp:1492 -#, kde-format -msgid "File Encoding for B:" -msgstr "B-tiedoston koodaus:" - -#. +> trunk5 -#: optiondialog.cpp:1501 -#, kde-format -msgid "File Encoding for C:" -msgstr "C-tiedoston koodaus:" - -#. +> trunk5 -#: optiondialog.cpp:1510 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Yhdistämisen tulosteen ja tallennuksen merkkikoodaus:" - -#. +> trunk5 -#: optiondialog.cpp:1514 -#, kde-format -msgid "Auto Select" -msgstr "Valitse automaattisesti" - -#. +> trunk5 -#: optiondialog.cpp:1517 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Jos asetettu, käytetään syötetiedostojen merkkikoodausta.\n" -"Epäselvissä tilanteissa käyttäjää pyydetään asettamaan tallennuksen merkkikoodaus." - -#. +> trunk5 -#: optiondialog.cpp:1520 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Esikäsittelytiedostojen merkkikoodaus:" - -#. +> trunk5 -#: optiondialog.cpp:1531 -#, kde-format -msgid "Right To Left Language" -msgstr "Oikealta vasemmalle -kieli" - -#. +> trunk5 -#: optiondialog.cpp:1534 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Joitakin kieliä luetaan oikealta vasemmalle.\n" -"Tämä asetus asettaa katselimen ja muokkaimen vastaavasti." - -#. +> trunk5 -#: optiondialog.cpp:1544 -#, kde-format -msgid "Integration" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1545 -#, kde-format -msgid "Integration Settings" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1558 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Ohitettavat komentorivivalitsimet:" - -#. +> trunk5 -#: optiondialog.cpp:1563 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Luettelo komentorivivalitsimista, jotka tulisi ohittaa, kun toinen työkalu käyttää KDiff3:a.\n" -"Puolipistein ”;” erotettuna voi antaa useita arvoja.\n" -"Tämä estää ”Tuntematon asetus” -virheen." - -# Eihän siinä koskaan taida Suomessa lukea koko ”Escape” -#. +> trunk5 -#: optiondialog.cpp:1568 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Lopeta myös Esc-näppäimellä" - -#. +> trunk5 -#: optiondialog.cpp:1571 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Nopea lopetustapa.\n" -"Sopii niille, jotka ovat Escin käyttöön tottuneet." - -#. +> trunk5 -#: optiondialog.cpp:1655 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "Alustaa kaikki asetukset (ei vain nykyisen kohdan)." - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Tiedonmenetysvirhe:\n" -"Jos se on toistettavissa, ota yhteys tekijään.\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "Vakava sisäinen virhe" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Esikäsittelykomento: " - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "Seuraavat valitsemasi asetukset voivat muuttaa tietoja:\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Tätä ei todennäköisesti haluta yhdistettäessä.\n" -"Haluatko poistaa nämä käytöstä vai jatkaa samoilla asetuksilla?" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Turvattomat yhdistämisasetukset" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Käytä näitä asetuksia yhdistettäessä" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Poista turvattomat asetukset käytöstä" - -#. +> trunk5 -#: pdiff.cpp:170 -#, kde-format -msgid "Loading A" -msgstr "Ladataan A:ta" - -#. +> trunk5 -#: pdiff.cpp:177 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:181 -#, kde-format -msgid "Loading B" -msgstr "Ladataan B:tä" - -#. +> trunk5 -#: pdiff.cpp:188 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Linediff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:223 -#, kde-format -msgid "Loading C" -msgstr "Ladataan C:tä" - -#. +> trunk5 -#: pdiff.cpp:230 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Linediff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Linediff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:779 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "Kaikissa syötetiedostoissa on sama teksti mutta eroja esiintyy binaarisella tasolla." - -#. +> trunk5 -#: pdiff.cpp:785 pdiff.cpp:789 pdiff.cpp:793 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Tiedostoissa %1 ja %2 on sama teksti mutta eroja esiintyy binaarisella tasolla.\n" - -#. +> trunk5 -#: pdiff.cpp:803 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"Jotkin syötetiedostot eivät vaikuta puhtailta tekstitiedostoilta.\n" -"Huomaa, ettei KDiff3:n yhdistystoimintoa ole tarkoitettu binaaridatalle.\n" -"Jatka omalla vastuullasi." - -# %1 sisältää ”A”, ”B”, ”C” tai jonkin näiden yhdistelmän pilkuin erotettuna. -#. +> trunk5 -#: pdiff.cpp:817 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Joitakin syötemerkkejä ei saatu muunnetuksi kelvolliseksi Unicodeksi.\n" -"Käytät ehkä väärää merkistöä (esim. UTF-8:aa ei-UTF-8-tiedostolle).\n" -"Älä tallenna tulosta, ellet ole varma. Jatka omalla vastuullasi.\n" -"Viesti koskee tiedostoja kohteessa %1." - -#. +> trunk5 -#: pdiff.cpp:1035 -#, kde-format -msgid "Abort" -msgstr "Keskeytä" - -#. +> trunk5 -#: pdiff.cpp:1041 pdiff.cpp:1129 -#, kde-format -msgid "Opening files..." -msgstr "Avataan tiedostoja…" - -#. +> trunk5 -#: pdiff.cpp:1106 pdiff.cpp:1177 -#, kde-format -msgid "File open error" -msgstr "Tiedoston avausvirhe" - -#. +> trunk5 -#: pdiff.cpp:1216 -#, kde-format -msgid "Cutting selection..." -msgstr "Leikataan valintaa…" - -#. +> trunk5 -#: pdiff.cpp:1237 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Kopioidaan valintaa leikepöydälle…" - -#. +> trunk5 -#: pdiff.cpp:1253 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Liitetään leikepöydän sisältöä…" - -#. +> trunk5 -#: pdiff.cpp:1715 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1716 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1927 -#, kde-format -msgid "Save && Continue" -msgstr "Tallenna ja jatka" - -#. +> trunk5 -#: pdiff.cpp:1928 -#, kde-format -msgid "Continue Without Saving" -msgstr "Jatka tallentamatta" - -#. +> trunk5 -#: pdiff.cpp:2140 -#, kde-format -msgid "Search complete." -msgstr "Haku valmis." - -#. +> trunk5 -#: pdiff.cpp:2140 -#, kde-format -msgid "Search Complete" -msgstr "Haku valmis" - -#. +> trunk5 -#: pdiff.cpp:2407 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Mitään ei ole valittu kummassakaan diff-syöteikkunassa." - -#. +> trunk5 -#: pdiff.cpp:2407 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Virhe lisättäessä käsin diff-aluetta" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "&Peru" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (perusta):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "Tiedosto…" - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Kansio…" - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (valinnainen):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "Vaihda/kopioi nimet…" - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Vaihda %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Kopioi %1–>tuloste" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Vaihda %1<->tuloste" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Tuloste (valinnainen):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Asetukset…" - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, fuzzy, kde-format -#| msgid "Directory" -msgid "Open Directory" -msgstr "Kansio" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Etsi tekstiä:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Erota pien- ja suuraakkoset" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Etsi A:sta" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Etsi B:stä" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Etsi C:stä" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Etsi tulosteesta" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Etsi" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Säännöllisen lausekkeen testaus" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Automaattiyhdistämisen esimerkkirivi:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "Kokeillaksesi automaattiyhdistämistä kopioi rivi niin kuin se esiintyy tiedostoissasi." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Haun tulos:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Esimerkkihistorian aloitusrivi (edeltävällä kommentilla):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Kopioi historian aloitusrivi niin kuin se esiintyy tiedostoissasi\n" -"edeltävä kommentti mukaan lukien." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Historian lajittelujärjestys:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "Historiatietueen aloitusrivin esimerkki (ilman alkukommenttia):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Kopioi tiedostoissasi käytetty historiatietueen aloitusrivi\n" -"mutta ilman alun kommenttia." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Haku onnistui." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Haku epäonnistui." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Säännöllisen lausekkeen alkavien ja päättävien sulkujen määrä ei täsmää." - -#~ msgid "&Merge" -#~ msgstr "&Yhdistä" - -#~ msgid "Line" -#~ msgstr "Rivi" - -#~ msgid "Directory Comparison Status" -#~ msgstr "Kansiovertailun tila" - -#~ msgid "Number of subdirectories:" -#~ msgstr "Alikansioiden määrä:" - -#~ msgid "Number of different files:" -#~ msgstr "Eroavien tiedostojen määrä:" - -#~ msgid "Cancel" -#~ msgstr "Peru" - -#~ msgid "Help" -#~ msgstr "Ohje" - -#~ msgid "Defaults" -#~ msgstr "Oletukset" - -#~ msgid "&Edit" -#~ msgstr "&Muokkaa" - -#~ msgid "&Settings" -#~ msgstr "&Asetukset" - -#~ msgid "&Help" -#~ msgstr "&Ohje" - -#~ msgid "&About" -#~ msgstr "&Tietoa" - -#~ msgid "A&uthor" -#~ msgstr "Teki&jä" - -#~ msgid "&Thanks To" -#~ msgstr "K&iitokset" - -#~ msgid "Open" -#~ msgstr "Avaa" - -#~ msgid "Save" -#~ msgstr "Tallenna" - -#~ msgid "Print..." -#~ msgstr "Tulosta…" - -#~ msgid "Quit" -#~ msgstr "Lopeta" - -#~ msgid "Cut" -#~ msgstr "Leikkaa" - -#~ msgid "Copy" -#~ msgstr "Kopioi" - -#~ msgid "Paste" -#~ msgstr "Liitä" - -#~ msgid "Select All" -#~ msgstr "Valitse kaikki" - -#~ msgid "Show Toolbar" -#~ msgstr "Näytä työkalurivi" - -#~ msgid "Show &Status Bar" -#~ msgstr "Näytä &tilarivi" - -# *** TARKISTA: Voiko tähän saada %1:stä genetiivin, jolloin voisi olla ”%1 asetukset”? -#~ msgid "&Configure %1..." -#~ msgstr "&Asetukset: %1…" - -#~ msgid "About" -#~ msgstr "Tietoa" - -#~ msgid "Find" -#~ msgstr "Etsi" - -#~ msgid "Find Next" -#~ msgstr "Etsi seuraava" - -#~ msgid "For more documentation, see the help-menu or the subdirectory doc." -#~ msgstr "Lisätietoa saa Ohje-valikosta tai alikansiosta doc." - -#~ msgid "KDiff3-Usage" -#~ msgstr "Kdiff3:n käyttö" - -#~ msgid "Ignore" -#~ msgstr "Jätä huomiotta" - -#~ msgid "Exit" -#~ msgstr "Lopeta" - -#~ msgid "Continue" -#~ msgstr "Jatka" - -#~ msgid "Total number of conflicts: " -#~ msgstr "Ristiriitoja kaikkiaan: " - -#~ msgid "" -#~ "\n" -#~ "Nr of automatically solved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Automaattisesti ratkaistuja ristiriitoja: " - -#~ msgid "" -#~ "\n" -#~ "Nr of unsolved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Ratkaisemattomia ristiriitoja: " - -#~ msgid "Ignore numbers" -#~ msgstr "Ohita numerot" - -#~ msgid "Ignore C/C++ comments" -#~ msgstr "Ohita C:n/C++:n kommentit" - -#~ msgid "Ignore case" -#~ msgstr "Älä erota pien- ja suuraakkosia" - -#~ msgid "Language (restart required)" -#~ msgstr "Kieli (vaatii uudelleenkäynnistyksen)" - -#~ msgid "" -#~ "Choose the language of the GUI strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "Valitse käyttöliittymän kieli tai ”automaattinen”.\n" -#~ "Vaihtaaksesi kieltä lopeta KDiff3 ja käynnistä se uudelleen." - -# pmap: =/gen=kdiff3:n/ -# pmap: =/elat=kdiff3:sta/ -#~ msgid "kdiff3" -#~ msgstr "kdiff3" - -#~ msgid "&OK" -#~ msgstr "&OK" - -#~ msgid "OK" -#~ msgstr "OK" - -#, fuzzy -#~| msgid "(c) 2002-2011 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "© 2002–2011 Joachim Eibl" - -#~ 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äin ei koskaan pitäisi käydä:\n" -#~ "\n" -#~ "mergeResultSaved: m_pMFI=0\n" -#~ "\n" -#~ "Jos tiedät miten toistaa tämä, ota yhteys ohjelman tekijään." - -#~ msgid "Program Error" -#~ msgstr "Ohjelmavirhe" - -#~ msgid "Error." -#~ msgstr "Virhe." - -#~ msgid "Select Font" -#~ msgstr "Valitse fontti" - -#~ 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 "" -#~ "Valitsit vaihtuvalevyisen fontin.\n" -#~ "\n" -#~ "Koska ohjelma ei osaa käyttää vaihtuvalevyisiä fontteja\n" -#~ "oikein, voit törmätä ongelmiin muokkauksessa.\n" -#~ "\n" -#~ "Haluatko jatkaa vai vaihtaa fonttia?" - -#~ msgid "Incompatible font." -#~ msgstr "Yhteensopimaton fontti." - -#~ msgid "Continue at my own risk" -#~ msgstr "Jatkan omalla vastuullani" - -#~ msgid "Select another font" -#~ msgstr "Valitse toinen fontti" - -#~ msgid "Eike Sauer" -#~ msgstr "Eike Sauer" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "Virheenkorjaukset, Debian-paketin ylläpitäjä" - -#~ msgid "Sebastien Fricker" -#~ msgstr "Sebastien Fricker" - -#~ msgid "Windows installer" -#~ msgstr "Windows-asennusohjelma" - -#~ msgid "Stephan Binner" -#~ msgstr "Stephan Binner" - -#~ msgid "i18n-help" -#~ msgstr "i18n-ohje" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "Stefan Partheymueller" - -#~ msgid "Clipboard-patch" -#~ msgstr "Leikepöytäpaikkaus" - -#~ msgid "David Faure" -#~ msgstr "David Faure" - -#~ msgid "KIO-Help" -#~ msgstr "KIO-ohje" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "Bernd Gehrmann" - -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Cervisian CvsIgnoreList-luokka" - -#~ msgid "Andre Woebbeking" -#~ msgstr "Andre Woebbeking" - -#~ msgid "Class StringMatcher" -#~ msgstr "StringMatcher-luokka" - -#~ msgid "Michael Denio" -#~ msgstr "Michael Denio" - -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "Kansion yhtenevyysvärityksen korjaus" - -#~ msgid "Manfred Koehler" -#~ msgstr "Manfred Koehler" - -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Korjaus hitaaseen käynnistykseen Windowsissa" - -#~ msgid "Sergey Zorin" -#~ msgstr "Sergey Zorin" - -#~ msgid "Diff Ext for Windows" -#~ msgstr "Diff-laajennus Windowsiin" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#~ msgid "GNU-Diffutils" -#~ msgstr "GNU Diffutils" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "Tino Boellsterling, Timothy Mee" - -#~ msgid "Intensive test, use and feedback" -#~ msgstr "Intensiivinen testaus, käyttö ja palaute" - -#~ msgid "Michael Schmidt" -#~ msgstr "Michael Schmidt" - -#~ msgid "Mac support" -#~ msgstr "Mac-tuki" - -#~ msgid "Valentin Rusu" -#~ msgstr "Valentin Rusu" - -#~ msgid "KDE4 porting" -#~ msgstr "KDE 4 -siirros" - -#~ msgid "Albert Astals Cid" -#~ msgstr "Albert Astals Cid" - -#~ msgid "Silvan Scherrer" -#~ msgstr "Silvan Scherrer" - -#~ msgid "OS2 port" -#~ msgstr "OS/2-siirros" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "+ Monet kiitokset kaikille virheitä raportoineille ja ohjelmaa ideoineille!" - -#~ msgid "Italic font for deltas" -#~ msgstr "Kursiivifontti muutoksille" - -#~ msgid "" -#~ "Selects the italic version of the font for differences.\n" -#~ "If the font doesn't support italic characters, then this does nothing." -#~ msgstr "" -#~ "Valitsee fontin kursiivimuodon eroavuuksille.\n" -#~ "Ellei fontilla ole kursiivia, ei tehdä mitään." - -#~ msgid "Incompatible Font" -#~ msgstr "Yhteensopimaton fontti" - -#~ msgid "Continue at Own Risk" -#~ msgstr "Jatka omalla vastuullasi" - -#~ msgid "Select Another Font" -#~ msgstr "Valitse toinen fontti" Index: trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,124 +0,0 @@ -# Copyright © 2012 This_file_is_part_of_KDE -# This file is distributed under the same license as the kdiff3 package. -# Tommi Nieminen , 2012. -# Lasse Liehu , 2013, 2014. -# -# KDE Finnish translation sprint participants: -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2014-11-08 04:12+0200\n" -"Last-Translator: Lasse Liehu \n" -"Language-Team: Finnish \n" -"Language: fi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-12-01 22:21:45+0000\n" -"X-Generator: Lokalize 1.5\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." -msgid "KDiff3..." -msgstr "KDiff3…" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "Vertaa tiedostoon %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "Yhdistä tiedostoon %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "Tallenna ”%1” tuonnemmaksi" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "Kolmivaiheinen yhdistäminen pohjaan" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." -msgid "Compare with..." -msgstr "Vertaa tiedostoon…" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "Tyhjennä luettelo" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "Vertaa" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "Kolmivaiheinen vertailu" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." -msgid "About KDiff3 menu plugin..." -msgstr "Tietoa KDiff3-valikkoliitännäisestä…" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Tiedostojen KDiff3-toimintoliitännäinen: Copyright © 2011 Joachim Eibl\n" -"KDiff3-kotisivu: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Kontekstivalikkolaajennuksen käyttö:\n" -"Verrataksesi yksinkertaisesti kahta valittua tiedostoa valitse ”Vertaa”.\n" -"Jos toinen tiedosto on muualla, ”Tallenna” ensimmäinen tiedosto tuonnemmaksi, jolloin se näkyy ”Vertaa tiedostoon…”-alivalikossa. Valitse sitten toiselle tiedostolle ”Vertaa tiedostoon”.\n" -"Kolmivaiheisessa yhdistämisessä ”Tallenna” ensin pohjatiedosto ja yhdistettävä haara. Sitten valitse ”Kolmivaiheinen yhdistäminen pohjaan” kohteena käytettävässä toisessa haarassa.\n" -"Sama pätee myös kansioiden vertailuun ja yhdistämiseen." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "Tietoa tiedostojen KDiff3-toimintoliitännäisestä" Index: trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/fi/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,54 +0,0 @@ -# Lasse Liehu , 2012. -# KDE Finnish translation sprint participants: -# Author: Niklas Laxström -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2013-01-20 20:02:17+0000\n" -"Last-Translator: Lasse Liehu \n" -"Language-Team: Finnish \n" -"Language: fi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2012-12-01 22:21:43+0000\n" -"X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Diff/Patch-käyttöliittymä" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Tiedostojen ja hakemistojen vertailu- ja yhdistämistyökalu" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "Vertaa ja yhdistä tiedostoja sekä hakemistoja KDiff3:lla" - -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "KDiff3" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "Vertaa ja yhdistä tiedostoja sekä hakemistoja" Index: trunk/l10n-support/fr/summit/messages/kdereview/diff_ext.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/diff_ext.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/diff_ext.po (revision 1522187) @@ -0,0 +1,175 @@ +msgid "" +msgstr "" +"Project-Id-Version: diff_ext\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-06 07:33+0200\n" +"PO-Revision-Date: 2018-08-07 04:38+0000\n" +"Last-Translator: KDE Francophone \n" +"Language-Team: KDE Francophone \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: diff_ext.cpp:391 +#, kde-format +msgid "Compare with %1" +msgstr "Comparer avec %1" + +#. +> trunk5 +#: diff_ext.cpp:392 +#, kde-format +msgid "Merge with %1" +msgstr "Fusionner avec %1" + +#. +> trunk5 +#: diff_ext.cpp:408 +#, kde-format +msgid "3-way merge with base" +msgstr "Fusion de trois versions de fichiers avec la base" + +#. +> trunk5 +#: diff_ext.cpp:411 +#, kde-format +msgid "Save '%1' for later" +msgstr "Enregistrer « %1 » pour plus tard" + +#. +> trunk5 +#: diff_ext.cpp:426 +#, kde-format +msgid "Compare with ..." +msgstr "Comparer avec..." + +#. +> trunk5 +#: diff_ext.cpp:429 +#, kde-format +msgid "Clear list" +msgstr "Effacer une liste" + +#. +> trunk5 +#: diff_ext.cpp:434 +#, kde-format +msgid "Compare" +msgstr "Comparer" + +#. +> trunk5 +#: diff_ext.cpp:438 +#, kde-format +msgid "3 way comparison" +msgstr "Comparaison de trois versions de fichiers" + +#. +> trunk5 +#: diff_ext.cpp:444 +#, fuzzy, kde-format +#| msgid "Export Diff..." +msgid "About Diff-Ext ..." +msgstr "Exporter le fichier « diff »..." + +#. +> trunk5 +#: diff_ext.cpp:515 +#, fuzzy, kde-format +#| msgctxt "SpinBox parameter unit" +#| msgid " Bit" +#| msgid_plural " Bits" +msgid "(32 Bit)" +msgstr " Bit" + +#. +> trunk5 +#: diff_ext.cpp:517 +#, fuzzy, kde-format +#| msgid "16 Bits" +msgid "(64 Bit)" +msgstr "16 bits" + +#. +> trunk5 +#: diff_ext.cpp:518 +#, kde-format +msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:519 +#, fuzzy, kde-format +#| msgid "This program is distributed under the terms of the %1." +msgid "This software is distributable under the BSD-2-Clause license.\n" +msgstr "Ce programme est distribué selon les termes de la %1." + +#. +> trunk5 +#: diff_ext.cpp:520 +#, kde-format +msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:521 +#, kde-format +msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:522 +#, fuzzy, kde-format +#| msgid "http://kwave.sourceforge.net" +msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net" +msgstr "http://kwave.sourceforge.net" + +#. +> trunk5 +#: diff_ext.cpp:523 +#, kde-format +msgid "About Diff-Ext for KDiff3 " +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:552 +#, fuzzy, kde-format +#| msgid "Compare Selected File" +msgid "Compare selected files" +msgstr "Comparer le fichier sélectionné" + +#. +> trunk5 +#: diff_ext.cpp:558 diff_ext.cpp:578 +#, fuzzy, kde-format +#| msgid "Replace '%1' with '%2'?" +msgid "Compare '%1' with '%2'" +msgstr "Remplacer « %1 » par « %2 » ?" + +#. +> trunk5 +#: diff_ext.cpp:564 +#, fuzzy, kde-format +#| msgid "Save '%1' for later" +msgid "Save '%1' for later operation" +msgstr "Enregistrer « %1 » pour plus tard" + +#. +> trunk5 +#: diff_ext.cpp:620 +#, fuzzy, kde-format +#| msgid "Could not start the ImportWizard. Please check your installation." +msgid "Could not start KDiff3. Please rerun KDiff3 installation." +msgstr "Impossible de lancer l'assistant d'importation. Veuillez vérifier votre installation." + +# | msgid "Comment" +#. +> trunk5 +#: diff_ext.cpp:621 +#, kde-format +msgid "Command" +msgstr "Commande" + +#. +> trunk5 +#: diff_ext.cpp:622 +#, fuzzy, kde-format +#| msgid "Command Line" +msgid "CommandLine" +msgstr "Ligne de commande" + +#. +> trunk5 +#: diff_ext.cpp:623 +#, fuzzy, kde-format +#| msgid "Diff Ext for Windows" +msgid "Diff-Ext For KDiff3" +msgstr "Extension Diff pour Windows" Index: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,68 @@ +# translation of desktop_extragear-utils_kdiff3.po to Français +# traduction de ...po en Français +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011 Free Software Foundation, Inc. +# Pierre "delroth" Bourdon +# Simon "asmanur" Castellan +# Grégoire "Metzgermeister" Duchêne +# Quentin "Cygal" Pradet +# Gabriel "bluestorm" Scherer +# Kevin "Katen" Soltysiak +# Najib Zulon Idrissi Katouni +# Thomas 'Dark-Side' Refis +# Nicolas Ternisien , 2008. +# Joëlle Cornavin , 2011. +# xavier , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2013-06-27 16:55+0200\n" +"Last-Translator: xavier \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "Module KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Interface graphique pour « Diff » / « Patch »" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »" + +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "KDiff3" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "Comparaison et fusion de fichiers ou de dossiers" Property changes on: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._desktop_.po ___________________________________________________________________ Added: LAST-REVIEW-BY ## -0,0 +1 ## +Xavier Besnard \ No newline at end of property Added: LAST-REVIEW-DATE ## -0,0 +1 ## +2013-06-27 \ No newline at end of property Index: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._json_.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._json_.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/kdiff3._json_.po (revision 1522187) @@ -0,0 +1,23 @@ +msgid "" +msgstr "" +"Project-Id-Version: json files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2018-02-22 04:31+0000\n" +"Last-Translator: KDE Francophone \n" +"Language-Team: KDE Francophone \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »" Index: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4365 @@ +# translation of kdiff3.po to Français +# traduction de kdiff3.po vers le Français +# Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Simon Depiets <2df@tuxfamily.org>, 2005, 2018. +# Joëlle Cornavin , 2008, 2009, 2010, 2011, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-07 09:31+0200\n" +"PO-Revision-Date: 2018-07-25 17:49+0800\n" +"Last-Translator: Simon Depiets \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Joëlle Cornavin, Simon Depiets" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "jcorn@free.fr, sdepiets@gmail.com" + +#. +> trunk5 +#: diff.cpp:258 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "Impossible d'écrire les données du presse-papiers dans un fichier temporaire." + +#. +> trunk5 +#: diff.cpp:262 +#, kde-format +msgid "From Clipboard" +msgstr "Depuis le presse-papiers" + +#. +> trunk5 +#: diff.cpp:563 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Un espace est attendu après l'apostrophe fermant." + +#. +> trunk5 +#: diff.cpp:566 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Pas d'apostrophes appariés." + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Apostrophe inattendu dans l'argument." + +#. +> trunk5 +#: diff.cpp:595 +#, kde-format +msgid "No program specified." +msgstr "Pas de programme spécifié." + +#. +> trunk5 +#: diff.cpp:710 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Il se peut que le pré-traitement ait échoué. Vérifiez cette commande :\n" +"\n" +" %1\n" +"\n" +"La commande de pré-traitement sera désactivée dorénavant." + +#. +> trunk5 +#: diff.cpp:757 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Le pré-traitement de mise en correspondance de lignes a probablement échoué. Vérifiez cette commande :\n" +"\n" +" %1\n" +"\n" +"La commande de pré-traitement de mise en correspondance de lignes sera désactivée dorénavant." + +#. +> trunk5 +#: diff.cpp:784 +#, fuzzy, kde-format +#| msgid "Failed to load processed image." +msgid "File %1 too large to process. Skipping." +msgstr "Impossible de charger l'image traitée." + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "Fichier %1 : ligne %2" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, kde-format +msgid "File %1: Line not available" +msgstr "Fichier %1 : Ligne non disponible" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, kde-format +msgid "Encoding:" +msgstr "Encodage :" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 +#, kde-format +msgid "Line end style:" +msgstr "Style de fin de ligne :" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 +#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 +#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 +#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 +#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 +#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 +#: smalldialogs.cpp:126 smalldialogs.cpp:129 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 +#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 +#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 +#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 +#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 +#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 +#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 +#: smalldialogs.cpp:127 smalldialogs.cpp:130 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 +#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 +#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 +#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 +#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 +#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 +#: smalldialogs.cpp:131 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: difftextwindow.cpp:1858 +#, fuzzy, kde-format +#| msgid "A (Base):" +msgid "A (Base)" +msgstr "A (base) :" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, kde-format +msgid "Encoding: %1" +msgstr "Encodage : %1" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, kde-format +msgid "Line end style: %1" +msgstr "Style de fin de ligne : %1" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "Première ligne" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, kde-format +msgid "End" +msgstr "Fin" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, kde-format +msgid "Open File" +msgstr "Ouvrir un fichier" + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, kde-format +msgid "Other" +msgstr "Autre" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "Non résolu" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "Résolu" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "Non blanc" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "Blanc" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "Copier A vers B" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "Copier B vers A" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "Supprimer A" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "Supprimer B" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Supprimer A et B" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "Fusionner vers A" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "Fusionner vers B" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Fusionner vers A et B" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "Supprimer (s'il existe)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Fusion (manuelle)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Erreur : conflit de types de fichiers" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Erreur : changé et supprimé" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Erreur : les dates sont identiques mais les fichiers ne le sont pas." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, kde-format +msgid "Done" +msgstr "Terminé" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "Erreur" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Sauté." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Non enregistré." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "En cours..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "À faire." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "Nom" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "Opération" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "État" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Mélange de liens et de fichiers normaux." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Lien : " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Taille. " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Date et taille : " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Impossible de créer la copie temporaire de %1." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Impossible d'ouvrir %1." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Comparaison du fichier..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Erreur de lecture depuis %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "Vous effectuez actuellement une fusion de dossier. Voulez-vous vraiment abandonner la fusion et analyser à nouveau le dossier ?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 +#, kde-format +msgid "Warning" +msgstr "Avertissement" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "Analyser à nouveau" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1030 +#, kde-format +msgid "Continue Merging" +msgstr "Poursuivre la fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Impossible d'ouvrir les dossiers :" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +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" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +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" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Le dossier C « %1 » n'existe pas ou n'est pas un dossier.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Erreur lors de l'ouverture du dossier" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"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 encore avant de continuer." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Avertissement pour les paramètres" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Analyse des dossiers..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Lecture du dossier A" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Lecture du dossier B" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Lecture du dossier C" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Certains sous-dossiers ne sont pas lisibles dans" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Vérifiez les permissions des sous-dossiers." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 +#: pdiff.cpp:1226 pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 +#, kde-format +msgid "Ready." +msgstr "Prêt." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, kde-format +msgid "Number of manual merges: %1" +msgstr "Nombre de fusions manuelles : %1" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "Ce paramètre affecte toutes les opérations de fusion." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Changement de toutes les opérations de fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgctxt "Success for image file number %1 out of %2" +#| msgid "Processing file %1 / %2" +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "Traitement du fichier %1 / %2" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Cette opération n'est actuellement pas possible." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "Opération impossible" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "Une erreur est survenue lors de la copie.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "Erreur de fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "Opération de fusion inconnue." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" +"La fusion est sur le point de commencer\n" +"\n" +"Choisissez « Effectuer la fusion » si vous avez lu les instructions et savez ce que vous faites.\n" +"Choisir « Simuler la fusion » indiquera ce qui arrivera.\n" +"\n" +"Sachez que ce programme est encore au stade bêta et qu'il n'y a AUCUNE GARANTIE d'aucune sorte ! Faites des sauvegardes de vos données vitales !" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "Démarrage de la fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "Effectuer la fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "Simuler la fusion" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "L'élément mis en surbrillance est d'un type différent dans les différents dossiers. Choisissez ce qu'il faut faire." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +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 identiques, mais les fichiers ne le sont pas. Choisissez ce qu'il faut faire." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "L'élément mis en surbrillance a été modifié dans un dossier et supprimé dans l'autre. Choisissez ce qu'il faut faire." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "Cette opération n'est actuellement pas possible car une fusion de dossiers est en cours." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" +"Il s'est produit une erreur à la dernière étape.\n" +"Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le sauter ?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "Continuer la fusion après une erreur" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "Continuer avec le dernier élément" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "Sauter l'élément" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "Opération de fusion terminée." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "Fusion terminée" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Simulation de fusion achevée : vérifiez si vous êtes d'accord avec les opérations proposées." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "Une erreur s'est produite. Cliquez sur Ok pour avoir les informations détaillées.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Erreur : durant la suppression de %1 : impossible de créer la sauvegarde." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "supprimer le dossier récursivement( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "supprimer( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Erreur : opération de suppression de dossier impossible durant la tentative de lecture du dossier." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Erreur : opération de suppression de dossier( %1 ) impossible." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Erreur : opération de suppression impossible." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "fusion manuelle(%1, %2, %3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Remarque : après une fusion manuelle, l'utilisateur devra continuer en appuyant sur F7." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Erreur : copie( %1 -> %2 ) impossible. Impossible de supprimer la destination existante." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copier le lien( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Erreur : copie des liens impossible : les liens distants ne sont pas encore pris en charge." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Erreur : copie du lien impossible." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "copie( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Erreur durant le renommage( %1 -> %2 ) : impossible de supprimer la destination existante." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "renommer( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "Erreur : renommage impossible." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Erreur durant la création du dossier de %1. Impossible de supprimer le fichier existant." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "création du dossier( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "Erreur durant la création du dossier." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "Dest" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "Dossier" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "Type" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "Taille" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "Attr" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "Dernière modification" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "Destination du lien" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "Fichier" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +#| msgid "Link" +msgid "-Link" +msgstr "Lien" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "non disponible" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (Dest) : " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (Base) : " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (Dest) : " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (Dest) : " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "Dest : " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Enregistrer l'état de fusion des dossiers sous..." + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Démarrer / Poursuivre la fusion des dossiers" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Lancer l'opération pour l'élément actuel" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "Comparer le fichier sélectionné" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "Fusionner le fichier actuel" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Fusion\n" +"Fichier" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Replier tous les sous-dossiers" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Déplier tous les sous-dossiers" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "Choisir A pour tous les éléments" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "Choisir B pour tous les éléments" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "Choisir C pour tous les éléments" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Choisir automatiquement l'opération pour tous les éléments" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "Pas d'opération pour tous les éléments" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "Afficher les fichiers identiques" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"Identiques\n" +"Fichiers" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "Afficher les fichiers différents" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "Afficher les fichiers uniquement dans A" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"Fichiers\n" +"uniquement dans A" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "Afficher les fichiers uniquement dans B" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"Fichiers\n" +"uniquement dans B" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "Afficher les fichiers uniquement dans C" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"Fichiers\n" +"uniquement dans C" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Comparer les fichiers explicitement sélectionnés" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Fusionner les fichiers explicitement sélectionnés" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "Ne rien faire" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "Supprimer A et B" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "Fusionner vers A et B" + +#. +> trunk5 +#: fileaccess.cpp:885 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"Pendant la tentative de sauvegarde, la suppression d'une sauvegarde précédente a échoué.\n" +"Nom du fichier : " + +#. +> trunk5 +#: fileaccess.cpp:892 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"Pendant la tentative de sauvegarde, le renommage a échoué.\n" +"Noms des fichiers : " + +#. +> trunk5 +#: fileaccess.cpp:916 +#, kde-format +msgid "Getting file status: %1" +msgstr "Obtention de l'état du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:958 +#, kde-format +msgid "Reading file: %1" +msgstr "Lecture du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:996 +#, kde-format +msgid "Writing file: %1" +msgstr "Écriture du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1029 +#, kde-format +msgid "Out of memory" +msgstr "Mémoire pleine" + +#. +> trunk5 +#: fileaccess.cpp:1064 +#, kde-format +msgid "Making directory: %1" +msgstr "Création du dossier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1084 +#, kde-format +msgid "Removing directory: %1" +msgstr "Suppression du dossier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1099 +#, kde-format +msgid "Removing file: %1" +msgstr "Suppression du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1115 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Création d'un lien symbolique : %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1143 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Renommage du fichier : %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1175 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Copie du fichier : %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1189 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Erreur durant l'opération de copie du fichier : impossible d'ouvrir le fichier en lecture. Nom du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1195 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Erreur durant l'opération de copie du fichier : impossible d'ouvrir le fichier en écriture. Nom du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1207 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Erreur durant l'opération de copie du fichier : lecture impossible. Nom du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1216 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Erreur durant l'opération de copie du fichier : écriture impossible. Nom du fichier : %1" + +#. +> trunk5 +#: fileaccess.cpp:1499 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "Lecture du dossier : " + +#. +> trunk5 +#: fileaccess.cpp:1618 +#, kde-format +msgid "Listing directory: %1" +msgstr "Listage du dossier : %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "Configuration actuelle :" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "Erreur d'option de configuration :" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "Option --auto utilisée, mais aucun fichier résultat spécifié." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "Option --auto ignorée pour la comparaison de dossiers." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "Impossible d'enregistrer." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Ouverture de ces fichiers impossible :" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "Erreur d'ouverture d'un fichier" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Ouvre les documents pour faire une comparaison..." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "Recharger" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +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 !" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "Enregistre le document actuel sous..." + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "Afficher les différences" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "Quitte l'application" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Coupe la sélection et la place dans le presse-papiers" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Copie la sélection dans le presse-papiers" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Colle le contenu du presse-papiers à la position actuelle" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "Tout sélectionner dans la fenêtre actuelle" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "Chercher une chaîne" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "Chercher à nouveau la chaîne" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Active/désactive la barre d'état" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "Configurer KDiff3..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "Aller au delta actuel" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Actuel\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "Aller au premier delta" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"Premier\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "Aller au dernier delta" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Dernier\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Saute les différences d'espaces quand « Afficher les espaces » est désactivé)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Ne saute pas les différences d'espaces même quand « Afficher les espaces » est désactivé)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Aller au delta précédent" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Précédent\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "Aller au delta suivant" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Suiv\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Aller au conflit précédent" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Préc\n" +"Conflit" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Aller au conflit suivant" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Suiv\n" +"Conflit" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Aller au conflit non résolu précédent" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Préc\n" +"Non résolu" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Aller au conflit non résolu suivant" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Suiv\n" +"Non résolu" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Sélectionner la(les) ligne(s) à partir de A" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Choisir\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Sélectionner la(les) ligne(s) à partir de B" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Choisir\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Sélectionner la(les) ligne(s) à partir de C" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Choisir\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Aller automatiquement au conflit non résolu suivant après sélection de la source" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Auto\n" +"Suivant" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters for Differences" +msgid "Show Space && Tabulator Characters" +msgstr "Afficher les caractères d'espacement et de tabulation pour voir les différences" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"Blanc\n" +"Caractères" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "Afficher les espaces" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"Blanc\n" +"Deltas" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "Afficher les numéros de lignes" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Ligne\n" +"Numéros" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Choisir A partout" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Choisir B partout" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Choisir C partout" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Choisir A pour tous les conflits non résolus" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Choisir B pour tous les conflits non résolus" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Choisir C pour tous les conflits non résolus" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Choisir A pour tous les conflits d'espaces non résolus" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Choisir B pour tous les conflits d'espaces non résolus" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Choisir C pour tous les conflits d'espaces non résolus" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Résoudre automatiquement les conflits simples" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Attribuer des deltas aux conflits" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Exécuter la fusion automatique de l'expression rationnelle" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Résoudre automatiquement les conflits d'historique" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Scinder les différences à la sélection" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Réunir les différences sélectionnées" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "Afficher la fenêtre A" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "Afficher la fenêtre B" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "Afficher la fenêtre C" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "Vue d'ensemble normale" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "Vue d'ensemble de A par rapport à B" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "Vue d'ensemble de A par rapport à C" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "Vue d'ensemble de B par rapport à C" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Retour à la ligne automatique des fenêtres d'affichage de différences" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Ajouter l'alignement manuel des différences" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Effacer tous les alignements manuels des différences" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "Mettre le focus sur la fenêtre suivante" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "Mettre le focus sur la fenêtre précédente" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Changer l'orientation du séparateur" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Vue de l'écran divisé en dossier et texte" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Basculer entre l'affichage du dossier et l'affichage du texte" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1928 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "Le résultat de la fusion n'a pas été enregistré." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "Enregistrer et quitter" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "Quitter sans enregistrer" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1939 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Enregistrement du résultat de la fusion impossible." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1027 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Vous effectuez actuellement une fusion de dossiers. Voulez-vous vraiment l'interrompre ?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "Enregistrement du fichier..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Enregistrement du fichier sous un nouveau nom..." + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "Enregistrer sous..." + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "Impression non implémentée." + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "Impression..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, fuzzy, kde-format +#| msgid "Printing page %1" +msgid "Printing page %1 of %2" +msgstr "Impression de la page %1" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +#| msgctxt "As in 'A selection of [a generated context description]'" +#| msgid " (Selection)" +msgid " (Selection)" +msgstr " (Sélection)" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "L'impression est terminée." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "Impression interrompue." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "Fermeture..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "(Dés)Activation de la barre d'outils..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "(Dés)Activation de la barre d'état..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "Un module KDE pour afficher les images « SVG »" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "Copyright 2007, Aurélien Gâteau " + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "Impossible de trouver les fichiers pour la comparaison." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "Configurer KDiff3" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:113 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"Impossible d'initialiser le composant KDiff.\n" +"Cet incident arrive d'ordinaire à cause d'un problème d'installation. Veuillez consulter le fichier README dans le paquetage source pour plus de détails." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "&Fichier" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "&Dossier" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Opération de fusion de l'élément actuel" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Opération de synchronisation de l'élément actuel" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgid "&Movement" +msgid "M&ovement" +msgstr "D&éplacement" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "D&ifférences" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +#| msgid "Merge" +msgid "M&erge" +msgstr "Fusion" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "&Fenêtre" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Barre principale" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Ignoré. (Défini par l'utilisateur)" + +#. +> trunk5 +#: main.cpp:117 +#, fuzzy, kde-format +#| msgid "64 bit" +msgid " (64 bit)" +msgstr "64 bits" + +#. +> trunk5 +#: main.cpp:119 +#, fuzzy, kde-format +#| msgid "32 bit" +msgid " (32 bit)" +msgstr "32 bits" + +#. +> trunk5 +#: main.cpp:120 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Outil de comparaison et de fusion de fichiers et de dossiers" + +#. +> trunk5 +#: main.cpp:121 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Merge the input." +msgstr "Fusionner les entrées." + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Fichier de base explicite. Pour la compatibilité avec certains outils." + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Fichier de sortie. Implique -m. Par ex. : -o nouveaufichier.txt" + +#. +> trunk5 +#: main.cpp:143 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Fichier de sortie, encore. (Pour la compatibilité avec certains outils)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "Pas d'interface graphique si tous les conflits se résolvent automatiquement. (Nécessite un fichier -o)" + +#. +> trunk5 +#: main.cpp:145 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically. (For compatibility...)" +msgid "Do not solve conflicts automatically." +msgstr "Ne pas résoudre les conflits automatiquement. (Pour la compatibilité...)" + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "Remplacement de nom visible pour le fichier d'entrée 1 (base)." + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "Remplacement de nom visible pour le fichier d'entrée 2." + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "Remplacement de nom visible pour le fichier d'entrée 3." + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Remplacement de nom visible secondaire. À fournir une seule fois pour chaque entrée." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Annuler un paramètre de configuration. À utiliser une seule fois pour chaque paramètre. Par ex. : --cs « AutoAdvance=1 »" + +#. +> trunk5 +#: main.cpp:151 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "Afficher la liste des paramètres de configuration et les valeurs actuelles." + +#. +> trunk5 +#: main.cpp:152 +#, kde-format +msgid "Use a different config file." +msgstr "Utiliser un fichier de configuration différent." + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "fichier 1 à ouvrir (base, si non spécifié, via --base)" + +#. +> trunk5 +#: main.cpp:156 +#, kde-format +msgid "file2 to open" +msgstr "fichier 2 à ouvrir" + +#. +> trunk5 +#: main.cpp:157 +#, kde-format +msgid "file3 to open" +msgstr "fichier 3 à ouvrir" + +#. +> trunk5 +#: main.cpp:168 +#, fuzzy, kde-format +#| msgctxt "@info:tooltip" +#| msgid "Probe for supported VBE resolutions." +msgid "See kdiff3 --help for supported options." +msgstr "Sonder les résolutions VBE prises en charge." + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Nombre de conflits non résolus restants : %1 (dont %2 concernent des espaces)" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"La sortie a été modifiée.\n" +"Si vous continuez, vos changement seront perdus." + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:771 +#, kde-format +msgid "All input files are binary equal." +msgstr "Tous les fichiers d'entrée sont binairement identiques." + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "Tous les fichiers d'entrée contiennent le même texte." + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Les fichiers %1 et %2 sont binairement identiques.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Les fichiers %1 et%2 ont un texte identique.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, kde-format +msgid "Conflicts" +msgstr "Conflits" + +#. +> trunk5 +#: mergeresultwindow.cpp:1840 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2934 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"Tous les conflits ne sont pas encore résolus.\n" +"Fichier non enregistré.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 +#, kde-format +msgid "Conflicts Left" +msgstr "Conflits restants" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, fuzzy, kde-format +#| msgid "" +#| "There is a line end style conflict. Please choose the line end style manually.\n" +#| "File not saved.\n" +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved." +msgstr "" +"Il y a un conflit de style de fin de ligne. Veuillez choisir le style de fin de ligne manuellement.\n" +"Le fichier n'est pas enregistré.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Création de la sauvegarde impossible. Fichier non enregistré." + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 +#, kde-format +msgid "File Save Error" +msgstr "Erreur lors de l'enregistrement du fichier" + +#. +> trunk5 +#: mergeresultwindow.cpp:3005 +#, kde-format +msgid "Error while writing." +msgstr "Erreur durant l'écriture." + +#. +> trunk5 +#: mergeresultwindow.cpp:3365 +#, kde-format +msgid "Output:" +msgstr "Sortie :" + +#. +> trunk5 +#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 +#, kde-format +msgid "[Modified]" +msgstr "[Modifié]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3384 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "Encodage pour l'enregistrement" + +#. +> trunk5 +#: mergeresultwindow.cpp:3484 +#, kde-format +msgid "Conflict" +msgstr "Conflit" + +#. +> trunk5 +#: mergeresultwindow.cpp:3516 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from A: %1" +msgstr "Codec depuis" + +#. +> trunk5 +#: mergeresultwindow.cpp:3518 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from B: %1" +msgstr "Codec depuis" + +#. +> trunk5 +#: mergeresultwindow.cpp:3520 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from C: %1" +msgstr "Codec depuis" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "Changer la police" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, fuzzy, kde-format +#| msgid "Connected: %1, [%2], %3" +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "Connecté : %1, [%2], %3" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Changez ce paramètre si les caractères non-ASCII ne sont pas affichés correctement." + +#. +> trunk5 +#: optiondialog.cpp:613 +#, kde-format +msgid "Configure" +msgstr "Configurer" + +#. +> trunk5 +#: optiondialog.cpp:690 +#, kde-format +msgid "Font" +msgstr "Police" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Police de l'éditeur et de la sortie de l'analyse des différences" + +#. +> trunk5 +#: optiondialog.cpp:710 +#, fuzzy, kde-format +#| msgctxt "QShortcut" +#| msgid "Application Left" +msgid "Application font" +msgstr "Application à gauche" + +#. +> trunk5 +#: optiondialog.cpp:714 +#, fuzzy, kde-format +#| msgid "Chat view font:" +msgid "File view font" +msgstr "Police de la fenêtre de conversation :" + +#. +> trunk5 +#: optiondialog.cpp:732 +#, kde-format +msgid "Color" +msgstr "Couleur" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Colors Settings" +msgstr "Paramètres des couleurs" + +#. +> trunk5 +#: optiondialog.cpp:750 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Vues de l'éditeur et de la fenêtre d'analyse de différences :" + +#. +> trunk5 +#: optiondialog.cpp:758 +#, kde-format +msgid "Foreground color:" +msgstr "Couleur du premier plan :" + +#. +> trunk5 +#: optiondialog.cpp:765 +#, kde-format +msgid "Background color:" +msgstr "Couleur de fond :" + +#. +> trunk5 +#: optiondialog.cpp:774 +#, kde-format +msgid "Diff background color:" +msgstr "Couleur de fond pour l'affichage des différences :" + +#. +> trunk5 +#: optiondialog.cpp:782 +#, kde-format +msgid "Color A:" +msgstr "Couleur A :" + +#. +> trunk5 +#: optiondialog.cpp:790 +#, kde-format +msgid "Color B:" +msgstr "Couleur B :" + +#. +> trunk5 +#: optiondialog.cpp:798 +#, kde-format +msgid "Color C:" +msgstr "Couleur C :" + +#. +> trunk5 +#: optiondialog.cpp:805 +#, kde-format +msgid "Conflict color:" +msgstr "Couleur des conflits :" + +#. +> trunk5 +#: optiondialog.cpp:813 +#, kde-format +msgid "Current range background color:" +msgstr "Couleur de fond de la plage actuelle :" + +#. +> trunk5 +#: optiondialog.cpp:821 +#, kde-format +msgid "Current range diff background color:" +msgstr "Couleur de fond pour les différences dans la plage actuelle :" + +#. +> trunk5 +#: optiondialog.cpp:828 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Couleur pour les plages de différences alignées manuellement :" + +#. +> trunk5 +#: optiondialog.cpp:834 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Affichage de comparaison des dossiers :" + +#. +> trunk5 +#: optiondialog.cpp:840 +#, kde-format +msgid "Newest file color:" +msgstr "Couleur pour les fichiers les plus récents :" + +#. +> trunk5 +#: optiondialog.cpp:844 +#, kde-format +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Le changement de cette couleur ne sera effectif qu'au prochain démarrage de la comparaison des dossiers." + +#. +> trunk5 +#: optiondialog.cpp:849 +#, kde-format +msgid "Oldest file color:" +msgstr "Couleur pour les fichiers les plus anciens :" + +#. +> trunk5 +#: optiondialog.cpp:857 +#, kde-format +msgid "Middle age file color:" +msgstr "Couleur pour les fichiers d'âge moyen :" + +#. +> trunk5 +#: optiondialog.cpp:865 +#, kde-format +msgid "Color for missing files:" +msgstr "Couleur pour les fichiers manquants :" + +#. +> trunk5 +#: optiondialog.cpp:878 +#, kde-format +msgid "Editor" +msgstr "Éditeur" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor Behavior" +msgstr "Comportement de l'éditeur" + +#. +> trunk5 +#: optiondialog.cpp:892 +#, kde-format +msgid "Tab inserts spaces" +msgstr "Une tabulation insère des espaces" + +#. +> trunk5 +#: optiondialog.cpp:895 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Activé : appuyer sur la touche de tabulation génère le nombre approprié d'espaces.\n" +"Désactivé : un caractère de tabulation va être inséré." + +#. +> trunk5 +#: optiondialog.cpp:900 +#, kde-format +msgid "Tab size:" +msgstr "Taille d'une tabulation :" + +#. +> trunk5 +#: optiondialog.cpp:906 +#, kde-format +msgid "Auto indentation" +msgstr "Indentation automatique" + +#. +> trunk5 +#: optiondialog.cpp:909 +#, kde-format +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" + +#. +> trunk5 +#: optiondialog.cpp:912 +#, kde-format +msgid "Auto copy selection" +msgstr "Copier automatiquement la sélection" + +#. +> trunk5 +#: optiondialog.cpp:915 +#, fuzzy, kde-format +#| msgid "" +#| "On: Any selection is immediately written to the clipboard.\n" +#| "Off: You must explicitely copy e.g. via Ctrl-C." +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" +"Activé : toute sélection est immédiatement copiée dans le presse-papiers.\n" +"Désactivé : vous devrez effectuer la copie explicitement (ex. via Ctrl-C)." + +#. +> trunk5 +#: optiondialog.cpp:929 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Configure les fins de ligne quand un fichier modifié est enregistré.\n" +"DOS/Windows : CR+LF ; Unix : LF ; avec CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:939 +#, kde-format +msgid "Diff" +msgstr "Analyse des différences" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff Settings" +msgstr "Paramètres de l'analyse des différences" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:964 +#, fuzzy, kde-format +#| msgid "Ignore changes in the amount of whitespace" +msgid "Ignore numbers (treat as white space)" +msgstr "Ignorer les modifications du nombre de caractères de fin de ligne" + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Ignorer les caractères numériques durant une phase de mise en correspondance de lignes. (Similaire à « Ignorer les espaces »).\n" +"Peut aider à comparer des fichiers comportant des données numériques." + +#. +> trunk5 +#: optiondialog.cpp:971 +#, fuzzy, kde-format +#| msgid "Treat C/C++ comments like white space." +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "Considérer les commentaires C/C++ comme des espaces." + +#. +> trunk5 +#: optiondialog.cpp:973 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Considérer les commentaires C/C++ comme des espaces." + +#. +> trunk5 +#: optiondialog.cpp:976 +#, fuzzy, kde-format +#| msgid "Ignore changes in the amount of whitespace" +msgid "Ignore case (treat as white space)" +msgstr "Ignorer les modifications du nombre de caractères de fin de ligne" + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Considérer les différences de casse comme des changements d'espaces. (« a »<=>« A »)" + +#. +> trunk5 +#: optiondialog.cpp:982 +#, kde-format +msgid "Preprocessor command:" +msgstr "Commande du préprocesseur :" + +#. +> trunk5 +#: optiondialog.cpp:986 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Pré-traitement défini par l'utilisateur. (Voir les documentations pour les détails)" + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "Commande du préprocesseur pour la mise en correspondance de lignes :" + +#. +> trunk5 +#: optiondialog.cpp:993 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Ce préprocesseur n'est utilisé que durant la mise en correspondance de lignes\n" +"(consultez la documentation pour les détails)." + +#. +> trunk5 +#: optiondialog.cpp:996 +#, kde-format +msgid "Try hard (slower)" +msgstr "Essayer encore (plus lent)" + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +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 analyse de différences externe.\n" +"L'analyse de gros fichiers sera beaucoup plus lente." + +#. +> trunk5 +#: optiondialog.cpp:1003 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Aligner B et C pour 3 fichiers d'entrée" + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Essayez d'aligner B et C lors de la comparaison ou de la fusion de trois fichiers d'entrée.\n" +"Option non recommandée pour une effectuer une fusion, car cette dernière pourrait s'en trouver plus complexe.\n" +"(Par défaut, elle est désactivée)" + +#. +> trunk5 +#: optiondialog.cpp:1018 +#, kde-format +msgid "Merge Settings" +msgstr "Paramètres de la fusion" + +#. +> trunk5 +#: optiondialog.cpp:1032 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Délai d'avance automatique (en ms) :" + +#. +> trunk5 +#: optiondialog.cpp:1037 +#, kde-format +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 "" +"En mode Avance automatique, le résultat de la sélection actuelle est affiché \n" +"pour la période spécifiée, avant d'aller au conflit suivant. Intervalle : 0-2 000 ms" + +#. +> trunk5 +#: optiondialog.cpp:1041 +#, kde-format +msgid "Show info dialogs" +msgstr "Afficher les boîtes de dialogue d'information" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Affiche une boîte de dialogue contenant des informations sur le nombre de conflits." + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "Option par défaut pour les espaces lors de la fusion de 2 fichiers :" + +#. +> trunk5 +#: optiondialog.cpp:1050 optiondialog.cpp:1062 +#, kde-format +msgid "Manual Choice" +msgstr "Choix manuel" + +#. +> trunk5 +#: optiondialog.cpp:1054 optiondialog.cpp:1067 +#, kde-format +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "Autoriser l'algorithme de fusion à sélectionner automatiquement une entrée pour les changements d'espaces seuls." + +#. +> trunk5 +#: optiondialog.cpp:1058 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "Option par défaut pour les espaces lors de la fusion de 3 fichiers :" + +#. +> trunk5 +#: optiondialog.cpp:1071 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "Expression rationnelle de fusion automatique" + +#. +> trunk5 +#: optiondialog.cpp:1079 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "Expression rationnelle de fusion automatique :" + +#. +> trunk5 +#: optiondialog.cpp:1083 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Expression rationnelle pour les lignes depuis lesquelles KDiff3 devra choisir automatiquement une source.\n" +"Lorsqu'une ligne présentant un conflit correspond à l'expression rationnelle, alors\n" +"la ligne C - si elle est disponible, sera choisie, sinon ce sera la ligne B." + +#. +> trunk5 +#: optiondialog.cpp:1089 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "Exécuter la fusion automatique des expressions rationnelles au démarrage de la fusion" + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Exécute la fusion pour les expressions rationnelles de fusion automatique\n" +"immédiatement lorsqu'une fusion démarre.\n" + +#. +> trunk5 +#: optiondialog.cpp:1096 +#, kde-format +msgid "Version Control History Merging" +msgstr "Fusion de l'historique du contrôle de versions" + +#. +> trunk5 +#: optiondialog.cpp:1104 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "Expression rationnelle de début d'historique :" + +#. +> trunk5 +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Expression rationnelle pour le début de la ligne d'historique de contrôle de versions.\n" +"Habituellement, cette ligne contient le mot clé « $Log$ ».\n" +"Valeur par défaut : « .*\\$Log.*\\$.* »" + +#. +> trunk5 +#: optiondialog.cpp:1114 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "Expression rationnelle de début d'un élément d'historique :" + +#. +> trunk5 +#: optiondialog.cpp:1126 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"Un élément d'historique de contrôle de versions se compose de plusieurs lignes.\n" +"Spécifiez l'expression rationnelle utilisée pour détecter la première ligne (sans le commentaire de début).\n" +"Regroupez à l'aide de parenthèses les clés que vous voulez utiliser pour le tri.\n" +"SI ce champ reste vide, alors KDiff3 part du principe que les lignes vides séparent les éléments de l'historique.\n" +"Consultez la documentation pour les détails." + +#. +> trunk5 +#: optiondialog.cpp:1134 +#, kde-format +msgid "History merge sorting" +msgstr "Tri de fusion de l'historique" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "Sort version control history by a key." +msgstr "Trie l'historique de contrôle de versions par clé." + +#. +> trunk5 +#: optiondialog.cpp:1146 +#, kde-format +msgid "History entry start sort key order:" +msgstr "Ordre des clés de tri du début de l'élément de l'historique :" + +#. +> trunk5 +#: optiondialog.cpp:1150 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Chaque paire de parenthèses utilisée dans l'expression rationnelle pour l'élément de début de l'historique\n" +"regroupe une clé susceptible d'être employée pour le tri.\n" +"Spécifiez la liste des clés (qui sont numérotées par ordre d'occurrence, \n" +"en commençant par 1) en utilisant « , » comme séparateur (par ex. « 4,5,6,1,2,3,7 »).\n" +"Si ce champ reste vide, alors aucun tri ne sera effectué.\n" +"Consultez la documentation pour les détails." + +#. +> trunk5 +#: optiondialog.cpp:1161 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "Fusionner l'historique de contrôle de versions lors du démarrage de la fusion" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "Exécuter la fusion automatique de l'historique de contrôle de versions au début de la fusion." + +#. +> trunk5 +#: optiondialog.cpp:1167 +#, kde-format +msgid "Max number of history entries:" +msgstr "Nombre maximal d'éléments d'historique :" + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Couper après le nombre spécifié. Utiliser -1 pour un nombre illimité d'éléments." + +#. +> trunk5 +#: optiondialog.cpp:1174 +#, kde-format +msgid "Test your regular expressions" +msgstr "Testez vos expressions rationnelles" + +#. +> trunk5 +#: optiondialog.cpp:1179 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "Commande de fusion non pertinente :" + +#. +> trunk5 +#: optiondialog.cpp:1183 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Si indiquée, ce script est lancé après une fusion automatique\n" +"quand aucun autre changement pertinent n'a été détecté.\n" +"Appelée avec les paramètres : nomfichier1 nomfichier2 nomfichier3" + +#. +> trunk5 +#: optiondialog.cpp:1188 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "Enregistrer automatiquement et quitter en cas de fusion sans conflits" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Lorsque KDiff3 a été lancé depuis la ligne de commande pour effectuer une fusion de fichiers et\n" +"que tous les conflits peuvent être résolus sans interaction de l'utilisateur, alors cette commande enregistre automatiquement et ferme l'application.\n" +"(Similaire à l'option en ligne de commande « --auto »)" + +#. +> trunk5 +#: optiondialog.cpp:1202 optiondialog.cpp:1203 +#, kde-format +msgid "Directory" +msgstr "Dossier" + +#. +> trunk5 +#: optiondialog.cpp:1215 +#, kde-format +msgid "Recursive directories" +msgstr "Dossiers récursifs" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Si vous voulez ou non analyser les sous-dossiers." + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "File pattern(s):" +msgstr "Motif(s) de fichiers :" + +#. +> trunk5 +#: optiondialog.cpp:1224 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Motif(s) de fichiers à analyser. \n" +"Jokers : « * » et «  ? » \n" +"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" + +#. +> trunk5 +#: optiondialog.cpp:1229 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "Motif(s) de fichiers refusé(s) :" + +#. +> trunk5 +#: optiondialog.cpp:1234 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Motif(s) de fichiers à exclure de l'analyse.\n" +"Jokers : « * » et « ? »\n" +"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" + +#. +> trunk5 +#: optiondialog.cpp:1239 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "Motif(s) de dossiers exclu(s) :" + +#. +> trunk5 +#: optiondialog.cpp:1244 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Motif(s) des dossiers à exclure de l'analyse. \n" +"Jokers : « * » et « ? »\n" +"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" + +#. +> trunk5 +#: optiondialog.cpp:1249 +#, kde-format +msgid "Use .cvsignore" +msgstr "Utiliser .cvsignore" + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Étend l'exclusion de motif(s) à tout ce qui serait ignoré par CVS.\n" +"Via les fichiers « .cvsignore » locaux, ce peut être spécifique à un dossier." + +#. +> trunk5 +#: optiondialog.cpp:1256 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Chercher les fichiers et les dossiers cachés" + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Cherche les fichiers et les dossiers ayant l'attribut « caché »." + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Cherche les fichiers et les dossiers commençant par « . »." + +#. +> trunk5 +#: optiondialog.cpp:1265 +#, kde-format +msgid "Follow file links" +msgstr "Suivre les liens vers des fichiers" + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Activé : compare le fichier sur lequel pointe le lien.\n" +"Désactivé : compare les liens." + +#. +> trunk5 +#: optiondialog.cpp:1272 +#, kde-format +msgid "Follow directory links" +msgstr "Suivre les liens vers un dossier" + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Activé : compare le dossier sur lequel pointe le lien.\n" +"Désactivé : compare les liens." + +#. +> trunk5 +#: optiondialog.cpp:1290 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Tenir compte de la casse lors de la comparaison des noms de fichiers" + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" +"La comparaison de dossiers compare les fichiers ou les dossiers lorsque leurs noms correspondent.\n" +"Réglez cette option si la casse des noms doit correspondre. (Désactivée par défaut pour Windows, sinon Activée)" + +#. +> trunk5 +#: optiondialog.cpp:1297 +#, fuzzy, kde-format +#| msgid "May not make subdirectories of a file" +msgid "Unfold all subdirectories on load" +msgstr "Impossible de créer des sous-dossiers à un fichier" + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1304 +#, fuzzy, kde-format +#| msgid "Select directory to import:" +msgid "Skip directory status report" +msgstr "Sélectionnez le dossier à importer :" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1311 +#, kde-format +msgid "File Comparison Mode" +msgstr "Mode de comparaison de fichiers" + +#. +> trunk5 +#: optiondialog.cpp:1316 +#, kde-format +msgid "Binary comparison" +msgstr "Comparaison binaire" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Comparaison binaire de chaque fichier. (Par défaut)" + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, kde-format +msgid "Full analysis" +msgstr "Analyse complète" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Effectue une analyse complète et affiche les informations statistiques dans des colonnes supplémentaires.\n" +"(Plus lente qu'une comparaison binaire, beaucoup plus pour les fichiers binaires)" + +#. +> trunk5 +#: optiondialog.cpp:1325 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Se fier à la taille et à la date de modification (peu sûr)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n" +"Les fichiers ayant un contenu identique mais des dates de modification distinctes apparaîtront comme étant différents.\n" +"Utile pour les dossiers volumineux ou les réseaux lents." + +#. +> trunk5 +#: optiondialog.cpp:1331 +#, kde-format +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Se fier à la tailler et à la date, mais utiliser la comparaison binaire si la date ne correspond pas (peu sûr)" + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n" +"Si la date n'est pas identique mais que les tailles le sont, utilise la comparaison binaire.\n" +"Utile pour les dossiers volumineux ou les réseaux lents." + +#. +> trunk5 +#: optiondialog.cpp:1337 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Se fier à la taille (peu sûr)" + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" +"Suppose que tous les fichiers sont identiques si leurs longueurs sont égales.\n" +"Utile pour les dossiers volumineux ou les réseaux lents, quand la taille est modifiée durant le téléchargement." + +#. +> trunk5 +#: optiondialog.cpp:1345 +#, kde-format +msgid "Synchronize directories" +msgstr "Synchroniser les dossiers" + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Propose d'enregistrer les fichiers dans les deux dossiers pour que les deux dossiers soient identiques ensuite.\n" +"Fonctionne seulement quand la comparaison de deux dossiers ne spécifie pas de destination." + +#. +> trunk5 +#: optiondialog.cpp:1354 +#, kde-format +msgid "White space differences considered equal" +msgstr "Différences d'espaces considérées comme égales" + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Si les fichiers ne diffèrent que par des espaces, ils sont considérés comme identiques.\n" +"Cette fonction n'est active que si vous choisissez l'analyse complète." + +#. +> trunk5 +#: optiondialog.cpp:1363 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Copier le plus récent au lieu de fusionner (peu sûr)" + +#. +> trunk5 +#: optiondialog.cpp:1366 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"N'ouvre pas le fichier, se contente de prendre le plus récent.\n" +"(À n'utilisez que si vous savez ce que vous faites !)\n" +"Option effective seulement lors de la comparaison de dossiers." + +#. +> trunk5 +#: optiondialog.cpp:1371 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Sauvegarder les fichiers (.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Quand il s'agira d'enregistrer un fichier sur un fichier plus ancien, alors l'ancien\n" +"sera renommé avec une extension « .orig » au lieu d'être supprimé." + +#. +> trunk5 +#: optiondialog.cpp:1450 optiondialog.cpp:1451 +#, kde-format +msgid "Regional Settings" +msgstr "Paramètres régionaux" + +#. +> trunk5 +#: optiondialog.cpp:1465 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Utiliser le même encodage pour tout :" + +#. +> trunk5 +#: optiondialog.cpp:1468 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Cocher cette option permet de changer tous les encodages en ne modifiant que le premier.\n" +"Décochez-la si des paramètres individuels différents sont nécessaires." + +#. +> trunk5 +#: optiondialog.cpp:1472 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "Remarque : l'encodage local est" + +#. +> trunk5 +#: optiondialog.cpp:1476 +#, kde-format +msgid "File Encoding for A:" +msgstr "Encodage du fichier pour A :" + +#. +> trunk5 +#: optiondialog.cpp:1482 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Si cette option est cochée, alors l'encodage Unicode (UTF-16 ou UTF-8) sera détecté.\n" +"Si le fichier n'est pas en Unicode, alors l'encodage sélectionné sera utilisé comme solution de repli\n" +"(la détection de l'Unicode repose sur les premiers octets d'un fichier)." + +#. +> trunk5 +#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Détecter automatiquement Unicode" + +#. +> trunk5 +#: optiondialog.cpp:1490 +#, kde-format +msgid "File Encoding for B:" +msgstr "Encodage du fichier pour B :" + +#. +> trunk5 +#: optiondialog.cpp:1499 +#, kde-format +msgid "File Encoding for C:" +msgstr "Encodage du fichier pour C :" + +#. +> trunk5 +#: optiondialog.cpp:1508 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Encodage du fichier pour la sortie de la fusion et l'enregistrement :" + +#. +> trunk5 +#: optiondialog.cpp:1512 +#, kde-format +msgid "Auto Select" +msgstr "Sélectionner automatiquement" + +#. +> trunk5 +#: optiondialog.cpp:1515 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Si cette option est cochée, l'encodage provenant des fichiers d'entrée est utilisé.\n" +"Dans les cas ambigus, une boîte de dialogue demandera à l'utilisateur de choisir l'encodage pour l'enregistrement." + +#. +> trunk5 +#: optiondialog.cpp:1518 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Encodage du fichier pour les fichiers préprocesseurs :" + +#. +> trunk5 +#: optiondialog.cpp:1529 +#, kde-format +msgid "Right To Left Language" +msgstr "Langue de droite à gauche" + +#. +> trunk5 +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Certaines langue se lisent de droite à gauche.\n" +"Ce paramètre changera l'afficheur et l'éditeur en conséquence." + +#. +> trunk5 +#: optiondialog.cpp:1542 +#, kde-format +msgid "Integration" +msgstr "Intégration" + +#. +> trunk5 +#: optiondialog.cpp:1543 +#, kde-format +msgid "Integration Settings" +msgstr "Paramètres d'intégration" + +#. +> trunk5 +#: optiondialog.cpp:1556 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Options en ligne de commande à ignorer :" + +#. +> trunk5 +#: optiondialog.cpp:1561 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Liste des options en ligne de commande qui devront être ignorées quand KDiff3 est utilisé par d'autres outils.\n" +"Plusieurs valeurs peuvent être spécifiées si on les sépare par des « ; »,\n" +"ce qui supprimera l'erreur « Option inconnue »." + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Quitter également à l'aide de la touche Echap" + +#. +> trunk5 +#: optiondialog.cpp:1569 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Méthode rapide pour sortir de l'application.\n" +"Pour les personnes qui sont habituées à utiliser la touche Echap." + +#. +> trunk5 +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "Cette commande réinitialise toutes les options. Pas seulement celles de la rubrique actuelle." + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Problème de perte de données :\n" +"Si cela se reproduit, veuillez contacter l'auteur.\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "Erreur interne critique" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Commande de préprocesseur : " + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "Les options suivantes que vous avez choisies risquent de changer les données :\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Il est fort probable que ce ne soit pas souhaité durant une fusion.\n" +"Voulez-vous désactiver ces réglages ou continuer avec ces paramètres actifs ?" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Option peu sûre pour une fusion" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Utiliser ces options durant la fusion" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Désactiver les options peu sûres" + +#. +> trunk5 +#: pdiff.cpp:170 +#, kde-format +msgid "Loading A" +msgstr "Chargement de A" + +#. +> trunk5 +#: pdiff.cpp:177 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file A." +msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" + +#. +> trunk5 +#: pdiff.cpp:181 +#, kde-format +msgid "Loading B" +msgstr "Chargement de B" + +#. +> trunk5 +#: pdiff.cpp:188 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file B." +msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Différences : A <-> B" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Différences de lignes : A <-> B" + +#. +> trunk5 +#: pdiff.cpp:223 +#, kde-format +msgid "Loading C" +msgstr "Chargement de C" + +#. +> trunk5 +#: pdiff.cpp:230 +#, fuzzy, kde-format +#| msgid "An error occurred during processing the queue.\n" +msgid "Errors occurred during pre-processing of file C." +msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Différences : B <-> C" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Différences : A <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Différences de lignes : B <-> C" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Différences de lignes : A <-> C" + +#. +> trunk5 +#: pdiff.cpp:773 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "Tous les fichiers d'entrée contiennent le même texte, mais ne sont pas binairement identiques." + +#. +> trunk5 +#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Les fichiers %1 et %2 ont le même texte, mais ne sont pas binairement identiques. \n" + +#. +> trunk5 +#: pdiff.cpp:797 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\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 pur.\n" +"Notez que la fusion KDiff3 n'a pas été prévue pour les données binaires.\n" +"Continuez à vos risques et périls." + +#. +> trunk5 +#: pdiff.cpp:807 +#, fuzzy, kde-format +#| msgid ", " +msgid ", B" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:809 +#, fuzzy, kde-format +#| msgid ", " +msgid ", C" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:811 +#, fuzzy, kde-format +#| msgid "" +#| "Some input characters could not be converted to valid unicode.\n" +#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +#| "Don't save the result if unsure. Continue at your own risk.\n" +#| "Affected input files are in %1." +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Il est impossible de convertir certains caractères d'entrée en Unicode valable.\n" +"Il se peut que vous utilisiez un codec incorrect. (ex. UTF-8 pour les fichiers non-UTF-8).\n" +"N'enregistrez pas le résultat si vous avez un doute. Poursuivez à vos propres risques.\n" +"Les fichiers affectés sont dans %1." + +#. +> trunk5 +#: pdiff.cpp:1029 +#, kde-format +msgid "Abort" +msgstr "Abandonner" + +#. +> trunk5 +#: pdiff.cpp:1035 pdiff.cpp:1123 +#, kde-format +msgid "Opening files..." +msgstr "Ouverture des fichiers..." + +#. +> trunk5 +#: pdiff.cpp:1100 pdiff.cpp:1171 +#, kde-format +msgid "File open error" +msgstr "Erreur d'ouverture du fichier" + +#. +> trunk5 +#: pdiff.cpp:1210 +#, kde-format +msgid "Cutting selection..." +msgstr "Coupe de la sélection..." + +#. +> trunk5 +#: pdiff.cpp:1231 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Copie de la sélection dans le presse-papiers..." + +#. +> trunk5 +#: pdiff.cpp:1247 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Insertion du contenu du presse-papiers..." + +#. +> trunk5 +#: pdiff.cpp:1718 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1719 +#, fuzzy, kde-format +#| msgid "Show the horizontal scrollbar" +msgid "Calculating max width for horizontal scrollbar" +msgstr "Afficher l'ascenseur horizontal" + +#. +> trunk5 +#: pdiff.cpp:1930 +#, kde-format +msgid "Save && Continue" +msgstr "Enregistrer et continuer" + +#. +> trunk5 +#: pdiff.cpp:1931 +#, kde-format +msgid "Continue Without Saving" +msgstr "Continuer sans enregistrer" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search complete." +msgstr "Recherche terminée." + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search Complete" +msgstr "Recherche terminée" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Rien n'est sélectionné dans l'une ou l'autre des fenêtres d'entrée des différences." + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Erreur lors de l'ajout d'une plage de différences manuel" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "&Annuler" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (base) :" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "Fichier..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Dossier..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (optionnel) :" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "Permuter / Copier les noms..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Permuter %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Copier %1->Sortie" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Permuter %1<->Sortie" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Sortie (optionnel) :" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Configurer..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, kde-format +msgid "Open Directory" +msgstr "Ouvrir un dossier" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, fuzzy, kde-format +#| msgid "Select output file" +msgid "Select Output File" +msgstr "Sélectionnez le fichier de sortie" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Texte à chercher :" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Tenir compte de la casse" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Chercher dans A" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Chercher dans B" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Chercher dans C" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Chercher dans la sortie" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Chercher" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Contrôleur d'expressions rationnelles" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Exemple de ligne de fusion automatique :" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "Pour effectuer un test de fusion automatique, copiez une ligne comme utilisé dans vos fichiers." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Résultat de la correspondance :" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Exemple de ligne de début d'historique (avec commentaire de départ) :" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Copiez une ligne de début d'historique comme utilisé dans vos fichiers,\n" +"y compris le commentaire de départ." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Ordre des clés de tri de l'historique :" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "Exemple de ligne de début d'élément d'historique (avec commentaire de départ) :" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Copiez une ligne de début d'élément d'historique comme utilisé dans vos fichiers,\n" +"mais en omettant le commentaire de départ." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "Résultat de la clé de tri :" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Correspondance correcte." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Correspondance incorrecte." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Les parenthèses d'ouverture et de fermeture ne correspondent pas dans l'expression rationnelle." + +#~ msgid "Integrate with ClearCase" +#~ msgstr "Intégrer avec ClearCase" + +#~ msgid "" +#~ "Integrate with Rational ClearCase from IBM.\n" +#~ "Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +#~ "(Only enabled when ClearCase \"bin\" directory is in the path.)" +#~ msgstr "" +#~ "Intégrer avec Rational ClearCase de IBM.\n" +#~ "Change le fichier « map » en sous-dossier « lib/mgrs » de ClearCase\n" +#~ "(activé uniquement quand le dossier « bin » de ClearCase est dans l'emplacement)." + +#~ msgid "Remove ClearCase Integration" +#~ msgstr "Supprimer l'intégration de ClearCase" + +#~ msgid "Restore the old \"map\" file from before doing the ClearCase integration." +#~ msgstr "Restaurer à partir de l'ancien fichier « map » avant d'effectuer l'intégration de Clearcase." + +#~ msgid "&Merge" +#~ msgstr "&Fusion" + +#~ msgid "Line" +#~ msgstr "Ligne" + +#~ msgid "Directory Comparison Status" +#~ msgstr "État de la comparaison des dossiers" + +#~ msgid "Number of subdirectories:" +#~ msgstr "Nombre de sous-dossiers :" + +#~ msgid "Number of equal files:" +#~ msgstr "Nombre de fichiers identiques :" + +#~ msgid "Number of different files:" +#~ msgstr "Nombre de fichiers différents :" + +#~ msgid "Processing " +#~ msgstr "En cours " + +#~ msgid "Selection" +#~ msgstr "Sélection" + +#~ msgid "Total number of conflicts: " +#~ msgstr "Nombre total de conflits : " + +#~ msgid "" +#~ "\n" +#~ "Nr of automatically solved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Nombre de conflits résolus automatiquement : " + +#~ msgid "" +#~ "\n" +#~ "Nr of unsolved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Nombre de conflits non résolus : " + +#~ msgid "Output" +#~ msgstr "Sortie" + +#~ msgid "Treat as white space." +#~ msgstr "Considérer comme des espaces." + +#~ msgid "Ignore numbers" +#~ msgstr "Ignorer les nombres" + +#~ msgid "Ignore C/C++ comments" +#~ msgstr "Ignorer les commentaires C/C++" + +#~ msgid "Ignore case" +#~ msgstr "Ignorer la casse" + +#~ msgid "Cancel" +#~ msgstr "Annuler" + +#~ msgid "Ok" +#~ msgstr "Ok" + +#~ msgid "Help" +#~ msgstr "Aide" + +#~ msgid "Defaults" +#~ msgstr "Par défaut" + +#~ msgid "&Edit" +#~ msgstr "&Édition" + +#~ msgid "&Settings" +#~ msgstr "&Configuration" + +#~ msgid "&Help" +#~ msgstr "&Aide" + +#~ msgid "&About" +#~ msgstr "À &propos" + +#~ msgid "A&uthor" +#~ msgstr "A&uteur" + +#~ msgid "&Thanks To" +#~ msgstr "&Remerciements à" + +#~ msgid "Open" +#~ msgstr "Ouvrir" + +#~ msgid "Save" +#~ msgstr "Enregistrer" + +#~ msgid "Print..." +#~ msgstr "Imprimer..." + +#~ msgid "Quit" +#~ msgstr "Quitter" + +#~ msgid "Cut" +#~ msgstr "Couper" + +#~ msgid "Copy" +#~ msgstr "Copier" + +#~ msgid "Paste" +#~ msgstr "Coller" + +#~ msgid "Select All" +#~ msgstr "Tout sélectionner" + +#~ msgid "Show Toolbar" +#~ msgstr "Afficher la barre d'outils" + +#~ msgid "Show &Status Bar" +#~ msgstr "Afficher l'a barre d'ét&at" + +#~ msgid "&Configure %1..." +#~ msgstr "&Configurer %1..." + +#~ msgid "About" +#~ msgstr "À propos de" + +#~ msgid "Find" +#~ msgstr "Chercher" + +#~ msgid "Find Next" +#~ msgstr "Poursuivre la recherche" + +#~ msgid "For more documentation, see the help-menu or the subdirectory doc." +#~ msgstr "Pour plus d'informations, consultez le menu d'aide ou le fichier de documentation du sous-dossier." + +#~ msgid "KDiff3-Usage" +#~ msgstr "Utilisation de KDiff3" + +#~ msgid "Ignore" +#~ msgstr "Ignorer" + +#~ msgid "Exit" +#~ msgstr "Quitter" + +#~ msgid "Continue" +#~ msgstr "Continuer" + +#~ msgid "Language (restart required)" +#~ msgstr "Langue (redémarrage nécessaire)" + +#~ msgid "" +#~ "Choose the language of the GUI strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "Choisissez la langue des chaînes de l'interface graphique ou « Auto ».\n" +#~ "Pour qu'un changement de langue entre en vigueur, quittez et redémarrez KDiff3." + +#~ msgid "kdiff3" +#~ msgstr "kdiff3" + +#~ msgid "&OK" +#~ msgstr "&Ok" + +#~ msgid "OK" +#~ msgstr "Ok" + +#, fuzzy +#~| msgid "(c) 2002-2011 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "(c) 2002-2011 Joachim Eibl" + +#~ 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 "" +#~ "Cela ne devrait jamais arriver : \n" +#~ "\n" +#~ "mergeResultSaved : m_pMFI=0\n" +#~ "\n" +#~ "Si vous savez comment le reproduire, veuillez contacter l'auteur du programme." + +#~ msgid "Program Error" +#~ msgstr "Erreur du programme" + +#~ msgid "Error." +#~ msgstr "Erreur." + +#~ msgid "Done." +#~ msgstr "Fait." + +#~ msgid "Select Font" +#~ msgstr "Choisir une police" + +#~ 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 "" +#~ "Vous avez choisi une police à chasse variable.\n" +#~ "\n" +#~ "Étant donné que ce programme ne gère pas polices à chasse variable correctement,\n" +#~ "vous pourriez rencontrer des problèmes lors de l'édition.\n" +#~ "\n" +#~ "Voulez-vous continuer ou choisir une autre police." + +#~ msgid "Incompatible font." +#~ msgstr "Police incompatible." + +#~ msgid "Continue at my own risk" +#~ msgstr "Continuer à vos risques et périls" + +#~ msgid "Select another font" +#~ msgstr "Choisir une autre police" + +#~ msgid "Eike Sauer" +#~ msgstr "Eike Sauer" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "Corrections de bogues, mainteneur de paquetages Debian" + +#~ msgid "Sebastien Fricker" +#~ msgstr "Sebastien Fricker" + +#~ msgid "Windows installer" +#~ msgstr "Programme d'installation Windows" + +#~ msgid "Stephan Binner" +#~ msgstr "Stephan Binner" + +#~ msgid "i18n-help" +#~ msgstr "Aide de i18n" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "Stefan Partheymueller" + +#~ msgid "Clipboard-patch" +#~ msgstr "Correctif pour le presse-papiers" + +#~ msgid "David Faure" +#~ msgstr "David Faure" + +#~ msgid "KIO-Help" +#~ msgstr "Aide de KIO" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "Bernd Gehrmann" + +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Classe CvsIgnoreList de Cervisia" + +#~ msgid "Andre Woebbeking" +#~ msgstr "Andre Woebbeking" + +#~ msgid "Class StringMatcher" +#~ msgstr "Classe StringMatcher" + +#~ msgid "Michael Denio" +#~ msgstr "Michael Denio" + +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "Correctif de coloration d'égalité des dossiers" + +#~ msgid "Manfred Koehler" +#~ msgstr "Manfred Koehler" + +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Correction du démarrage lent sous Windows" + +#~ msgid "Sergey Zorin" +#~ msgstr "Sergey Zorin" + +#~ msgid "Diff Ext for Windows" +#~ msgstr "Extension Diff pour Windows" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#~ msgid "GNU-Diffutils" +#~ msgstr "GNU-Diffutils" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "Tino Boellsterling, Timothy Mee" + +#~ msgid "Intensive test, use and feedback" +#~ msgstr "Tests intensifs, utilisation et retour d'informations" + +#~ msgid "Michael Schmidt" +#~ msgstr "Michael Schmidt" + +#~ msgid "Mac support" +#~ msgstr "Prise en charge pour Mac" + +#~ msgid "Valentin Rusu" +#~ msgstr "Valentin Rusu" + +#~ msgid "KDE4 porting" +#~ msgstr "Portage vers KDE4" + +#~ msgid "Albert Astals Cid" +#~ msgstr "Albert Astals Cid" + +#~ msgid "Silvan Scherrer" +#~ msgstr "Silvan Scherrer" + +#~ msgid "OS2 port" +#~ msgstr "Portage vers OS2" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "Et de nombreux remerciements à ceux qui ont signalé des bogues et contribué à des idées !" + +#~ msgid "Italic font for deltas" +#~ msgstr "Police en italique pour les deltas" + +#~ 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 de la police pour les différences.\n" +#~ "Si la police ne prend pas en charge les caractères en italique, cette commande n'a aucun effet." + +#~ msgid "Incompatible Font" +#~ msgstr "Police incompatible" + +#~ msgid "Continue at Own Risk" +#~ msgstr "Continuer à vos risques et périls" + +#~ msgid "Select Another Font" +#~ msgstr "Sélectionner une autre police" Index: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,127 @@ +# translation of kdiff3fileitemactionplugin.po to Français +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Joëlle Cornavin , 2011. +# xavier , 2013. +# Simon Depiets , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2018-07-23 15:45+0800\n" +"Last-Translator: Simon Depiets \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 2.0\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, kde-format +#| msgid "KDiff3 ..." +msgid "KDiff3..." +msgstr "KDiff3..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Comparer avec %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Fusionner avec %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Enregistrer « %1 » pour plus tard" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "Fusion de trois versions de fichiers avec la base" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, kde-format +#| msgid "Compare with ..." +msgid "Compare with..." +msgstr "Comparer avec..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Effacer une liste" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Comparer" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "Comparaison de trois versions de fichiers" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, kde-format +#| msgid "About KDiff3 menu plugin ..." +msgid "About KDiff3 menu plugin..." +msgstr "À propos du module externe de menu KDiff3..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Module externe d'actions sur des éléments de fichiers pour KDiff3. Copyright (C) 2011 Joachim Eibl\n" +"Page d'accueil de KDiff3 : http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Utilisation de l'extension du menu contextuel :\n" +"Pour une comparaison simple de deux fichiers sélectionnés, choisissez « Comparer ».\n" +"Si l'autre fichier se trouve dans un autre endroit quelconque, « enregistrez » le premier fichier pour plus tard. Il apparaîtra dans le sous-menu « Comparer avec... ». Puis utilisez « Comparer avec » sur le second fichier.\n" +"Pour une fusion de 3 fichiers, « enregistrez » d'abord le fichier base, puis la branche à fusionner et choisissez « Fusion de trois versions de fichiers avec la base » sur l'autre branche, qui sera utilisée comme destination.\n" +"Le même principe s'applique à la comparaison et à la fusion de dossiers." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "À propos du module externe d'actions sur des éléments de fichiers pour KDiff3" Property changes on: trunk/l10n-support/fr/summit/messages/kdereview/kdiff3fileitemactionplugin.po ___________________________________________________________________ Added: LAST-REVIEW-BY ## -0,0 +1 ## +Xavier Besnard \ No newline at end of property Added: LAST-REVIEW-DATE ## -0,0 +1 ## +2013-06-27 \ No newline at end of property Index: trunk/l10n-support/fr/summit/messages/kdereview/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/fr/summit/messages/kdereview/org.kde.kdiff3.appdata.po (nonexistent) +++ trunk/l10n-support/fr/summit/messages/kdereview/org.kde.kdiff3.appdata.po (revision 1522187) @@ -0,0 +1,95 @@ +# Simon Depiets , 2018. +msgid "" +msgstr "" +"Project-Id-Version: org.kde.kdiff3.appdata\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-07-11 09:18+0200\n" +"PO-Revision-Date: 2018-07-25 17:45+0800\n" +"Last-Translator: Simon Depiets \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 2.0\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. (itstool) path: component/name +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:6 +msgid "KDiff3" +msgstr "KDiff3" + +#. (itstool) path: component/summary +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:7 +#| msgctxt "Comment" +#| msgid "A File And Directory Comparison And Merge Tool" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers" + +#. (itstool) path: description/p +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:11 +msgid "KDiff3 is a file and directory diff and merge tool which" +msgstr "KDiff3 est un outil de comparaison et de fusion de fichiers et de dossiers qui" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:13 +msgid "compares and merges two or three text input files or directories," +msgstr "compare et fusionne deux ou trois fichiers ou dossiers en entrée," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:14 +msgid "shows the differences line by line and character by character(!)," +msgstr "affiche les différences ligne par ligne et caractère par caractère (!)," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:15 +msgid "provides an automatic merge-facility," +msgstr "offre des fonctionnalités de fusion automatique," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:16 +msgid "has an editor for comfortable solving of merge-conflicts," +msgstr "dispose d'un éditeur pour résoudre confortablement les conflits lors de la fusion," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:17 +msgid "provides network transparency via KIO," +msgstr "fournit une transparence réseau via KIO," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:18 +msgid "has options to highlight or hide changes in white-space or comments," +msgstr "dispose d'options permettant de surligner ou de cacher les différences d'espaces ou de commentaires," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:19 +#| msgid "Use Unicode (UTF-8) encoding" +msgid "supports Unicode, UTF-8 and other file encodings," +msgstr "prend en charge Unicode, UTF-8 et d'autres encodages de fichiers," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:20 +#| msgid "Preferences" +msgid "prints differences," +msgstr "affiche les différences," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:21 +#| msgid "Sort version control history by a key." +msgid "supports version control keyword and history merging." +msgstr "prend en charge les mots clés de contrôle de version et la fusion des historiques." Index: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4365 +0,0 @@ -# translation of kdiff3.po to Français -# traduction de kdiff3.po vers le Français -# Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Simon Depiets <2df@tuxfamily.org>, 2005, 2018. -# Joëlle Cornavin , 2008, 2009, 2010, 2011, 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-07 09:31+0200\n" -"PO-Revision-Date: 2018-07-25 17:49+0800\n" -"Last-Translator: Simon Depiets \n" -"Language-Team: French \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Joëlle Cornavin, Simon Depiets" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "jcorn@free.fr, sdepiets@gmail.com" - -#. +> trunk5 -#: diff.cpp:258 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "Impossible d'écrire les données du presse-papiers dans un fichier temporaire." - -#. +> trunk5 -#: diff.cpp:262 -#, kde-format -msgid "From Clipboard" -msgstr "Depuis le presse-papiers" - -#. +> trunk5 -#: diff.cpp:563 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Un espace est attendu après l'apostrophe fermant." - -#. +> trunk5 -#: diff.cpp:566 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Pas d'apostrophes appariés." - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Apostrophe inattendu dans l'argument." - -#. +> trunk5 -#: diff.cpp:595 -#, kde-format -msgid "No program specified." -msgstr "Pas de programme spécifié." - -#. +> trunk5 -#: diff.cpp:710 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Il se peut que le pré-traitement ait échoué. Vérifiez cette commande :\n" -"\n" -" %1\n" -"\n" -"La commande de pré-traitement sera désactivée dorénavant." - -#. +> trunk5 -#: diff.cpp:757 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Le pré-traitement de mise en correspondance de lignes a probablement échoué. Vérifiez cette commande :\n" -"\n" -" %1\n" -"\n" -"La commande de pré-traitement de mise en correspondance de lignes sera désactivée dorénavant." - -#. +> trunk5 -#: diff.cpp:784 -#, fuzzy, kde-format -#| msgid "Failed to load processed image." -msgid "File %1 too large to process. Skipping." -msgstr "Impossible de charger l'image traitée." - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line %2" -msgstr "Fichier %1 : ligne %2" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, kde-format -msgid "File %1: Line not available" -msgstr "Fichier %1 : Ligne non disponible" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, kde-format -msgid "Encoding:" -msgstr "Encodage :" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 -#, kde-format -msgid "Line end style:" -msgstr "Style de fin de ligne :" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 -#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 -#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 -#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 -#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 -#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 -#: smalldialogs.cpp:126 smalldialogs.cpp:129 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 -#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 -#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 -#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 -#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 -#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 -#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 -#: smalldialogs.cpp:127 smalldialogs.cpp:130 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 -#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 -#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 -#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 -#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: difftextwindow.cpp:1858 -#, fuzzy, kde-format -#| msgid "A (Base):" -msgid "A (Base)" -msgstr "A (base) :" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, kde-format -msgid "Encoding: %1" -msgstr "Encodage : %1" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, kde-format -msgid "Line end style: %1" -msgstr "Style de fin de ligne : %1" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "Première ligne" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, kde-format -msgid "End" -msgstr "Fin" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, kde-format -msgid "Open File" -msgstr "Ouvrir un fichier" - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 bit" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, kde-format -msgid "Other" -msgstr "Autre" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "Non résolu" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "Résolu" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "Non blanc" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "Blanc" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "Copier A vers B" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "Copier B vers A" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "Supprimer A" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "Supprimer B" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Supprimer A et B" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "Fusionner vers A" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "Fusionner vers B" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Fusionner vers A et B" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "Supprimer (s'il existe)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Fusion (manuelle)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Erreur : conflit de types de fichiers" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Erreur : changé et supprimé" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Erreur : les dates sont identiques mais les fichiers ne le sont pas." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, kde-format -msgid "Done" -msgstr "Terminé" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "Erreur" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Sauté." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Non enregistré." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "En cours..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "À faire." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "Nom" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "Opération" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "État" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Mélange de liens et de fichiers normaux." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Lien : " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Taille. " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Date et taille : " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Impossible de créer la copie temporaire de %1." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Impossible d'ouvrir %1." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Comparaison du fichier..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Erreur de lecture depuis %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "Vous effectuez actuellement une fusion de dossier. Voulez-vous vraiment abandonner la fusion et analyser à nouveau le dossier ?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 -#, kde-format -msgid "Warning" -msgstr "Avertissement" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "Analyser à nouveau" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1030 -#, kde-format -msgid "Continue Merging" -msgstr "Poursuivre la fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Impossible d'ouvrir les dossiers :" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -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" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -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" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Le dossier C « %1 » n'existe pas ou n'est pas un dossier.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Erreur lors de l'ouverture du dossier" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"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 encore avant de continuer." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Avertissement pour les paramètres" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Analyse des dossiers..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Lecture du dossier A" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Lecture du dossier B" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Lecture du dossier C" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Certains sous-dossiers ne sont pas lisibles dans" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Vérifiez les permissions des sous-dossiers." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 -#: pdiff.cpp:1226 pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 -#, kde-format -msgid "Ready." -msgstr "Prêt." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, kde-format -msgid "Number of manual merges: %1" -msgstr "Nombre de fusions manuelles : %1" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "Ce paramètre affecte toutes les opérations de fusion." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Changement de toutes les opérations de fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgctxt "Success for image file number %1 out of %2" -#| msgid "Processing file %1 / %2" -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "Traitement du fichier %1 / %2" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Cette opération n'est actuellement pas possible." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "Opération impossible" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "Une erreur est survenue lors de la copie.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "Erreur de fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "Opération de fusion inconnue." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" -"La fusion est sur le point de commencer\n" -"\n" -"Choisissez « Effectuer la fusion » si vous avez lu les instructions et savez ce que vous faites.\n" -"Choisir « Simuler la fusion » indiquera ce qui arrivera.\n" -"\n" -"Sachez que ce programme est encore au stade bêta et qu'il n'y a AUCUNE GARANTIE d'aucune sorte ! Faites des sauvegardes de vos données vitales !" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "Démarrage de la fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "Effectuer la fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "Simuler la fusion" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "L'élément mis en surbrillance est d'un type différent dans les différents dossiers. Choisissez ce qu'il faut faire." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -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 identiques, mais les fichiers ne le sont pas. Choisissez ce qu'il faut faire." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "L'élément mis en surbrillance a été modifié dans un dossier et supprimé dans l'autre. Choisissez ce qu'il faut faire." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "Cette opération n'est actuellement pas possible car une fusion de dossiers est en cours." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" -"Il s'est produit une erreur à la dernière étape.\n" -"Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le sauter ?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "Continuer la fusion après une erreur" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "Continuer avec le dernier élément" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "Sauter l'élément" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "Opération de fusion terminée." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "Fusion terminée" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Simulation de fusion achevée : vérifiez si vous êtes d'accord avec les opérations proposées." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "Une erreur s'est produite. Cliquez sur Ok pour avoir les informations détaillées.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Erreur : durant la suppression de %1 : impossible de créer la sauvegarde." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "supprimer le dossier récursivement( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "supprimer( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Erreur : opération de suppression de dossier impossible durant la tentative de lecture du dossier." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Erreur : opération de suppression de dossier( %1 ) impossible." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Erreur : opération de suppression impossible." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "fusion manuelle(%1, %2, %3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Remarque : après une fusion manuelle, l'utilisateur devra continuer en appuyant sur F7." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Erreur : copie( %1 -> %2 ) impossible. Impossible de supprimer la destination existante." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "copier le lien( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Erreur : copie des liens impossible : les liens distants ne sont pas encore pris en charge." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Erreur : copie du lien impossible." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "copie( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Erreur durant le renommage( %1 -> %2 ) : impossible de supprimer la destination existante." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "renommer( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "Erreur : renommage impossible." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Erreur durant la création du dossier de %1. Impossible de supprimer le fichier existant." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "création du dossier( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "Erreur durant la création du dossier." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "Dest" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "Dossier" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "Type" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "Taille" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "Attr" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "Dernière modification" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "Destination du lien" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "Fichier" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -#| msgid "Link" -msgid "-Link" -msgstr "Lien" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "non disponible" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (Dest) : " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (Base) : " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (Dest) : " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (Dest) : " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "Dest : " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Enregistrer l'état de fusion des dossiers sous..." - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Démarrer / Poursuivre la fusion des dossiers" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Lancer l'opération pour l'élément actuel" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "Comparer le fichier sélectionné" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "Fusionner le fichier actuel" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Fusion\n" -"Fichier" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Replier tous les sous-dossiers" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Déplier tous les sous-dossiers" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "Choisir A pour tous les éléments" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "Choisir B pour tous les éléments" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "Choisir C pour tous les éléments" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Choisir automatiquement l'opération pour tous les éléments" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "Pas d'opération pour tous les éléments" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "Afficher les fichiers identiques" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"Identiques\n" -"Fichiers" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "Afficher les fichiers différents" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "Afficher les fichiers uniquement dans A" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"Fichiers\n" -"uniquement dans A" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "Afficher les fichiers uniquement dans B" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"Fichiers\n" -"uniquement dans B" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "Afficher les fichiers uniquement dans C" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"Fichiers\n" -"uniquement dans C" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Comparer les fichiers explicitement sélectionnés" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Fusionner les fichiers explicitement sélectionnés" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "Ne rien faire" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "Supprimer A et B" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "Fusionner vers A et B" - -#. +> trunk5 -#: fileaccess.cpp:885 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"Pendant la tentative de sauvegarde, la suppression d'une sauvegarde précédente a échoué.\n" -"Nom du fichier : " - -#. +> trunk5 -#: fileaccess.cpp:892 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"Pendant la tentative de sauvegarde, le renommage a échoué.\n" -"Noms des fichiers : " - -#. +> trunk5 -#: fileaccess.cpp:916 -#, kde-format -msgid "Getting file status: %1" -msgstr "Obtention de l'état du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:958 -#, kde-format -msgid "Reading file: %1" -msgstr "Lecture du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:996 -#, kde-format -msgid "Writing file: %1" -msgstr "Écriture du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1029 -#, kde-format -msgid "Out of memory" -msgstr "Mémoire pleine" - -#. +> trunk5 -#: fileaccess.cpp:1064 -#, kde-format -msgid "Making directory: %1" -msgstr "Création du dossier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1084 -#, kde-format -msgid "Removing directory: %1" -msgstr "Suppression du dossier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1099 -#, kde-format -msgid "Removing file: %1" -msgstr "Suppression du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1115 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Création d'un lien symbolique : %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1143 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Renommage du fichier : %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1175 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Copie du fichier : %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1189 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Erreur durant l'opération de copie du fichier : impossible d'ouvrir le fichier en lecture. Nom du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1195 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Erreur durant l'opération de copie du fichier : impossible d'ouvrir le fichier en écriture. Nom du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1207 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Erreur durant l'opération de copie du fichier : lecture impossible. Nom du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1216 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Erreur durant l'opération de copie du fichier : écriture impossible. Nom du fichier : %1" - -#. +> trunk5 -#: fileaccess.cpp:1499 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "Lecture du dossier : " - -#. +> trunk5 -#: fileaccess.cpp:1618 -#, kde-format -msgid "Listing directory: %1" -msgstr "Listage du dossier : %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "Configuration actuelle :" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "Erreur d'option de configuration :" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "Option --auto utilisée, mais aucun fichier résultat spécifié." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "Option --auto ignorée pour la comparaison de dossiers." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "Impossible d'enregistrer." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Ouverture de ces fichiers impossible :" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "Erreur d'ouverture d'un fichier" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Ouvre les documents pour faire une comparaison..." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "Recharger" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -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 !" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "Enregistre le document actuel sous..." - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "Afficher les différences" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "Quitte l'application" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Coupe la sélection et la place dans le presse-papiers" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Copie la sélection dans le presse-papiers" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Colle le contenu du presse-papiers à la position actuelle" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "Tout sélectionner dans la fenêtre actuelle" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "Chercher une chaîne" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "Chercher à nouveau la chaîne" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Active/désactive la barre d'état" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "Configurer KDiff3..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "Aller au delta actuel" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Actuel\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "Aller au premier delta" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"Premier\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "Aller au dernier delta" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Dernier\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Saute les différences d'espaces quand « Afficher les espaces » est désactivé)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Ne saute pas les différences d'espaces même quand « Afficher les espaces » est désactivé)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Aller au delta précédent" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Précédent\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "Aller au delta suivant" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Suiv\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Aller au conflit précédent" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Préc\n" -"Conflit" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Aller au conflit suivant" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Suiv\n" -"Conflit" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Aller au conflit non résolu précédent" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Préc\n" -"Non résolu" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Aller au conflit non résolu suivant" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Suiv\n" -"Non résolu" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Sélectionner la(les) ligne(s) à partir de A" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Choisir\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Sélectionner la(les) ligne(s) à partir de B" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Choisir\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Sélectionner la(les) ligne(s) à partir de C" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Choisir\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Aller automatiquement au conflit non résolu suivant après sélection de la source" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Auto\n" -"Suivant" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "Afficher les caractères d'espacement et de tabulation pour voir les différences" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"Blanc\n" -"Caractères" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "Afficher les espaces" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"Blanc\n" -"Deltas" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "Afficher les numéros de lignes" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Ligne\n" -"Numéros" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Choisir A partout" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Choisir B partout" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Choisir C partout" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Choisir A pour tous les conflits non résolus" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Choisir B pour tous les conflits non résolus" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Choisir C pour tous les conflits non résolus" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Choisir A pour tous les conflits d'espaces non résolus" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Choisir B pour tous les conflits d'espaces non résolus" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Choisir C pour tous les conflits d'espaces non résolus" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Résoudre automatiquement les conflits simples" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Attribuer des deltas aux conflits" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Exécuter la fusion automatique de l'expression rationnelle" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Résoudre automatiquement les conflits d'historique" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Scinder les différences à la sélection" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Réunir les différences sélectionnées" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "Afficher la fenêtre A" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "Afficher la fenêtre B" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "Afficher la fenêtre C" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "Vue d'ensemble normale" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "Vue d'ensemble de A par rapport à B" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "Vue d'ensemble de A par rapport à C" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "Vue d'ensemble de B par rapport à C" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Retour à la ligne automatique des fenêtres d'affichage de différences" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Ajouter l'alignement manuel des différences" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Effacer tous les alignements manuels des différences" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "Mettre le focus sur la fenêtre suivante" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "Mettre le focus sur la fenêtre précédente" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Changer l'orientation du séparateur" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Vue de l'écran divisé en dossier et texte" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Basculer entre l'affichage du dossier et l'affichage du texte" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1928 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "Le résultat de la fusion n'a pas été enregistré." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "Enregistrer et quitter" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "Quitter sans enregistrer" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1939 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Enregistrement du résultat de la fusion impossible." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1027 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Vous effectuez actuellement une fusion de dossiers. Voulez-vous vraiment l'interrompre ?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "Enregistrement du fichier..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Enregistrement du fichier sous un nouveau nom..." - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "Enregistrer sous..." - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "Impression non implémentée." - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "Impression..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, fuzzy, kde-format -#| msgid "Printing page %1" -msgid "Printing page %1 of %2" -msgstr "Impression de la page %1" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -#| msgctxt "As in 'A selection of [a generated context description]'" -#| msgid " (Selection)" -msgid " (Selection)" -msgstr " (Sélection)" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "L'impression est terminée." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "Impression interrompue." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "Fermeture..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "(Dés)Activation de la barre d'outils..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "(Dés)Activation de la barre d'état..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "Un module KDE pour afficher les images « SVG »" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "Copyright 2007, Aurélien Gâteau " - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "Impossible de trouver les fichiers pour la comparaison." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "Configurer KDiff3" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:113 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"Impossible d'initialiser le composant KDiff.\n" -"Cet incident arrive d'ordinaire à cause d'un problème d'installation. Veuillez consulter le fichier README dans le paquetage source pour plus de détails." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "&Fichier" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "&Dossier" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Opération de fusion de l'élément actuel" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Opération de synchronisation de l'élément actuel" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" -msgid "M&ovement" -msgstr "D&éplacement" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "D&ifférences" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" -msgid "M&erge" -msgstr "Fusion" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "&Fenêtre" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Barre principale" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Ignoré. (Défini par l'utilisateur)" - -#. +> trunk5 -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "64 bit" -msgid " (64 bit)" -msgstr "64 bits" - -#. +> trunk5 -#: main.cpp:119 -#, fuzzy, kde-format -#| msgid "32 bit" -msgid " (32 bit)" -msgstr "32 bits" - -#. +> trunk5 -#: main.cpp:120 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Outil de comparaison et de fusion de fichiers et de dossiers" - -#. +> trunk5 -#: main.cpp:121 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Merge the input." -msgstr "Fusionner les entrées." - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Fichier de base explicite. Pour la compatibilité avec certains outils." - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Fichier de sortie. Implique -m. Par ex. : -o nouveaufichier.txt" - -#. +> trunk5 -#: main.cpp:143 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Fichier de sortie, encore. (Pour la compatibilité avec certains outils)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "Pas d'interface graphique si tous les conflits se résolvent automatiquement. (Nécessite un fichier -o)" - -#. +> trunk5 -#: main.cpp:145 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Do not solve conflicts automatically." -msgstr "Ne pas résoudre les conflits automatiquement. (Pour la compatibilité...)" - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "Remplacement de nom visible pour le fichier d'entrée 1 (base)." - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "Remplacement de nom visible pour le fichier d'entrée 2." - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "Remplacement de nom visible pour le fichier d'entrée 3." - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Remplacement de nom visible secondaire. À fournir une seule fois pour chaque entrée." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Annuler un paramètre de configuration. À utiliser une seule fois pour chaque paramètre. Par ex. : --cs « AutoAdvance=1 »" - -#. +> trunk5 -#: main.cpp:151 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "Afficher la liste des paramètres de configuration et les valeurs actuelles." - -#. +> trunk5 -#: main.cpp:152 -#, kde-format -msgid "Use a different config file." -msgstr "Utiliser un fichier de configuration différent." - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "fichier 1 à ouvrir (base, si non spécifié, via --base)" - -#. +> trunk5 -#: main.cpp:156 -#, kde-format -msgid "file2 to open" -msgstr "fichier 2 à ouvrir" - -#. +> trunk5 -#: main.cpp:157 -#, kde-format -msgid "file3 to open" -msgstr "fichier 3 à ouvrir" - -#. +> trunk5 -#: main.cpp:168 -#, fuzzy, kde-format -#| msgctxt "@info:tooltip" -#| msgid "Probe for supported VBE resolutions." -msgid "See kdiff3 --help for supported options." -msgstr "Sonder les résolutions VBE prises en charge." - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Nombre de conflits non résolus restants : %1 (dont %2 concernent des espaces)" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"La sortie a été modifiée.\n" -"Si vous continuez, vos changement seront perdus." - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:771 -#, kde-format -msgid "All input files are binary equal." -msgstr "Tous les fichiers d'entrée sont binairement identiques." - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "Tous les fichiers d'entrée contiennent le même texte." - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Les fichiers %1 et %2 sont binairement identiques.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Les fichiers %1 et%2 ont un texte identique.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, kde-format -msgid "Conflicts" -msgstr "Conflits" - -#. +> trunk5 -#: mergeresultwindow.cpp:1840 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2934 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"Tous les conflits ne sont pas encore résolus.\n" -"Fichier non enregistré.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 -#, kde-format -msgid "Conflicts Left" -msgstr "Conflits restants" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style manually.\n" -#| "File not saved.\n" -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved." -msgstr "" -"Il y a un conflit de style de fin de ligne. Veuillez choisir le style de fin de ligne manuellement.\n" -"Le fichier n'est pas enregistré.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Création de la sauvegarde impossible. Fichier non enregistré." - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 -#, kde-format -msgid "File Save Error" -msgstr "Erreur lors de l'enregistrement du fichier" - -#. +> trunk5 -#: mergeresultwindow.cpp:3005 -#, kde-format -msgid "Error while writing." -msgstr "Erreur durant l'écriture." - -#. +> trunk5 -#: mergeresultwindow.cpp:3365 -#, kde-format -msgid "Output:" -msgstr "Sortie :" - -#. +> trunk5 -#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 -#, kde-format -msgid "[Modified]" -msgstr "[Modifié]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3384 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "Encodage pour l'enregistrement" - -#. +> trunk5 -#: mergeresultwindow.cpp:3484 -#, kde-format -msgid "Conflict" -msgstr "Conflit" - -#. +> trunk5 -#: mergeresultwindow.cpp:3516 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from A: %1" -msgstr "Codec depuis" - -#. +> trunk5 -#: mergeresultwindow.cpp:3518 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from B: %1" -msgstr "Codec depuis" - -#. +> trunk5 -#: mergeresultwindow.cpp:3520 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from C: %1" -msgstr "Codec depuis" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "Changer la police" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, fuzzy, kde-format -#| msgid "Connected: %1, [%2], %3" -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "Connecté : %1, [%2], %3" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Changez ce paramètre si les caractères non-ASCII ne sont pas affichés correctement." - -#. +> trunk5 -#: optiondialog.cpp:613 -#, kde-format -msgid "Configure" -msgstr "Configurer" - -#. +> trunk5 -#: optiondialog.cpp:690 -#, kde-format -msgid "Font" -msgstr "Police" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Police de l'éditeur et de la sortie de l'analyse des différences" - -#. +> trunk5 -#: optiondialog.cpp:710 -#, fuzzy, kde-format -#| msgctxt "QShortcut" -#| msgid "Application Left" -msgid "Application font" -msgstr "Application à gauche" - -#. +> trunk5 -#: optiondialog.cpp:714 -#, fuzzy, kde-format -#| msgid "Chat view font:" -msgid "File view font" -msgstr "Police de la fenêtre de conversation :" - -#. +> trunk5 -#: optiondialog.cpp:732 -#, kde-format -msgid "Color" -msgstr "Couleur" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Colors Settings" -msgstr "Paramètres des couleurs" - -#. +> trunk5 -#: optiondialog.cpp:750 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Vues de l'éditeur et de la fenêtre d'analyse de différences :" - -#. +> trunk5 -#: optiondialog.cpp:758 -#, kde-format -msgid "Foreground color:" -msgstr "Couleur du premier plan :" - -#. +> trunk5 -#: optiondialog.cpp:765 -#, kde-format -msgid "Background color:" -msgstr "Couleur de fond :" - -#. +> trunk5 -#: optiondialog.cpp:774 -#, kde-format -msgid "Diff background color:" -msgstr "Couleur de fond pour l'affichage des différences :" - -#. +> trunk5 -#: optiondialog.cpp:782 -#, kde-format -msgid "Color A:" -msgstr "Couleur A :" - -#. +> trunk5 -#: optiondialog.cpp:790 -#, kde-format -msgid "Color B:" -msgstr "Couleur B :" - -#. +> trunk5 -#: optiondialog.cpp:798 -#, kde-format -msgid "Color C:" -msgstr "Couleur C :" - -#. +> trunk5 -#: optiondialog.cpp:805 -#, kde-format -msgid "Conflict color:" -msgstr "Couleur des conflits :" - -#. +> trunk5 -#: optiondialog.cpp:813 -#, kde-format -msgid "Current range background color:" -msgstr "Couleur de fond de la plage actuelle :" - -#. +> trunk5 -#: optiondialog.cpp:821 -#, kde-format -msgid "Current range diff background color:" -msgstr "Couleur de fond pour les différences dans la plage actuelle :" - -#. +> trunk5 -#: optiondialog.cpp:828 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Couleur pour les plages de différences alignées manuellement :" - -#. +> trunk5 -#: optiondialog.cpp:834 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Affichage de comparaison des dossiers :" - -#. +> trunk5 -#: optiondialog.cpp:840 -#, kde-format -msgid "Newest file color:" -msgstr "Couleur pour les fichiers les plus récents :" - -#. +> trunk5 -#: optiondialog.cpp:844 -#, kde-format -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Le changement de cette couleur ne sera effectif qu'au prochain démarrage de la comparaison des dossiers." - -#. +> trunk5 -#: optiondialog.cpp:849 -#, kde-format -msgid "Oldest file color:" -msgstr "Couleur pour les fichiers les plus anciens :" - -#. +> trunk5 -#: optiondialog.cpp:857 -#, kde-format -msgid "Middle age file color:" -msgstr "Couleur pour les fichiers d'âge moyen :" - -#. +> trunk5 -#: optiondialog.cpp:865 -#, kde-format -msgid "Color for missing files:" -msgstr "Couleur pour les fichiers manquants :" - -#. +> trunk5 -#: optiondialog.cpp:878 -#, kde-format -msgid "Editor" -msgstr "Éditeur" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor Behavior" -msgstr "Comportement de l'éditeur" - -#. +> trunk5 -#: optiondialog.cpp:892 -#, kde-format -msgid "Tab inserts spaces" -msgstr "Une tabulation insère des espaces" - -#. +> trunk5 -#: optiondialog.cpp:895 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Activé : appuyer sur la touche de tabulation génère le nombre approprié d'espaces.\n" -"Désactivé : un caractère de tabulation va être inséré." - -#. +> trunk5 -#: optiondialog.cpp:900 -#, kde-format -msgid "Tab size:" -msgstr "Taille d'une tabulation :" - -#. +> trunk5 -#: optiondialog.cpp:906 -#, kde-format -msgid "Auto indentation" -msgstr "Indentation automatique" - -#. +> trunk5 -#: optiondialog.cpp:909 -#, kde-format -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" - -#. +> trunk5 -#: optiondialog.cpp:912 -#, kde-format -msgid "Auto copy selection" -msgstr "Copier automatiquement la sélection" - -#. +> trunk5 -#: optiondialog.cpp:915 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" -"Activé : toute sélection est immédiatement copiée dans le presse-papiers.\n" -"Désactivé : vous devrez effectuer la copie explicitement (ex. via Ctrl-C)." - -#. +> trunk5 -#: optiondialog.cpp:929 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Configure les fins de ligne quand un fichier modifié est enregistré.\n" -"DOS/Windows : CR+LF ; Unix : LF ; avec CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:939 -#, kde-format -msgid "Diff" -msgstr "Analyse des différences" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff Settings" -msgstr "Paramètres de l'analyse des différences" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:964 -#, fuzzy, kde-format -#| msgid "Ignore changes in the amount of whitespace" -msgid "Ignore numbers (treat as white space)" -msgstr "Ignorer les modifications du nombre de caractères de fin de ligne" - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Ignorer les caractères numériques durant une phase de mise en correspondance de lignes. (Similaire à « Ignorer les espaces »).\n" -"Peut aider à comparer des fichiers comportant des données numériques." - -#. +> trunk5 -#: optiondialog.cpp:971 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "Considérer les commentaires C/C++ comme des espaces." - -#. +> trunk5 -#: optiondialog.cpp:973 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Considérer les commentaires C/C++ comme des espaces." - -#. +> trunk5 -#: optiondialog.cpp:976 -#, fuzzy, kde-format -#| msgid "Ignore changes in the amount of whitespace" -msgid "Ignore case (treat as white space)" -msgstr "Ignorer les modifications du nombre de caractères de fin de ligne" - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Considérer les différences de casse comme des changements d'espaces. (« a »<=>« A »)" - -#. +> trunk5 -#: optiondialog.cpp:982 -#, kde-format -msgid "Preprocessor command:" -msgstr "Commande du préprocesseur :" - -#. +> trunk5 -#: optiondialog.cpp:986 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "Pré-traitement défini par l'utilisateur. (Voir les documentations pour les détails)" - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "Commande du préprocesseur pour la mise en correspondance de lignes :" - -#. +> trunk5 -#: optiondialog.cpp:993 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Ce préprocesseur n'est utilisé que durant la mise en correspondance de lignes\n" -"(consultez la documentation pour les détails)." - -#. +> trunk5 -#: optiondialog.cpp:996 -#, kde-format -msgid "Try hard (slower)" -msgstr "Essayer encore (plus lent)" - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -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 analyse de différences externe.\n" -"L'analyse de gros fichiers sera beaucoup plus lente." - -#. +> trunk5 -#: optiondialog.cpp:1003 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Aligner B et C pour 3 fichiers d'entrée" - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Essayez d'aligner B et C lors de la comparaison ou de la fusion de trois fichiers d'entrée.\n" -"Option non recommandée pour une effectuer une fusion, car cette dernière pourrait s'en trouver plus complexe.\n" -"(Par défaut, elle est désactivée)" - -#. +> trunk5 -#: optiondialog.cpp:1018 -#, kde-format -msgid "Merge Settings" -msgstr "Paramètres de la fusion" - -#. +> trunk5 -#: optiondialog.cpp:1032 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Délai d'avance automatique (en ms) :" - -#. +> trunk5 -#: optiondialog.cpp:1037 -#, kde-format -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 "" -"En mode Avance automatique, le résultat de la sélection actuelle est affiché \n" -"pour la période spécifiée, avant d'aller au conflit suivant. Intervalle : 0-2 000 ms" - -#. +> trunk5 -#: optiondialog.cpp:1041 -#, kde-format -msgid "Show info dialogs" -msgstr "Afficher les boîtes de dialogue d'information" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Affiche une boîte de dialogue contenant des informations sur le nombre de conflits." - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "Option par défaut pour les espaces lors de la fusion de 2 fichiers :" - -#. +> trunk5 -#: optiondialog.cpp:1050 optiondialog.cpp:1062 -#, kde-format -msgid "Manual Choice" -msgstr "Choix manuel" - -#. +> trunk5 -#: optiondialog.cpp:1054 optiondialog.cpp:1067 -#, kde-format -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "Autoriser l'algorithme de fusion à sélectionner automatiquement une entrée pour les changements d'espaces seuls." - -#. +> trunk5 -#: optiondialog.cpp:1058 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "Option par défaut pour les espaces lors de la fusion de 3 fichiers :" - -#. +> trunk5 -#: optiondialog.cpp:1071 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "Expression rationnelle de fusion automatique" - -#. +> trunk5 -#: optiondialog.cpp:1079 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "Expression rationnelle de fusion automatique :" - -#. +> trunk5 -#: optiondialog.cpp:1083 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Expression rationnelle pour les lignes depuis lesquelles KDiff3 devra choisir automatiquement une source.\n" -"Lorsqu'une ligne présentant un conflit correspond à l'expression rationnelle, alors\n" -"la ligne C - si elle est disponible, sera choisie, sinon ce sera la ligne B." - -#. +> trunk5 -#: optiondialog.cpp:1089 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "Exécuter la fusion automatique des expressions rationnelles au démarrage de la fusion" - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Exécute la fusion pour les expressions rationnelles de fusion automatique\n" -"immédiatement lorsqu'une fusion démarre.\n" - -#. +> trunk5 -#: optiondialog.cpp:1096 -#, kde-format -msgid "Version Control History Merging" -msgstr "Fusion de l'historique du contrôle de versions" - -#. +> trunk5 -#: optiondialog.cpp:1104 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "Expression rationnelle de début d'historique :" - -#. +> trunk5 -#: optiondialog.cpp:1108 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Expression rationnelle pour le début de la ligne d'historique de contrôle de versions.\n" -"Habituellement, cette ligne contient le mot clé « $Log$ ».\n" -"Valeur par défaut : « .*\\$Log.*\\$.* »" - -#. +> trunk5 -#: optiondialog.cpp:1114 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "Expression rationnelle de début d'un élément d'historique :" - -#. +> trunk5 -#: optiondialog.cpp:1126 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"Un élément d'historique de contrôle de versions se compose de plusieurs lignes.\n" -"Spécifiez l'expression rationnelle utilisée pour détecter la première ligne (sans le commentaire de début).\n" -"Regroupez à l'aide de parenthèses les clés que vous voulez utiliser pour le tri.\n" -"SI ce champ reste vide, alors KDiff3 part du principe que les lignes vides séparent les éléments de l'historique.\n" -"Consultez la documentation pour les détails." - -#. +> trunk5 -#: optiondialog.cpp:1134 -#, kde-format -msgid "History merge sorting" -msgstr "Tri de fusion de l'historique" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "Sort version control history by a key." -msgstr "Trie l'historique de contrôle de versions par clé." - -#. +> trunk5 -#: optiondialog.cpp:1146 -#, kde-format -msgid "History entry start sort key order:" -msgstr "Ordre des clés de tri du début de l'élément de l'historique :" - -#. +> trunk5 -#: optiondialog.cpp:1150 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Chaque paire de parenthèses utilisée dans l'expression rationnelle pour l'élément de début de l'historique\n" -"regroupe une clé susceptible d'être employée pour le tri.\n" -"Spécifiez la liste des clés (qui sont numérotées par ordre d'occurrence, \n" -"en commençant par 1) en utilisant « , » comme séparateur (par ex. « 4,5,6,1,2,3,7 »).\n" -"Si ce champ reste vide, alors aucun tri ne sera effectué.\n" -"Consultez la documentation pour les détails." - -#. +> trunk5 -#: optiondialog.cpp:1161 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "Fusionner l'historique de contrôle de versions lors du démarrage de la fusion" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "Exécuter la fusion automatique de l'historique de contrôle de versions au début de la fusion." - -#. +> trunk5 -#: optiondialog.cpp:1167 -#, kde-format -msgid "Max number of history entries:" -msgstr "Nombre maximal d'éléments d'historique :" - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Couper après le nombre spécifié. Utiliser -1 pour un nombre illimité d'éléments." - -#. +> trunk5 -#: optiondialog.cpp:1174 -#, kde-format -msgid "Test your regular expressions" -msgstr "Testez vos expressions rationnelles" - -#. +> trunk5 -#: optiondialog.cpp:1179 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "Commande de fusion non pertinente :" - -#. +> trunk5 -#: optiondialog.cpp:1183 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Si indiquée, ce script est lancé après une fusion automatique\n" -"quand aucun autre changement pertinent n'a été détecté.\n" -"Appelée avec les paramètres : nomfichier1 nomfichier2 nomfichier3" - -#. +> trunk5 -#: optiondialog.cpp:1188 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "Enregistrer automatiquement et quitter en cas de fusion sans conflits" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Lorsque KDiff3 a été lancé depuis la ligne de commande pour effectuer une fusion de fichiers et\n" -"que tous les conflits peuvent être résolus sans interaction de l'utilisateur, alors cette commande enregistre automatiquement et ferme l'application.\n" -"(Similaire à l'option en ligne de commande « --auto »)" - -#. +> trunk5 -#: optiondialog.cpp:1202 optiondialog.cpp:1203 -#, kde-format -msgid "Directory" -msgstr "Dossier" - -#. +> trunk5 -#: optiondialog.cpp:1215 -#, kde-format -msgid "Recursive directories" -msgstr "Dossiers récursifs" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Si vous voulez ou non analyser les sous-dossiers." - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "File pattern(s):" -msgstr "Motif(s) de fichiers :" - -#. +> trunk5 -#: optiondialog.cpp:1224 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Motif(s) de fichiers à analyser. \n" -"Jokers : « * » et «  ? » \n" -"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" - -#. +> trunk5 -#: optiondialog.cpp:1229 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "Motif(s) de fichiers refusé(s) :" - -#. +> trunk5 -#: optiondialog.cpp:1234 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Motif(s) de fichiers à exclure de l'analyse.\n" -"Jokers : « * » et « ? »\n" -"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" - -#. +> trunk5 -#: optiondialog.cpp:1239 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "Motif(s) de dossiers exclu(s) :" - -#. +> trunk5 -#: optiondialog.cpp:1244 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Motif(s) des dossiers à exclure de l'analyse. \n" -"Jokers : « * » et « ? »\n" -"Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" - -#. +> trunk5 -#: optiondialog.cpp:1249 -#, kde-format -msgid "Use .cvsignore" -msgstr "Utiliser .cvsignore" - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Étend l'exclusion de motif(s) à tout ce qui serait ignoré par CVS.\n" -"Via les fichiers « .cvsignore » locaux, ce peut être spécifique à un dossier." - -#. +> trunk5 -#: optiondialog.cpp:1256 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Chercher les fichiers et les dossiers cachés" - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Cherche les fichiers et les dossiers ayant l'attribut « caché »." - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Cherche les fichiers et les dossiers commençant par « . »." - -#. +> trunk5 -#: optiondialog.cpp:1265 -#, kde-format -msgid "Follow file links" -msgstr "Suivre les liens vers des fichiers" - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Activé : compare le fichier sur lequel pointe le lien.\n" -"Désactivé : compare les liens." - -#. +> trunk5 -#: optiondialog.cpp:1272 -#, kde-format -msgid "Follow directory links" -msgstr "Suivre les liens vers un dossier" - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Activé : compare le dossier sur lequel pointe le lien.\n" -"Désactivé : compare les liens." - -#. +> trunk5 -#: optiondialog.cpp:1290 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Tenir compte de la casse lors de la comparaison des noms de fichiers" - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" -"La comparaison de dossiers compare les fichiers ou les dossiers lorsque leurs noms correspondent.\n" -"Réglez cette option si la casse des noms doit correspondre. (Désactivée par défaut pour Windows, sinon Activée)" - -#. +> trunk5 -#: optiondialog.cpp:1297 -#, fuzzy, kde-format -#| msgid "May not make subdirectories of a file" -msgid "Unfold all subdirectories on load" -msgstr "Impossible de créer des sous-dossiers à un fichier" - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1304 -#, fuzzy, kde-format -#| msgid "Select directory to import:" -msgid "Skip directory status report" -msgstr "Sélectionnez le dossier à importer :" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1311 -#, kde-format -msgid "File Comparison Mode" -msgstr "Mode de comparaison de fichiers" - -#. +> trunk5 -#: optiondialog.cpp:1316 -#, kde-format -msgid "Binary comparison" -msgstr "Comparaison binaire" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Comparaison binaire de chaque fichier. (Par défaut)" - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, kde-format -msgid "Full analysis" -msgstr "Analyse complète" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Effectue une analyse complète et affiche les informations statistiques dans des colonnes supplémentaires.\n" -"(Plus lente qu'une comparaison binaire, beaucoup plus pour les fichiers binaires)" - -#. +> trunk5 -#: optiondialog.cpp:1325 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Se fier à la taille et à la date de modification (peu sûr)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n" -"Les fichiers ayant un contenu identique mais des dates de modification distinctes apparaîtront comme étant différents.\n" -"Utile pour les dossiers volumineux ou les réseaux lents." - -#. +> trunk5 -#: optiondialog.cpp:1331 -#, kde-format -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Se fier à la tailler et à la date, mais utiliser la comparaison binaire si la date ne correspond pas (peu sûr)" - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Suppose que les fichiers sont identiques si la date de modification et la longueur du fichier sont égales.\n" -"Si la date n'est pas identique mais que les tailles le sont, utilise la comparaison binaire.\n" -"Utile pour les dossiers volumineux ou les réseaux lents." - -#. +> trunk5 -#: optiondialog.cpp:1337 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Se fier à la taille (peu sûr)" - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" -"Suppose que tous les fichiers sont identiques si leurs longueurs sont égales.\n" -"Utile pour les dossiers volumineux ou les réseaux lents, quand la taille est modifiée durant le téléchargement." - -#. +> trunk5 -#: optiondialog.cpp:1345 -#, kde-format -msgid "Synchronize directories" -msgstr "Synchroniser les dossiers" - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Propose d'enregistrer les fichiers dans les deux dossiers pour que les deux dossiers soient identiques ensuite.\n" -"Fonctionne seulement quand la comparaison de deux dossiers ne spécifie pas de destination." - -#. +> trunk5 -#: optiondialog.cpp:1354 -#, kde-format -msgid "White space differences considered equal" -msgstr "Différences d'espaces considérées comme égales" - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Si les fichiers ne diffèrent que par des espaces, ils sont considérés comme identiques.\n" -"Cette fonction n'est active que si vous choisissez l'analyse complète." - -#. +> trunk5 -#: optiondialog.cpp:1363 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Copier le plus récent au lieu de fusionner (peu sûr)" - -#. +> trunk5 -#: optiondialog.cpp:1366 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"N'ouvre pas le fichier, se contente de prendre le plus récent.\n" -"(À n'utilisez que si vous savez ce que vous faites !)\n" -"Option effective seulement lors de la comparaison de dossiers." - -#. +> trunk5 -#: optiondialog.cpp:1371 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Sauvegarder les fichiers (.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Quand il s'agira d'enregistrer un fichier sur un fichier plus ancien, alors l'ancien\n" -"sera renommé avec une extension « .orig » au lieu d'être supprimé." - -#. +> trunk5 -#: optiondialog.cpp:1450 optiondialog.cpp:1451 -#, kde-format -msgid "Regional Settings" -msgstr "Paramètres régionaux" - -#. +> trunk5 -#: optiondialog.cpp:1465 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Utiliser le même encodage pour tout :" - -#. +> trunk5 -#: optiondialog.cpp:1468 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Cocher cette option permet de changer tous les encodages en ne modifiant que le premier.\n" -"Décochez-la si des paramètres individuels différents sont nécessaires." - -#. +> trunk5 -#: optiondialog.cpp:1472 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "Remarque : l'encodage local est" - -#. +> trunk5 -#: optiondialog.cpp:1476 -#, kde-format -msgid "File Encoding for A:" -msgstr "Encodage du fichier pour A :" - -#. +> trunk5 -#: optiondialog.cpp:1482 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Si cette option est cochée, alors l'encodage Unicode (UTF-16 ou UTF-8) sera détecté.\n" -"Si le fichier n'est pas en Unicode, alors l'encodage sélectionné sera utilisé comme solution de repli\n" -"(la détection de l'Unicode repose sur les premiers octets d'un fichier)." - -#. +> trunk5 -#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Détecter automatiquement Unicode" - -#. +> trunk5 -#: optiondialog.cpp:1490 -#, kde-format -msgid "File Encoding for B:" -msgstr "Encodage du fichier pour B :" - -#. +> trunk5 -#: optiondialog.cpp:1499 -#, kde-format -msgid "File Encoding for C:" -msgstr "Encodage du fichier pour C :" - -#. +> trunk5 -#: optiondialog.cpp:1508 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Encodage du fichier pour la sortie de la fusion et l'enregistrement :" - -#. +> trunk5 -#: optiondialog.cpp:1512 -#, kde-format -msgid "Auto Select" -msgstr "Sélectionner automatiquement" - -#. +> trunk5 -#: optiondialog.cpp:1515 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Si cette option est cochée, l'encodage provenant des fichiers d'entrée est utilisé.\n" -"Dans les cas ambigus, une boîte de dialogue demandera à l'utilisateur de choisir l'encodage pour l'enregistrement." - -#. +> trunk5 -#: optiondialog.cpp:1518 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Encodage du fichier pour les fichiers préprocesseurs :" - -#. +> trunk5 -#: optiondialog.cpp:1529 -#, kde-format -msgid "Right To Left Language" -msgstr "Langue de droite à gauche" - -#. +> trunk5 -#: optiondialog.cpp:1532 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Certaines langue se lisent de droite à gauche.\n" -"Ce paramètre changera l'afficheur et l'éditeur en conséquence." - -#. +> trunk5 -#: optiondialog.cpp:1542 -#, kde-format -msgid "Integration" -msgstr "Intégration" - -#. +> trunk5 -#: optiondialog.cpp:1543 -#, kde-format -msgid "Integration Settings" -msgstr "Paramètres d'intégration" - -#. +> trunk5 -#: optiondialog.cpp:1556 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Options en ligne de commande à ignorer :" - -#. +> trunk5 -#: optiondialog.cpp:1561 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Liste des options en ligne de commande qui devront être ignorées quand KDiff3 est utilisé par d'autres outils.\n" -"Plusieurs valeurs peuvent être spécifiées si on les sépare par des « ; »,\n" -"ce qui supprimera l'erreur « Option inconnue »." - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Quitter également à l'aide de la touche Echap" - -#. +> trunk5 -#: optiondialog.cpp:1569 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Méthode rapide pour sortir de l'application.\n" -"Pour les personnes qui sont habituées à utiliser la touche Echap." - -#. +> trunk5 -#: optiondialog.cpp:1653 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "Cette commande réinitialise toutes les options. Pas seulement celles de la rubrique actuelle." - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Problème de perte de données :\n" -"Si cela se reproduit, veuillez contacter l'auteur.\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "Erreur interne critique" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Commande de préprocesseur : " - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "Les options suivantes que vous avez choisies risquent de changer les données :\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Il est fort probable que ce ne soit pas souhaité durant une fusion.\n" -"Voulez-vous désactiver ces réglages ou continuer avec ces paramètres actifs ?" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Option peu sûre pour une fusion" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Utiliser ces options durant la fusion" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Désactiver les options peu sûres" - -#. +> trunk5 -#: pdiff.cpp:170 -#, kde-format -msgid "Loading A" -msgstr "Chargement de A" - -#. +> trunk5 -#: pdiff.cpp:177 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file A." -msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" - -#. +> trunk5 -#: pdiff.cpp:181 -#, kde-format -msgid "Loading B" -msgstr "Chargement de B" - -#. +> trunk5 -#: pdiff.cpp:188 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file B." -msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Différences : A <-> B" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Différences de lignes : A <-> B" - -#. +> trunk5 -#: pdiff.cpp:223 -#, kde-format -msgid "Loading C" -msgstr "Chargement de C" - -#. +> trunk5 -#: pdiff.cpp:230 -#, fuzzy, kde-format -#| msgid "An error occurred during processing the queue.\n" -msgid "Errors occurred during pre-processing of file C." -msgstr "Une erreur est survenue durant le traitement de la file d'attente.\n" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Différences : B <-> C" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Différences : A <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Différences de lignes : B <-> C" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Différences de lignes : A <-> C" - -#. +> trunk5 -#: pdiff.cpp:773 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "Tous les fichiers d'entrée contiennent le même texte, mais ne sont pas binairement identiques." - -#. +> trunk5 -#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Les fichiers %1 et %2 ont le même texte, mais ne sont pas binairement identiques. \n" - -#. +> trunk5 -#: pdiff.cpp:797 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\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 pur.\n" -"Notez que la fusion KDiff3 n'a pas été prévue pour les données binaires.\n" -"Continuez à vos risques et périls." - -#. +> trunk5 -#: pdiff.cpp:807 -#, fuzzy, kde-format -#| msgid ", " -msgid ", B" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:809 -#, fuzzy, kde-format -#| msgid ", " -msgid ", C" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:811 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Il est impossible de convertir certains caractères d'entrée en Unicode valable.\n" -"Il se peut que vous utilisiez un codec incorrect. (ex. UTF-8 pour les fichiers non-UTF-8).\n" -"N'enregistrez pas le résultat si vous avez un doute. Poursuivez à vos propres risques.\n" -"Les fichiers affectés sont dans %1." - -#. +> trunk5 -#: pdiff.cpp:1029 -#, kde-format -msgid "Abort" -msgstr "Abandonner" - -#. +> trunk5 -#: pdiff.cpp:1035 pdiff.cpp:1123 -#, kde-format -msgid "Opening files..." -msgstr "Ouverture des fichiers..." - -#. +> trunk5 -#: pdiff.cpp:1100 pdiff.cpp:1171 -#, kde-format -msgid "File open error" -msgstr "Erreur d'ouverture du fichier" - -#. +> trunk5 -#: pdiff.cpp:1210 -#, kde-format -msgid "Cutting selection..." -msgstr "Coupe de la sélection..." - -#. +> trunk5 -#: pdiff.cpp:1231 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Copie de la sélection dans le presse-papiers..." - -#. +> trunk5 -#: pdiff.cpp:1247 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Insertion du contenu du presse-papiers..." - -#. +> trunk5 -#: pdiff.cpp:1718 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1719 -#, fuzzy, kde-format -#| msgid "Show the horizontal scrollbar" -msgid "Calculating max width for horizontal scrollbar" -msgstr "Afficher l'ascenseur horizontal" - -#. +> trunk5 -#: pdiff.cpp:1930 -#, kde-format -msgid "Save && Continue" -msgstr "Enregistrer et continuer" - -#. +> trunk5 -#: pdiff.cpp:1931 -#, kde-format -msgid "Continue Without Saving" -msgstr "Continuer sans enregistrer" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search complete." -msgstr "Recherche terminée." - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search Complete" -msgstr "Recherche terminée" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Rien n'est sélectionné dans l'une ou l'autre des fenêtres d'entrée des différences." - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Erreur lors de l'ajout d'une plage de différences manuel" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "&Annuler" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (base) :" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "Fichier..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Dossier..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (optionnel) :" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "Permuter / Copier les noms..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Permuter %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Copier %1->Sortie" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Permuter %1<->Sortie" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Sortie (optionnel) :" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Configurer..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, kde-format -msgid "Open Directory" -msgstr "Ouvrir un dossier" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Select output file" -msgid "Select Output File" -msgstr "Sélectionnez le fichier de sortie" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Texte à chercher :" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Tenir compte de la casse" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Chercher dans A" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Chercher dans B" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Chercher dans C" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Chercher dans la sortie" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Chercher" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Contrôleur d'expressions rationnelles" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Exemple de ligne de fusion automatique :" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "Pour effectuer un test de fusion automatique, copiez une ligne comme utilisé dans vos fichiers." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Résultat de la correspondance :" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Exemple de ligne de début d'historique (avec commentaire de départ) :" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Copiez une ligne de début d'historique comme utilisé dans vos fichiers,\n" -"y compris le commentaire de départ." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Ordre des clés de tri de l'historique :" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "Exemple de ligne de début d'élément d'historique (avec commentaire de départ) :" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Copiez une ligne de début d'élément d'historique comme utilisé dans vos fichiers,\n" -"mais en omettant le commentaire de départ." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "Résultat de la clé de tri :" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Correspondance correcte." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Correspondance incorrecte." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Les parenthèses d'ouverture et de fermeture ne correspondent pas dans l'expression rationnelle." - -#~ msgid "Integrate with ClearCase" -#~ msgstr "Intégrer avec ClearCase" - -#~ msgid "" -#~ "Integrate with Rational ClearCase from IBM.\n" -#~ "Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -#~ "(Only enabled when ClearCase \"bin\" directory is in the path.)" -#~ msgstr "" -#~ "Intégrer avec Rational ClearCase de IBM.\n" -#~ "Change le fichier « map » en sous-dossier « lib/mgrs » de ClearCase\n" -#~ "(activé uniquement quand le dossier « bin » de ClearCase est dans l'emplacement)." - -#~ msgid "Remove ClearCase Integration" -#~ msgstr "Supprimer l'intégration de ClearCase" - -#~ msgid "Restore the old \"map\" file from before doing the ClearCase integration." -#~ msgstr "Restaurer à partir de l'ancien fichier « map » avant d'effectuer l'intégration de Clearcase." - -#~ msgid "&Merge" -#~ msgstr "&Fusion" - -#~ msgid "Line" -#~ msgstr "Ligne" - -#~ msgid "Directory Comparison Status" -#~ msgstr "État de la comparaison des dossiers" - -#~ msgid "Number of subdirectories:" -#~ msgstr "Nombre de sous-dossiers :" - -#~ msgid "Number of equal files:" -#~ msgstr "Nombre de fichiers identiques :" - -#~ msgid "Number of different files:" -#~ msgstr "Nombre de fichiers différents :" - -#~ msgid "Processing " -#~ msgstr "En cours " - -#~ msgid "Selection" -#~ msgstr "Sélection" - -#~ msgid "Total number of conflicts: " -#~ msgstr "Nombre total de conflits : " - -#~ msgid "" -#~ "\n" -#~ "Nr of automatically solved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Nombre de conflits résolus automatiquement : " - -#~ msgid "" -#~ "\n" -#~ "Nr of unsolved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Nombre de conflits non résolus : " - -#~ msgid "Output" -#~ msgstr "Sortie" - -#~ msgid "Treat as white space." -#~ msgstr "Considérer comme des espaces." - -#~ msgid "Ignore numbers" -#~ msgstr "Ignorer les nombres" - -#~ msgid "Ignore C/C++ comments" -#~ msgstr "Ignorer les commentaires C/C++" - -#~ msgid "Ignore case" -#~ msgstr "Ignorer la casse" - -#~ msgid "Cancel" -#~ msgstr "Annuler" - -#~ msgid "Ok" -#~ msgstr "Ok" - -#~ msgid "Help" -#~ msgstr "Aide" - -#~ msgid "Defaults" -#~ msgstr "Par défaut" - -#~ msgid "&Edit" -#~ msgstr "&Édition" - -#~ msgid "&Settings" -#~ msgstr "&Configuration" - -#~ msgid "&Help" -#~ msgstr "&Aide" - -#~ msgid "&About" -#~ msgstr "À &propos" - -#~ msgid "A&uthor" -#~ msgstr "A&uteur" - -#~ msgid "&Thanks To" -#~ msgstr "&Remerciements à" - -#~ msgid "Open" -#~ msgstr "Ouvrir" - -#~ msgid "Save" -#~ msgstr "Enregistrer" - -#~ msgid "Print..." -#~ msgstr "Imprimer..." - -#~ msgid "Quit" -#~ msgstr "Quitter" - -#~ msgid "Cut" -#~ msgstr "Couper" - -#~ msgid "Copy" -#~ msgstr "Copier" - -#~ msgid "Paste" -#~ msgstr "Coller" - -#~ msgid "Select All" -#~ msgstr "Tout sélectionner" - -#~ msgid "Show Toolbar" -#~ msgstr "Afficher la barre d'outils" - -#~ msgid "Show &Status Bar" -#~ msgstr "Afficher l'a barre d'ét&at" - -#~ msgid "&Configure %1..." -#~ msgstr "&Configurer %1..." - -#~ msgid "About" -#~ msgstr "À propos de" - -#~ msgid "Find" -#~ msgstr "Chercher" - -#~ msgid "Find Next" -#~ msgstr "Poursuivre la recherche" - -#~ msgid "For more documentation, see the help-menu or the subdirectory doc." -#~ msgstr "Pour plus d'informations, consultez le menu d'aide ou le fichier de documentation du sous-dossier." - -#~ msgid "KDiff3-Usage" -#~ msgstr "Utilisation de KDiff3" - -#~ msgid "Ignore" -#~ msgstr "Ignorer" - -#~ msgid "Exit" -#~ msgstr "Quitter" - -#~ msgid "Continue" -#~ msgstr "Continuer" - -#~ msgid "Language (restart required)" -#~ msgstr "Langue (redémarrage nécessaire)" - -#~ msgid "" -#~ "Choose the language of the GUI strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "Choisissez la langue des chaînes de l'interface graphique ou « Auto ».\n" -#~ "Pour qu'un changement de langue entre en vigueur, quittez et redémarrez KDiff3." - -#~ msgid "kdiff3" -#~ msgstr "kdiff3" - -#~ msgid "&OK" -#~ msgstr "&Ok" - -#~ msgid "OK" -#~ msgstr "Ok" - -#, fuzzy -#~| msgid "(c) 2002-2011 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "(c) 2002-2011 Joachim Eibl" - -#~ 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 "" -#~ "Cela ne devrait jamais arriver : \n" -#~ "\n" -#~ "mergeResultSaved : m_pMFI=0\n" -#~ "\n" -#~ "Si vous savez comment le reproduire, veuillez contacter l'auteur du programme." - -#~ msgid "Program Error" -#~ msgstr "Erreur du programme" - -#~ msgid "Error." -#~ msgstr "Erreur." - -#~ msgid "Done." -#~ msgstr "Fait." - -#~ msgid "Select Font" -#~ msgstr "Choisir une police" - -#~ 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 "" -#~ "Vous avez choisi une police à chasse variable.\n" -#~ "\n" -#~ "Étant donné que ce programme ne gère pas polices à chasse variable correctement,\n" -#~ "vous pourriez rencontrer des problèmes lors de l'édition.\n" -#~ "\n" -#~ "Voulez-vous continuer ou choisir une autre police." - -#~ msgid "Incompatible font." -#~ msgstr "Police incompatible." - -#~ msgid "Continue at my own risk" -#~ msgstr "Continuer à vos risques et périls" - -#~ msgid "Select another font" -#~ msgstr "Choisir une autre police" - -#~ msgid "Eike Sauer" -#~ msgstr "Eike Sauer" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "Corrections de bogues, mainteneur de paquetages Debian" - -#~ msgid "Sebastien Fricker" -#~ msgstr "Sebastien Fricker" - -#~ msgid "Windows installer" -#~ msgstr "Programme d'installation Windows" - -#~ msgid "Stephan Binner" -#~ msgstr "Stephan Binner" - -#~ msgid "i18n-help" -#~ msgstr "Aide de i18n" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "Stefan Partheymueller" - -#~ msgid "Clipboard-patch" -#~ msgstr "Correctif pour le presse-papiers" - -#~ msgid "David Faure" -#~ msgstr "David Faure" - -#~ msgid "KIO-Help" -#~ msgstr "Aide de KIO" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "Bernd Gehrmann" - -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Classe CvsIgnoreList de Cervisia" - -#~ msgid "Andre Woebbeking" -#~ msgstr "Andre Woebbeking" - -#~ msgid "Class StringMatcher" -#~ msgstr "Classe StringMatcher" - -#~ msgid "Michael Denio" -#~ msgstr "Michael Denio" - -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "Correctif de coloration d'égalité des dossiers" - -#~ msgid "Manfred Koehler" -#~ msgstr "Manfred Koehler" - -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Correction du démarrage lent sous Windows" - -#~ msgid "Sergey Zorin" -#~ msgstr "Sergey Zorin" - -#~ msgid "Diff Ext for Windows" -#~ msgstr "Extension Diff pour Windows" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#~ msgid "GNU-Diffutils" -#~ msgstr "GNU-Diffutils" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "Tino Boellsterling, Timothy Mee" - -#~ msgid "Intensive test, use and feedback" -#~ msgstr "Tests intensifs, utilisation et retour d'informations" - -#~ msgid "Michael Schmidt" -#~ msgstr "Michael Schmidt" - -#~ msgid "Mac support" -#~ msgstr "Prise en charge pour Mac" - -#~ msgid "Valentin Rusu" -#~ msgstr "Valentin Rusu" - -#~ msgid "KDE4 porting" -#~ msgstr "Portage vers KDE4" - -#~ msgid "Albert Astals Cid" -#~ msgstr "Albert Astals Cid" - -#~ msgid "Silvan Scherrer" -#~ msgstr "Silvan Scherrer" - -#~ msgid "OS2 port" -#~ msgstr "Portage vers OS2" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "Et de nombreux remerciements à ceux qui ont signalé des bogues et contribué à des idées !" - -#~ msgid "Italic font for deltas" -#~ msgstr "Police en italique pour les deltas" - -#~ 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 de la police pour les différences.\n" -#~ "Si la police ne prend pas en charge les caractères en italique, cette commande n'a aucun effet." - -#~ msgid "Incompatible Font" -#~ msgstr "Police incompatible" - -#~ msgid "Continue at Own Risk" -#~ msgstr "Continuer à vos risques et périls" - -#~ msgid "Select Another Font" -#~ msgstr "Sélectionner une autre police" Index: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,68 +0,0 @@ -# translation of desktop_extragear-utils_kdiff3.po to Français -# traduction de ...po en Français -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011 Free Software Foundation, Inc. -# Pierre "delroth" Bourdon -# Simon "asmanur" Castellan -# Grégoire "Metzgermeister" Duchêne -# Quentin "Cygal" Pradet -# Gabriel "bluestorm" Scherer -# Kevin "Katen" Soltysiak -# Najib Zulon Idrissi Katouni -# Thomas 'Dark-Side' Refis -# Nicolas Ternisien , 2008. -# Joëlle Cornavin , 2011. -# xavier , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2013-06-27 16:55+0200\n" -"Last-Translator: xavier \n" -"Language-Team: French \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "Module KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Interface graphique pour « Diff » / « Patch »" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »" - -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "KDiff3" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "Comparaison et fusion de fichiers ou de dossiers" Property changes on: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._desktop_.po ___________________________________________________________________ Deleted: LAST-REVIEW-BY ## -1 +0,0 ## -Xavier Besnard \ No newline at end of property Deleted: LAST-REVIEW-DATE ## -1 +0,0 ## -2013-06-27 \ No newline at end of property Index: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._json_.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._json_.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3._json_.po (nonexistent) @@ -1,23 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: json files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2018-02-22 04:31+0000\n" -"Last-Translator: KDE Francophone \n" -"Language-Team: KDE Francophone \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »" Index: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,127 +0,0 @@ -# translation of kdiff3fileitemactionplugin.po to Français -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Joëlle Cornavin , 2011. -# xavier , 2013. -# Simon Depiets , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2018-07-23 15:45+0800\n" -"Last-Translator: Simon Depiets \n" -"Language-Team: French \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 2.0\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, kde-format -#| msgid "KDiff3 ..." -msgid "KDiff3..." -msgstr "KDiff3..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "Comparer avec %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "Fusionner avec %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "Enregistrer « %1 » pour plus tard" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "Fusion de trois versions de fichiers avec la base" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, kde-format -#| msgid "Compare with ..." -msgid "Compare with..." -msgstr "Comparer avec..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "Effacer une liste" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "Comparer" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "Comparaison de trois versions de fichiers" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, kde-format -#| msgid "About KDiff3 menu plugin ..." -msgid "About KDiff3 menu plugin..." -msgstr "À propos du module externe de menu KDiff3..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Module externe d'actions sur des éléments de fichiers pour KDiff3. Copyright (C) 2011 Joachim Eibl\n" -"Page d'accueil de KDiff3 : http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Utilisation de l'extension du menu contextuel :\n" -"Pour une comparaison simple de deux fichiers sélectionnés, choisissez « Comparer ».\n" -"Si l'autre fichier se trouve dans un autre endroit quelconque, « enregistrez » le premier fichier pour plus tard. Il apparaîtra dans le sous-menu « Comparer avec... ». Puis utilisez « Comparer avec » sur le second fichier.\n" -"Pour une fusion de 3 fichiers, « enregistrez » d'abord le fichier base, puis la branche à fusionner et choisissez « Fusion de trois versions de fichiers avec la base » sur l'autre branche, qui sera utilisée comme destination.\n" -"Le même principe s'applique à la comparaison et à la fusion de dossiers." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "À propos du module externe d'actions sur des éléments de fichiers pour KDiff3" Property changes on: trunk/l10n-support/fr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po ___________________________________________________________________ Deleted: LAST-REVIEW-BY ## -1 +0,0 ## -Xavier Besnard \ No newline at end of property Deleted: LAST-REVIEW-DATE ## -1 +0,0 ## -2013-06-27 \ No newline at end of property Index: trunk/l10n-support/fr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (nonexistent) @@ -1,95 +0,0 @@ -# Simon Depiets , 2018. -msgid "" -msgstr "" -"Project-Id-Version: org.kde.kdiff3.appdata\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-07-11 09:18+0200\n" -"PO-Revision-Date: 2018-07-25 17:45+0800\n" -"Last-Translator: Simon Depiets \n" -"Language-Team: French \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 2.0\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. (itstool) path: component/name -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:6 -msgid "KDiff3" -msgstr "KDiff3" - -#. (itstool) path: component/summary -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:7 -#| msgctxt "Comment" -#| msgid "A File And Directory Comparison And Merge Tool" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers" - -#. (itstool) path: description/p -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:11 -msgid "KDiff3 is a file and directory diff and merge tool which" -msgstr "KDiff3 est un outil de comparaison et de fusion de fichiers et de dossiers qui" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:13 -msgid "compares and merges two or three text input files or directories," -msgstr "compare et fusionne deux ou trois fichiers ou dossiers en entrée," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:14 -msgid "shows the differences line by line and character by character(!)," -msgstr "affiche les différences ligne par ligne et caractère par caractère (!)," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:15 -msgid "provides an automatic merge-facility," -msgstr "offre des fonctionnalités de fusion automatique," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:16 -msgid "has an editor for comfortable solving of merge-conflicts," -msgstr "dispose d'un éditeur pour résoudre confortablement les conflits lors de la fusion," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:17 -msgid "provides network transparency via KIO," -msgstr "fournit une transparence réseau via KIO," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:18 -msgid "has options to highlight or hide changes in white-space or comments," -msgstr "dispose d'options permettant de surligner ou de cacher les différences d'espaces ou de commentaires," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:19 -#| msgid "Use Unicode (UTF-8) encoding" -msgid "supports Unicode, UTF-8 and other file encodings," -msgstr "prend en charge Unicode, UTF-8 et d'autres encodages de fichiers," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:20 -#| msgid "Preferences" -msgid "prints differences," -msgstr "affiche les différences," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:21 -#| msgid "Sort version control history by a key." -msgid "supports version control keyword and history merging." -msgstr "prend en charge les mots clés de contrôle de version et la fusion des historiques." Index: trunk/l10n-support/fr/summit/messages/playground-devtools/diff_ext.po =================================================================== --- trunk/l10n-support/fr/summit/messages/playground-devtools/diff_ext.po (revision 1522186) +++ trunk/l10n-support/fr/summit/messages/playground-devtools/diff_ext.po (nonexistent) @@ -1,175 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-06 07:33+0200\n" -"PO-Revision-Date: 2018-08-07 04:38+0000\n" -"Last-Translator: KDE Francophone \n" -"Language-Team: KDE Francophone \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: diff_ext.cpp:391 -#, kde-format -msgid "Compare with %1" -msgstr "Comparer avec %1" - -#. +> trunk5 -#: diff_ext.cpp:392 -#, kde-format -msgid "Merge with %1" -msgstr "Fusionner avec %1" - -#. +> trunk5 -#: diff_ext.cpp:408 -#, kde-format -msgid "3-way merge with base" -msgstr "Fusion de trois versions de fichiers avec la base" - -#. +> trunk5 -#: diff_ext.cpp:411 -#, kde-format -msgid "Save '%1' for later" -msgstr "Enregistrer « %1 » pour plus tard" - -#. +> trunk5 -#: diff_ext.cpp:426 -#, kde-format -msgid "Compare with ..." -msgstr "Comparer avec..." - -#. +> trunk5 -#: diff_ext.cpp:429 -#, kde-format -msgid "Clear list" -msgstr "Effacer une liste" - -#. +> trunk5 -#: diff_ext.cpp:434 -#, kde-format -msgid "Compare" -msgstr "Comparer" - -#. +> trunk5 -#: diff_ext.cpp:438 -#, kde-format -msgid "3 way comparison" -msgstr "Comparaison de trois versions de fichiers" - -#. +> trunk5 -#: diff_ext.cpp:444 -#, fuzzy, kde-format -#| msgid "Export Diff..." -msgid "About Diff-Ext ..." -msgstr "Exporter le fichier « diff »..." - -#. +> trunk5 -#: diff_ext.cpp:515 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " Bit" -#| msgid_plural " Bits" -msgid "(32 Bit)" -msgstr " Bit" - -#. +> trunk5 -#: diff_ext.cpp:517 -#, fuzzy, kde-format -#| msgid "16 Bits" -msgid "(64 Bit)" -msgstr "16 bits" - -#. +> trunk5 -#: diff_ext.cpp:518 -#, kde-format -msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:519 -#, fuzzy, kde-format -#| msgid "This program is distributed under the terms of the %1." -msgid "This software is distributable under the BSD-2-Clause license.\n" -msgstr "Ce programme est distribué selon les termes de la %1." - -#. +> trunk5 -#: diff_ext.cpp:520 -#, kde-format -msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:521 -#, kde-format -msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:522 -#, fuzzy, kde-format -#| msgid "http://kwave.sourceforge.net" -msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net" -msgstr "http://kwave.sourceforge.net" - -#. +> trunk5 -#: diff_ext.cpp:523 -#, kde-format -msgid "About Diff-Ext for KDiff3 " -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:552 -#, fuzzy, kde-format -#| msgid "Compare Selected File" -msgid "Compare selected files" -msgstr "Comparer le fichier sélectionné" - -#. +> trunk5 -#: diff_ext.cpp:558 diff_ext.cpp:578 -#, fuzzy, kde-format -#| msgid "Replace '%1' with '%2'?" -msgid "Compare '%1' with '%2'" -msgstr "Remplacer « %1 » par « %2 » ?" - -#. +> trunk5 -#: diff_ext.cpp:564 -#, fuzzy, kde-format -#| msgid "Save '%1' for later" -msgid "Save '%1' for later operation" -msgstr "Enregistrer « %1 » pour plus tard" - -#. +> trunk5 -#: diff_ext.cpp:620 -#, fuzzy, kde-format -#| msgid "Could not start the ImportWizard. Please check your installation." -msgid "Could not start KDiff3. Please rerun KDiff3 installation." -msgstr "Impossible de lancer l'assistant d'importation. Veuillez vérifier votre installation." - -# | msgid "Comment" -#. +> trunk5 -#: diff_ext.cpp:621 -#, kde-format -msgid "Command" -msgstr "Commande" - -#. +> trunk5 -#: diff_ext.cpp:622 -#, fuzzy, kde-format -#| msgid "Command Line" -msgid "CommandLine" -msgstr "Ligne de commande" - -#. +> trunk5 -#: diff_ext.cpp:623 -#, fuzzy, kde-format -#| msgid "Diff Ext for Windows" -msgid "Diff-Ext For KDiff3" -msgstr "Extension Diff pour Windows" Index: trunk/l10n-support/hr/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/hr/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/hr/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,65 @@ +# Translation of desktop_extragear-utils_kdiff3 to Croatian +# +# Andrej Dundovic , 2010. +msgid "" +msgstr "" +"Project-Id-Version: desktop files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2011-05-18 09:02+0200\n" +"PO-Revision-Date: 2010-01-24 16:50+0100\n" +"Last-Translator: Andrej Dundovic \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 +#: kdiff3plugin/kdiff3plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:43 +#, fuzzy +msgctxt "X-KDE-Submenu" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3plugin/kdiff3_plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories" +msgstr "" + +#. +> trunk +#: src/kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: src/kdiff3.desktop:42 +#, fuzzy +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Sučelje za Diff/Patch " + +#. +> trunk +#: src/kdiff3.desktop:85 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "" + +#. +> trunk +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "" Index: trunk/l10n-support/hr/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/hr/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/hr/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,3590 @@ +# Translation of kdiff3 to Croatian +# +# Andrej Dundovic , 2010. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2011-09-01 10:10+0200\n" +"PO-Revision-Date: 2010-01-24 16:47+0100\n" +"Last-Translator: Andrej Dundovic \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" + +#. +> trunk +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" + +#. +> trunk +#: diff.cpp:251 +msgid "Writing clipboard data to temp file failed." +msgstr "" + +#. +> trunk +#: diff.cpp:255 +msgid "From Clipboard" +msgstr "" + +#. +> trunk +#: diff.cpp:537 +#, fuzzy +msgid "Expecting space after closing apostroph." +msgstr "Automatski dodaj završni znak citata" + +#. +> trunk +#: diff.cpp:540 +#, fuzzy +msgid "Not matching apostrophs." +msgstr "Nema podudaranja ni sa jednim ključem" + +#. +> trunk +#: diff.cpp:562 +#, fuzzy +msgid "Unexpected apostroph within argument." +msgstr "Nepčekivani argument '%1'." + +#. +> trunk +#: diff.cpp:569 +#, fuzzy +msgid "No program specified." +msgstr "Program nije definiran" + +#. +> trunk +#: diff.cpp:671 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" + +#. +> trunk +#: diff.cpp:719 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" + +#. +> trunk +#: diff.cpp:1850 diff.cpp:1864 +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" + +#. +> trunk +#: diff.cpp:1852 diff.cpp:1866 +msgid "Severe Internal Error" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 +#, fuzzy +msgid "File" +msgstr "Datoteka" + +#. +> trunk +#: difftextwindow.cpp:403 +#, fuzzy +msgid "Line" +msgstr "Crta" + +#. +> trunk +#: difftextwindow.cpp:405 +msgid "Line not available" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 +#, fuzzy +msgid "Encoding:" +msgstr "Kodiranje:" + +#. +> trunk +#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 +#: optiondialog.cpp:762 +msgid "Line end style:" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 +msgid "Unix" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 +msgid "DOS" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:1759 kdiff3.cpp:831 +msgid "Top line" +msgstr "" + +#. +> trunk +#: difftextwindow.cpp:1769 +#, fuzzy +msgid "End" +msgstr "Kraj" + +#. +> trunk +#: directorymergewindow.cpp:150 +msgid "Mix of links and normal files." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:157 +msgid "Link: " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:165 +msgid "Size. " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 +msgid "Date & Size: " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 +#, kde-format +msgid "Opening %1 failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:227 +msgid "Comparing file..." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 +#, kde-format +msgid "Error reading from %1" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:372 +#, fuzzy +msgid "Name" +msgstr "Ime" + +#. +> trunk +#: directorymergewindow.cpp:372 +#, fuzzy +msgid "Operation" +msgstr "Operacija" + +#. +> trunk +#: directorymergewindow.cpp:372 +#, fuzzy +msgid "Status" +msgstr "Status" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Unsolved" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Solved" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Nonwhite" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "White" +msgstr "Bijelo" + +#. +> trunk +#: directorymergewindow.cpp:402 +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 +#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 +#, fuzzy +msgid "Warning" +msgstr "Upozorenje" + +#. +> trunk +#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 +msgid "Rescan" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:405 pdiff.cpp:1081 +msgid "Continue Merging" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:562 +msgid "Opening of directories failed:" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:565 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:568 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:571 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:573 +msgid "Directory Open Error" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:581 +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:583 +msgid "Parameter Warning" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:588 +msgid "Scanning directories..." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:621 +msgid "Reading Directory A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:643 +msgid "Reading Directory B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:665 +msgid "Reading Directory C" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:691 +msgid "Some subdirectories were not readable in" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:696 +msgid "Check the permissions of the subdirectories." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 +#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 +#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 +#, fuzzy +msgid "Ready." +msgstr "Spreman." + +#. +> trunk +#: directorymergewindow.cpp:749 +msgid "Directory Comparison Status" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:750 +msgid "Number of subdirectories:" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:751 +msgid "Number of equal files:" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:752 +msgid "Number of different files:" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:755 +msgid "Number of manual merges:" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:926 +msgid "This affects all merge operations." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:927 +msgid "Changing All Merge Operations" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1326 +msgid "Processing " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 +msgid "To do." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 +msgid "Copy A to B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 +msgid "Copy B to A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 +msgid "Delete A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 +msgid "Delete B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1828 +msgid "Delete A & B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 +msgid "Merge to A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 +msgid "Merge to B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1831 +msgid "Merge to A & B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 +msgid "Delete (if exists)" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 +#, fuzzy +msgid "Merge" +msgstr "Spajanje" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +msgid "Merge (manual)" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1838 +msgid "Error: Conflicting File Types" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1839 +msgid "Error: Changed and Deleted" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1840 +msgid "Error: Dates are equal but files are not." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 +msgid "This operation is currently not possible." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 +msgid "Operation Not Possible" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1959 +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 "" + +#. +> trunk +#: directorymergewindow.cpp:1959 +msgid "Program Error" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1970 +msgid "An error occurred while copying.\n" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 +#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 +#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 +#: directorymergewindow.cpp:2388 +#, fuzzy +msgid "Error" +msgstr "Greška" + +#. +> trunk +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 +msgid "Merge Error" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 +#, fuzzy +msgid "Error." +msgstr "Greška." + +#. +> trunk +#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 +#: directorymergewindow.cpp:2326 +#, fuzzy +msgid "Done." +msgstr "Gotovo." + +#. +> trunk +#: directorymergewindow.cpp:2004 +msgid "Not saved." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2039 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2071 +msgid "Unknown merge operation." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2086 +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 "" + +#. +> trunk +#: directorymergewindow.cpp:2091 +msgid "Starting Merge" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2092 +msgid "Do It" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2093 +msgid "Simulate It" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2119 +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2128 +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2137 +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2188 +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2248 +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 "" + +#. +> trunk +#: directorymergewindow.cpp:2250 +msgid "Continue merge after an error" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2251 +msgid "Continue With Last Item" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2252 +msgid "Skip Item" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2286 +msgid "Skipped." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 +msgid "In progress..." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2341 +msgid "Merge operation complete." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 +msgid "Merge Complete" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2354 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2388 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2420 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2427 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2429 +#, kde-format +msgid "delete( %1 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2444 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2463 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2473 +msgid "Error: delete operation failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2499 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2502 +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2527 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2536 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2547 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2553 +msgid "Error: copyLink failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2578 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2604 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2610 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2619 +msgid "Error: Rename failed." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2637 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2653 +#, kde-format +msgid "makeDir( %1 )" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2663 +msgid "Error while creating directory." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 +msgid "Dest" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 +msgid "Dir" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2692 +#, fuzzy +msgid "Type" +msgstr "Tip" + +#. +> trunk +#: directorymergewindow.cpp:2692 +#, fuzzy +msgid "Size" +msgstr "Veličina" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Attr" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Last Modification" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Link-Destination" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2740 +#, fuzzy +msgid "not available" +msgstr "nije dostupno" + +#. +> trunk +#: directorymergewindow.cpp:2760 +msgid "A (Dest): " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2763 +msgid "A (Base): " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2769 +msgid "B (Dest): " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2777 +msgid "C (Dest): " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2783 +msgid "Dest: " +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2850 +msgid "Save Directory Merge State As..." +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2973 +msgid "Start/Continue Directory Merge" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2974 +msgid "Run Operation for Current Item" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2975 +msgid "Compare Selected File" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "Merge Current File" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "" +"Merge\n" +"File" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2977 +msgid "Fold All Subdirs" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2978 +msgid "Unfold All Subdirs" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2982 +msgid "Choose A for All Items" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2983 +msgid "Choose B for All Items" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2984 +msgid "Choose C for All Items" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2985 +msgid "Auto-Choose Operation for All Items" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2986 +msgid "No Operation for All Items" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "Show Identical Files" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "" +"Identical\n" +"Files" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2992 +msgid "Show Different Files" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "Show Files only in A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "" +"Files\n" +"only in A" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "Show Files only in B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "" +"Files\n" +"only in B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "Show Files only in C" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "" +"Files\n" +"only in C" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:2999 +msgid "Compare Explicitly Selected Files" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:3000 +msgid "Merge Explicitly Selected Files" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 +#, fuzzy +msgid "Do Nothing" +msgstr "Ništa nemoj raditi" + +#. +> trunk +#: directorymergewindow.cpp:3003 +#, fuzzy +msgid "A" +msgstr "A" + +#. +> trunk +#: directorymergewindow.cpp:3004 +#, fuzzy +msgid "B" +msgstr "B" + +#. +> trunk +#: directorymergewindow.cpp:3005 +#, fuzzy +msgid "C" +msgstr "C" + +#. +> trunk +#: directorymergewindow.cpp:3014 +msgid "Delete A && B" +msgstr "" + +#. +> trunk +#: directorymergewindow.cpp:3017 +msgid "Merge to A && B" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:617 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" + +#. +> trunk +#: fileaccess.cpp:624 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" + +#. +> trunk +#: fileaccess.cpp:648 +#, kde-format +msgid "Getting file status: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:691 +#, kde-format +msgid "Reading file: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:728 +#, kde-format +msgid "Writing file: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:756 +#, fuzzy +msgid "Out of memory" +msgstr "Nema više memorije" + +#. +> trunk +#: fileaccess.cpp:791 +#, kde-format +msgid "Making directory: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:811 +#, kde-format +msgid "Removing directory: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:826 +#, kde-format +msgid "Removing file: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:842 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:869 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:902 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:916 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:922 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:937 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:946 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:1236 +msgid "Reading directory: " +msgstr "" + +#. +> trunk +#: fileaccess.cpp:1360 +#, kde-format +msgid "Listing directory: %1" +msgstr "" + +#. +> trunk +#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 +#, fuzzy +msgid "&Cancel" +msgstr "&Odustani" + +#. +> trunk +#: kdiff3.cpp:169 +msgid "Current Configuration:" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:174 +msgid "Config Option Error:" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:219 +msgid "Option --auto used, but no output file specified." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:369 +msgid "Option --auto ignored for directory comparison." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:405 +msgid "Saving failed." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 +msgid "Opening of these files failed:" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:449 +msgid "File Open Error" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:477 +msgid "Opens documents for comparison..." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:479 +#, fuzzy +msgid "Reload" +msgstr "Ponovno učitati" + +#. +> trunk +#: kdiff3.cpp:482 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:484 +msgid "Saves the current document as..." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:487 +msgid "Print the differences" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:490 +#, fuzzy +msgid "Quits the application" +msgstr "Izlazi iz aplikacije" + +#. +> trunk +#: kdiff3.cpp:492 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:494 +#, fuzzy +msgid "Copies the selected section to the clipboard" +msgstr "Kopira označeno na odlagalište" + +#. +> trunk +#: kdiff3.cpp:496 +#, fuzzy +msgid "Pastes the clipboard contents to current position" +msgstr "Zalijepi sadržaje odlagališta" + +#. +> trunk +#: kdiff3.cpp:498 +msgid "Select everything in current window" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:500 +msgid "Search for a string" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:502 +msgid "Search again for the string" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:507 +msgid "Enables/disables the statusbar" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:511 +msgid "Configure KDiff3..." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:532 +msgid "Go to Current Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:532 +msgid "" +"Current\n" +"Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "Go to First Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "" +"First\n" +"Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "Go to Last Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "" +"Last\n" +"Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:538 +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:539 +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "Go to Previous Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "" +"Prev\n" +"Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "Go to Next Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "" +"Next\n" +"Delta" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "Go to Previous Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "" +"Prev\n" +"Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "Go to Next Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "" +"Next\n" +"Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "Go to Previous Unsolved Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "" +"Prev\n" +"Unsolved" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "Go to Next Unsolved Conflict" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "" +"Next\n" +"Unsolved" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "Select Line(s) From A" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "" +"Choose\n" +"A" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "Select Line(s) From B" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "" +"Choose\n" +"B" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "Select Line(s) From C" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "" +"Choose\n" +"C" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "" +"Auto\n" +"Next" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "Show Space && Tabulator Characters for Differences" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "" +"White\n" +"Characters" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "Show White Space" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "" +"White\n" +"Deltas" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "Show Line Numbers" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "" +"Line\n" +"Numbers" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:561 +msgid "Choose A Everywhere" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:562 +msgid "Choose B Everywhere" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:563 +msgid "Choose C Everywhere" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:564 +msgid "Choose A for All Unsolved Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:565 +msgid "Choose B for All Unsolved Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:566 +msgid "Choose C for All Unsolved Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:567 +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:568 +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:569 +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:570 +msgid "Automatically Solve Simple Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:571 +msgid "Set Deltas to Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:572 +msgid "Run Regular Expression Auto Merge" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:573 +msgid "Automatically Solve History Conflicts" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:574 +msgid "Split Diff At Selection" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:575 +msgid "Join Selected Diffs" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:577 +msgid "Show Window A" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:578 +msgid "Show Window B" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:579 +msgid "Show Window C" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:580 kdiff3.cpp:591 +msgid "Focus Next Window" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:582 +msgid "Normal Overview" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:583 +msgid "A vs. B Overview" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:584 +msgid "A vs. C Overview" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:585 +msgid "B vs. C Overview" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:586 +msgid "Word Wrap Diff Windows" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:587 +msgid "Add Manual Diff Alignment" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:588 +msgid "Clear All Manual Diff Alignments" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:593 +msgid "Focus Prev Window" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:594 +msgid "Toggle Split Orientation" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:596 +msgid "Dir && Text Split Screen View" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:598 +msgid "Toggle Between Dir && Text View" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:654 pdiff.cpp:1812 +msgid "The merge result hasn't been saved." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:656 +msgid "Save && Quit" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:657 +msgid "Quit Without Saving" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:665 pdiff.cpp:1823 +msgid "Saving the merge result failed." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:676 pdiff.cpp:1078 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "" + +#. +> trunk +#: kdiff3.cpp:701 +#, fuzzy +msgid "Saving file..." +msgstr "Spremam datoteku …" + +#. +> trunk +#: kdiff3.cpp:718 +#, fuzzy +msgid "Saving file with a new filename..." +msgstr "Spremam datoteku pod novim nazivom…" + +#. +> trunk +#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 +#, fuzzy +msgid "Save As..." +msgstr "Spremi kao …" + +#. +> trunk +#: kdiff3.cpp:781 +#, fuzzy +msgid "Printing not implemented." +msgstr "Ovaj postupak nije ugrađen." + +#. +> trunk +#: kdiff3.cpp:815 +#, fuzzy +msgid "Printing..." +msgstr "Ispisivanje …" + +#. +> trunk +#: kdiff3.cpp:956 +#, fuzzy +msgid "Selection" +msgstr "Odabir" + +#. +> trunk +#: kdiff3.cpp:982 +msgid "Printing completed." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:986 +msgid "Printing aborted." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:993 +#, fuzzy +msgid "Exiting..." +msgstr "Izlazim …" + +#. +> trunk +#: kdiff3.cpp:1006 +msgid "Toggling toolbar..." +msgstr "" + +#. +> trunk +#: kdiff3.cpp:1027 +msgid "Toggle the statusbar..." +msgstr "" + +#. +> trunk +#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 +msgid "Couldn't find files for comparison." +msgstr "" + +#. +> trunk +#: kdiff3_part.cpp:302 +msgid "KDiff3Part" +msgstr "" + +#. +> trunk +#: kdiff3_part.cpp:303 main.cpp:174 +msgid "Joachim Eibl" +msgstr "" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:4 +msgid "&KDiff3" +msgstr "" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:13 +msgid "Configure KDiff3" +msgstr "" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_part.rc:16 +#, fuzzy +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3_shell.cpp:76 +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" + +#. i18n: ectx: Menu (file) +#. +> trunk +#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 +#, fuzzy +msgid "&File" +msgstr "&Datoteka" + +#. i18n: ectx: Menu (directory) +#. +> trunk +#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 +msgid "&Directory" +msgstr "" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk +#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 +#: kreplacements/kreplacements.cpp:497 +msgid "Current Item Merge Operation" +msgstr "" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk +#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 +#: kreplacements/kreplacements.cpp:498 +msgid "Current Item Sync Operation" +msgstr "" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 +msgid "&Movement" +msgstr "" + +#. i18n: ectx: Menu (diff) +#. +> trunk +#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 +msgid "D&iffview" +msgstr "" + +#. i18n: ectx: Menu (merge) +#. +> trunk +#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 +msgid "&Merge" +msgstr "" + +#. i18n: ectx: Menu (window) +#. +> trunk +#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 +#, fuzzy +msgid "&Window" +msgstr "&Prozor" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_shell.rc:106 +#, fuzzy +msgid "Main Toolbar" +msgstr "Glavna alatna traka" + +#. +> trunk +#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 +#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 +#, fuzzy +msgid "Cancel" +msgstr "Odustani" + +#. +> trunk +#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 +#, fuzzy +msgid "Ok" +msgstr "U redu" + +#. +> trunk +#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 +#, fuzzy +msgid "Help" +msgstr "Pomoć" + +#. +> trunk +#: kreplacements/kreplacements.cpp:185 +#, fuzzy +msgid "Defaults" +msgstr "Zadano" + +#. +> trunk +#: kreplacements/kreplacements.cpp:297 +#, fuzzy +msgid "&Edit" +msgstr "&Uredi …" + +#. +> trunk +#: kreplacements/kreplacements.cpp:305 +#, fuzzy +msgid "&Settings" +msgstr "&Postavke" + +#. +> trunk +#: kreplacements/kreplacements.cpp:306 +#, fuzzy +msgid "&Help" +msgstr "&Pomoć" + +#. +> trunk +#: kreplacements/kreplacements.cpp:353 +#, fuzzy +msgid "&About" +msgstr "O &programu" + +#. +> trunk +#: kreplacements/kreplacements.cpp:369 +#, fuzzy +msgid "A&uthor" +msgstr "&Autor" + +#. +> trunk +#: kreplacements/kreplacements.cpp:383 +#, fuzzy +msgid "&Thanks To" +msgstr "&Zahvale" + +#. +> trunk +#: kreplacements/kreplacements.cpp:597 +#, fuzzy +msgid "Open" +msgstr "Otvori" + +#. +> trunk +#: kreplacements/kreplacements.cpp:606 +#, fuzzy +msgid "Save" +msgstr "Spremi" + +#. +> trunk +#: kreplacements/kreplacements.cpp:623 +#, fuzzy +msgid "Print..." +msgstr "Ispiši…" + +#. +> trunk +#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 +#, fuzzy +msgid "Quit" +msgstr "Izlaz" + +#. +> trunk +#: kreplacements/kreplacements.cpp:639 +#, fuzzy +msgid "Cut" +msgstr "Izreži" + +#. +> trunk +#: kreplacements/kreplacements.cpp:647 +#, fuzzy +msgid "Copy" +msgstr "Kopiraj" + +#. +> trunk +#: kreplacements/kreplacements.cpp:655 +#, fuzzy +msgid "Paste" +msgstr "Zalijepi" + +#. +> trunk +#: kreplacements/kreplacements.cpp:663 +#, fuzzy +msgid "Select All" +msgstr "Označi sve" + +#. +> trunk +#: kreplacements/kreplacements.cpp:671 +msgid "Show Toolbar" +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:679 +msgid "Show &Status Bar" +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:687 +#, fuzzy, kde-format +msgid "&Configure %1..." +msgstr "" +"&Podešavanje %1… " +"|/|" +" &Podešavanje $[gen %1]" + +#. +> trunk +#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 +#, fuzzy +msgid "About" +msgstr "O programu KTux" + +#. +> trunk +#: kreplacements/kreplacements.cpp:722 +#, fuzzy +msgid "Find" +msgstr "Nađi" + +#. +> trunk +#: kreplacements/kreplacements.cpp:730 +#, fuzzy +msgid "Find Next" +msgstr "Traži sljedeće" + +#. +> trunk +#: kreplacements/kreplacements.cpp:750 +#, fuzzy +msgid "Select Font" +msgstr "Odaberi font" + +#. +> trunk +#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 +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 "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:792 +msgid "Incompatible font." +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Continue at my own risk" +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Select another font" +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1134 +msgid "For more documentation, see the help-menu or the subdirectory doc." +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "KDiff3-Usage" +msgstr "" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +#, fuzzy +msgid "Ignore" +msgstr "Zanemari" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +#, fuzzy +msgid "Exit" +msgstr "Izađi" + +#. +> trunk +#: kreplacements/kreplacements.h:105 +#, fuzzy +msgid "Continue" +msgstr "Nastavi" + +#. +> trunk +#: main.cpp:74 main.cpp:76 +msgid "Ignored. (User defined.)" +msgstr "" + +#. +> trunk +#: main.cpp:162 +msgid "kdiff3" +msgstr "" + +#. +> trunk +#: main.cpp:166 +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "" + +#. +> trunk +#: main.cpp:167 +#, fuzzy +msgid "(c) 2002-2011 Joachim Eibl" +msgstr "© 2006 Sebastian Sauer" + +#. +> trunk +#: main.cpp:175 +msgid "Eike Sauer" +msgstr "" + +#. +> trunk +#: main.cpp:175 +msgid "Bugfixes, Debian package maintainer" +msgstr "" + +#. +> trunk +#: main.cpp:176 +msgid "Sebastien Fricker" +msgstr "" + +#. +> trunk +#: main.cpp:176 +msgid "Windows installer" +msgstr "" + +#. +> trunk +#: main.cpp:177 +#, fuzzy +msgid "Stephan Binner" +msgstr "Stephan Binner" + +#. +> trunk +#: main.cpp:177 +msgid "i18n-help" +msgstr "" + +#. +> trunk +#: main.cpp:178 +msgid "Stefan Partheymueller" +msgstr "" + +#. +> trunk +#: main.cpp:178 +msgid "Clipboard-patch" +msgstr "" + +#. +> trunk +#: main.cpp:179 +#, fuzzy +msgid "David Faure" +msgstr "David Faure" + +#. +> trunk +#: main.cpp:179 +msgid "KIO-Help" +msgstr "" + +#. +> trunk +#: main.cpp:180 +#, fuzzy +msgid "Bernd Gehrmann" +msgstr "Bernd Gehrmann" + +#. +> trunk +#: main.cpp:180 +msgid "Class CvsIgnoreList from Cervisia" +msgstr "" + +#. +> trunk +#: main.cpp:181 +msgid "Andre Woebbeking" +msgstr "" + +#. +> trunk +#: main.cpp:181 +msgid "Class StringMatcher" +msgstr "" + +#. +> trunk +#: main.cpp:182 +msgid "Michael Denio" +msgstr "" + +#. +> trunk +#: main.cpp:182 +msgid "Directory Equality-Coloring patch" +msgstr "" + +#. +> trunk +#: main.cpp:183 +msgid "Manfred Koehler" +msgstr "" + +#. +> trunk +#: main.cpp:183 +msgid "Fix for slow startup on Windows" +msgstr "" + +#. +> trunk +#: main.cpp:184 +msgid "Sergey Zorin" +msgstr "" + +#. +> trunk +#: main.cpp:184 +msgid "Diff Ext for Windows" +msgstr "" + +#. +> trunk +#: main.cpp:185 +msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +msgstr "" + +#. +> trunk +#: main.cpp:185 +msgid "GNU-Diffutils" +msgstr "" + +#. +> trunk +#: main.cpp:186 +msgid "Tino Boellsterling, Timothy Mee" +msgstr "" + +#. +> trunk +#: main.cpp:186 +msgid "Intensive test, use and feedback" +msgstr "" + +#. +> trunk +#: main.cpp:187 +msgid "Michael Schmidt" +msgstr "" + +#. +> trunk +#: main.cpp:187 +msgid "Mac support" +msgstr "" + +#. +> trunk +#: main.cpp:188 +msgid "Valentin Rusu" +msgstr "" + +#. +> trunk +#: main.cpp:188 main.cpp:189 +#, fuzzy +msgid "KDE4 porting" +msgstr "Prijelaz u KDE4" + +#. +> trunk +#: main.cpp:189 +#, fuzzy +msgid "Albert Astals Cid" +msgstr "Albert Astals Cid" + +#. +> trunk +#: main.cpp:190 +#, fuzzy +msgid "Silvan Scherrer" +msgstr "Simon Schmeisser" + +#. +> trunk +#: main.cpp:190 +#, fuzzy +msgid "OS2 port" +msgstr "Prebacio na SGI" + +#. +> trunk +#: main.cpp:192 +msgid "+ Many thanks to those who reported bugs and contributed ideas!" +msgstr "" + +#. +> trunk +#: main.cpp:198 +msgid "Merge the input." +msgstr "" + +#. +> trunk +#: main.cpp:199 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" + +#. +> trunk +#: main.cpp:200 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" + +#. +> trunk +#: main.cpp:201 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" + +#. +> trunk +#: main.cpp:202 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" + +#. +> trunk +#: main.cpp:203 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "" + +#. +> trunk +#: main.cpp:204 +msgid "Visible name replacement for input file 1 (base)." +msgstr "" + +#. +> trunk +#: main.cpp:205 +msgid "Visible name replacement for input file 2." +msgstr "" + +#. +> trunk +#: main.cpp:206 +msgid "Visible name replacement for input file 3." +msgstr "" + +#. +> trunk +#: main.cpp:207 +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" + +#. +> trunk +#: main.cpp:208 +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "" + +#. +> trunk +#: main.cpp:209 +msgid "Show list of config settings and current values." +msgstr "" + +#. +> trunk +#: main.cpp:210 +msgid "Use a different config file." +msgstr "" + +#. +> trunk +#: main.cpp:213 +msgid "file1 to open (base, if not specified via --base)" +msgstr "" + +#. +> trunk +#: main.cpp:214 +msgid "file2 to open" +msgstr "" + +#. +> trunk +#: main.cpp:215 +msgid "file3 to open" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 +#: mergeresultwindow.cpp:1014 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:303 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:834 pdiff.cpp:532 +msgid "All input files are binary equal." +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:836 +msgid "All input files contain the same text." +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 +#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 +#: mergeresultwindow.cpp:843 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:849 +msgid "Total number of conflicts: " +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:850 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:851 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:853 +msgid "Conflicts" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1728 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1736 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2725 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 +msgid "Conflicts Left" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2734 +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2748 +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 +msgid "File Save Error" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2792 +msgid "Error while writing." +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:3122 +#, fuzzy +msgid "Output" +msgstr "Izlaz" + +#. +> trunk +#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 +msgid "[Modified]" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:3141 +msgid "Encoding for saving" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:3229 +#, fuzzy +msgid "Conflict" +msgstr "Konflikt" + +#. +> trunk +#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 +#: mergeresultwindow.cpp:3265 +msgid "Codec from" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:367 +msgid "Unicode, 8 bit" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:368 +#, fuzzy +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk +#: optiondialog.cpp:369 +msgid "Latin1" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:388 +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:465 +#, fuzzy +msgid "Configure" +msgstr "Postavi" + +#. +> trunk +#: optiondialog.cpp:531 +#, fuzzy +msgid "Font" +msgstr "Pismo" + +#. +> trunk +#: optiondialog.cpp:532 +msgid "Editor & Diff Output Font" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:556 +msgid "Italic font for deltas" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:559 +msgid "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:568 +#, fuzzy +msgid "Color" +msgstr "Boja" + +#. +> trunk +#: optiondialog.cpp:569 +msgid "Colors Settings" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:588 +msgid "Editor and Diff Views:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:596 +#, fuzzy +msgid "Foreground color:" +msgstr "Boja prednjeg plana:" + +#. +> trunk +#: optiondialog.cpp:603 +#, fuzzy +msgid "Background color:" +msgstr "Boja pozadine:" + +#. +> trunk +#: optiondialog.cpp:612 +msgid "Diff background color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:620 +msgid "Color A:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:628 +msgid "Color B:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:636 +msgid "Color C:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:643 +msgid "Conflict color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:651 +msgid "Current range background color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:659 +msgid "Current range diff background color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:666 +msgid "Color for manually aligned difference ranges:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:672 +msgid "Directory Comparison View:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:678 +msgid "Newest file color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:682 +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:687 +msgid "Oldest file color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:695 +msgid "Middle age file color:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:703 +msgid "Color for missing files:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:717 +#, fuzzy +msgid "Editor" +msgstr "Uređivač" + +#. +> trunk +#: optiondialog.cpp:718 +msgid "Editor Behavior" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:732 +msgid "Tab inserts spaces" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:735 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:741 +msgid "Tab size:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:747 +msgid "Auto indentation" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:750 +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:754 +msgid "Auto copy selection" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:757 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:772 +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:784 +#, fuzzy +msgid "Diff" +msgstr "Razlika" + +#. +> trunk +#: optiondialog.cpp:785 +msgid "Diff Settings" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:809 +msgid "Treat as white space." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:811 +msgid "Ignore numbers" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:814 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:819 +msgid "Ignore C/C++ comments" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:821 +msgid "Treat C/C++ comments like white space." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:825 +msgid "Ignore case" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:828 +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:832 +msgid "Preprocessor command:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:836 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:839 +msgid "Line-matching preprocessor command:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:843 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:846 +msgid "Try hard (slower)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:849 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:854 +msgid "Align B and C for 3 input files" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:857 +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:870 +msgid "Merge Settings" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:885 +msgid "Auto advance delay (ms):" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:890 +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 "" + +#. +> trunk +#: optiondialog.cpp:895 +msgid "Show info dialogs" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:897 +msgid "Show a dialog with information about the number of conflicts." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:900 +msgid "White space 2-file merge default:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:904 optiondialog.cpp:917 +msgid "Manual Choice" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:908 optiondialog.cpp:922 +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:913 +msgid "White space 3-file merge default:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:927 +msgid "Automatic Merge Regular Expression" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:936 smalldialogs.cpp:414 +msgid "Auto merge regular expression:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:940 +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:946 +msgid "Run regular expression auto merge on merge start" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:948 +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:953 +msgid "Version Control History Merging" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:962 smalldialogs.cpp:441 +msgid "History start regular expression:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:966 +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:972 smalldialogs.cpp:469 +msgid "History entry start regular expression:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:984 +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:992 +msgid "History merge sorting" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:994 +msgid "Sort version control history by a key." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1004 +msgid "History entry start sort key order:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1008 +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1019 +msgid "Merge version control history on merge start" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1021 +msgid "Run version control history automerge on merge start." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1025 +msgid "Max number of history entries:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1028 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1032 +msgid "Test your regular expressions" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1037 +msgid "Irrelevant merge command:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1041 +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1047 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1050 +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1061 optiondialog.cpp:1062 +#, fuzzy +msgid "Directory" +msgstr "Direktorij" + +#. +> trunk +#: optiondialog.cpp:1075 +msgid "Recursive directories" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1077 +msgid "Whether to analyze subdirectories or not." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1079 +msgid "File pattern(s):" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1084 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1090 +msgid "File-anti-pattern(s):" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1095 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1101 +msgid "Dir-anti-pattern(s):" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1106 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1112 +msgid "Use .cvsignore" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1115 +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1120 +msgid "Find hidden files and directories" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1123 +msgid "Finds files and directories with the hidden attribute." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1125 +msgid "Finds files and directories starting with '.'." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1129 +msgid "Follow file links" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1132 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1137 +msgid "Follow directory links" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1140 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1156 +msgid "Case sensitive filename comparison" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1159 +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1163 +msgid "File Comparison Mode" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1169 +msgid "Binary comparison" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1170 +msgid "Binary comparison of each file. (Default)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1173 +msgid "Full analysis" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1174 +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1178 +msgid "Trust the size and modification date (unsafe)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1179 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1184 +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1185 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1190 +msgid "Trust the size (unsafe)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1191 +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 "" + +#. +> trunk +#: optiondialog.cpp:1199 +msgid "Synchronize directories" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1202 +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 "" + +#. +> trunk +#: optiondialog.cpp:1208 +msgid "White space differences considered equal" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1211 +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1217 +msgid "Copy newer instead of merging (unsafe)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1220 +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 "" + +#. +> trunk +#: optiondialog.cpp:1225 +msgid "Backup files (.orig)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1228 +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1301 optiondialog.cpp:1302 +msgid "Regional Settings" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1405 +msgid "Language (restart required)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1448 +msgid "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1466 +msgid "Use the same encoding for everything:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1469 +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1474 +msgid "Note: Local Encoding is " +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1478 +msgid "File Encoding for A:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1484 +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 +msgid "Auto Detect Unicode" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1493 +msgid "File Encoding for B:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1502 +msgid "File Encoding for C:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1511 +msgid "File Encoding for Merge Output and Saving:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1515 +#, fuzzy +msgid "Auto Select" +msgstr "Automatsko biranje" + +#. +> trunk +#: optiondialog.cpp:1518 +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1522 +msgid "File Encoding for Preprocessor Files:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1533 +msgid "Right To Left Language" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1536 +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1551 +msgid "Integration" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1552 +msgid "Integration Settings" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1566 +msgid "Command line options to ignore:" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1571 +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1578 +msgid "Quit also via Escape key" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1581 +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1586 +msgid "Integrate with ClearCase" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1589 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1595 +msgid "Remove ClearCase Integration" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1598 +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1683 +msgid "Incompatible Font" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1684 +msgid "Continue at Own Risk" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1685 +msgid "Select Another Font" +msgstr "" + +#. +> trunk +#: optiondialog.cpp:1720 +msgid "This resets all options. Not only those of the current topic." +msgstr "" + +#. +> trunk +#: pdiff.cpp:260 +msgid "PreprocessorCmd: " +msgstr "" + +#. +> trunk +#: pdiff.cpp:265 +msgid "The following option(s) you selected might change data:\n" +msgstr "" + +#. +> trunk +#: pdiff.cpp:266 +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" + +#. +> trunk +#: pdiff.cpp:268 +msgid "Option Unsafe for Merging" +msgstr "" + +#. +> trunk +#: pdiff.cpp:269 +msgid "Use These Options During Merge" +msgstr "" + +#. +> trunk +#: pdiff.cpp:270 +msgid "Disable Unsafe Options" +msgstr "" + +#. +> trunk +#: pdiff.cpp:300 +msgid "Loading A" +msgstr "" + +#. +> trunk +#: pdiff.cpp:304 +msgid "Loading B" +msgstr "" + +#. +> trunk +#: pdiff.cpp:321 pdiff.cpp:347 +msgid "Diff: A <-> B" +msgstr "" + +#. +> trunk +#: pdiff.cpp:327 pdiff.cpp:372 +msgid "Linediff: A <-> B" +msgstr "" + +#. +> trunk +#: pdiff.cpp:338 +msgid "Loading C" +msgstr "" + +#. +> trunk +#: pdiff.cpp:350 +msgid "Diff: B <-> C" +msgstr "" + +#. +> trunk +#: pdiff.cpp:353 +msgid "Diff: A <-> C" +msgstr "" + +#. +> trunk +#: pdiff.cpp:375 +msgid "Linediff: B <-> C" +msgstr "" + +#. +> trunk +#: pdiff.cpp:378 +msgid "Linediff: A <-> C" +msgstr "" + +#. +> trunk +#: pdiff.cpp:534 +msgid "All input files contain the same text, but are not binary equal." +msgstr "" + +#. +> trunk +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" + +#. +> trunk +#: pdiff.cpp:551 +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 "" + +#. +> trunk +#: pdiff.cpp:566 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Don't save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" + +#. +> trunk +#: pdiff.cpp:1080 +#, fuzzy +msgid "Abort" +msgstr "Prekid" + +#. +> trunk +#: pdiff.cpp:1087 pdiff.cpp:1175 +msgid "Opening files..." +msgstr "" + +#. +> trunk +#: pdiff.cpp:1152 pdiff.cpp:1223 +msgid "File open error" +msgstr "" + +#. +> trunk +#: pdiff.cpp:1255 +#, fuzzy +msgid "Cutting selection..." +msgstr "Režem izabrano …" + +#. +> trunk +#: pdiff.cpp:1276 +#, fuzzy +msgid "Copying selection to clipboard..." +msgstr "Kopiranje odabira u odlagalište …" + +#. +> trunk +#: pdiff.cpp:1292 +#, fuzzy +msgid "Inserting clipboard contents..." +msgstr "Ubacivanje sadržaja odlagališta …" + +#. +> trunk +#: pdiff.cpp:1814 +msgid "Save && Continue" +msgstr "" + +#. +> trunk +#: pdiff.cpp:1815 +msgid "Continue Without Saving" +msgstr "" + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search complete." +msgstr "" + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search Complete" +msgstr "" + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Nothing is selected in either diff input window." +msgstr "" + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Error while adding manual diff range" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:58 +msgid "A (Base):" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 +#: smalldialogs.cpp:142 +#, fuzzy +msgid "File..." +msgstr "Datoteka…" + +#. +> trunk +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:144 +msgid "Dir..." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:93 +msgid "C (Optional):" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:116 +msgid "Swap/Copy Names ..." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 +#, kde-format +msgid "Swap %1<->%2" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#, kde-format +msgid "Copy %1->Output" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#, kde-format +msgid "Swap %1<->Output" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:136 +msgid "Output (optional):" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:168 +#, fuzzy +msgid "Configure..." +msgstr "Konfiguriranje …" + +#. +> trunk +#: smalldialogs.cpp:174 +#, fuzzy +msgid "&OK" +msgstr "&U redu" + +#. +> trunk +#: smalldialogs.cpp:362 +msgid "Search text:" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:369 +#, fuzzy +msgid "Case sensitive" +msgstr "Osjetljivost na veličinu slova" + +#. +> trunk +#: smalldialogs.cpp:372 +msgid "Search A" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:377 +msgid "Search B" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:382 +msgid "Search C" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:387 +msgid "Search output" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:392 +#, fuzzy +msgid "&Search" +msgstr "&Traži" + +#. +> trunk +#: smalldialogs.cpp:409 +msgid "Regular Expression Tester" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:422 +msgid "Example auto merge line:" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:424 +msgid "To test auto merge, copy a line as used in your files." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 +msgid "Match result:" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:449 +msgid "Example history start line (with leading comment):" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:451 +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:477 +msgid "History sort key order:" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:485 +msgid "Example history entry start line (without leading comment):" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:487 +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:501 +msgid "Sort key result:" +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:508 +#, fuzzy +msgid "OK" +msgstr "U redu" + +#. +> trunk +#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 +msgid "Match success." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 +msgid "Match failed." +msgstr "" + +#. +> trunk +#: smalldialogs.cpp:574 +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "" + +#, fuzzy +#~ msgid "Not matching quotation marks." +#~ msgstr "Automatski dodaj završni znak citata" + +#, fuzzy +#~ msgid "Dos/Windows" +#~ msgstr "Dos/Windows" + +#, fuzzy +#~ msgid "Autodetect" +#~ msgstr "Samodetekcija" Index: trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,65 +0,0 @@ -# Translation of desktop_extragear-utils_kdiff3 to Croatian -# -# Andrej Dundovic , 2010. -msgid "" -msgstr "" -"Project-Id-Version: desktop files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2011-05-18 09:02+0200\n" -"PO-Revision-Date: 2010-01-24 16:50+0100\n" -"Last-Translator: Andrej Dundovic \n" -"Language-Team: Croatian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 -#: kdiff3plugin/kdiff3plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:43 -#, fuzzy -msgctxt "X-KDE-Submenu" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3plugin/kdiff3_plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories" -msgstr "" - -#. +> trunk -#: src/kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: src/kdiff3.desktop:42 -#, fuzzy -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Sučelje za Diff/Patch " - -#. +> trunk -#: src/kdiff3.desktop:85 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "" - -#. +> trunk -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "" Index: trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/hr/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,3590 +0,0 @@ -# Translation of kdiff3 to Croatian -# -# Andrej Dundovic , 2010. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2011-09-01 10:10+0200\n" -"PO-Revision-Date: 2010-01-24 16:47+0100\n" -"Last-Translator: Andrej Dundovic \n" -"Language-Team: Croatian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "" - -#. +> trunk -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "" - -#. +> trunk -#: diff.cpp:251 -msgid "Writing clipboard data to temp file failed." -msgstr "" - -#. +> trunk -#: diff.cpp:255 -msgid "From Clipboard" -msgstr "" - -#. +> trunk -#: diff.cpp:537 -#, fuzzy -msgid "Expecting space after closing apostroph." -msgstr "Automatski dodaj završni znak citata" - -#. +> trunk -#: diff.cpp:540 -#, fuzzy -msgid "Not matching apostrophs." -msgstr "Nema podudaranja ni sa jednim ključem" - -#. +> trunk -#: diff.cpp:562 -#, fuzzy -msgid "Unexpected apostroph within argument." -msgstr "Nepčekivani argument '%1'." - -#. +> trunk -#: diff.cpp:569 -#, fuzzy -msgid "No program specified." -msgstr "Program nije definiran" - -#. +> trunk -#: diff.cpp:671 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" - -#. +> trunk -#: diff.cpp:719 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" - -#. +> trunk -#: diff.cpp:1850 diff.cpp:1864 -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" - -#. +> trunk -#: diff.cpp:1852 diff.cpp:1866 -msgid "Severe Internal Error" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 -#, fuzzy -msgid "File" -msgstr "Datoteka" - -#. +> trunk -#: difftextwindow.cpp:403 -#, fuzzy -msgid "Line" -msgstr "Crta" - -#. +> trunk -#: difftextwindow.cpp:405 -msgid "Line not available" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 -#, fuzzy -msgid "Encoding:" -msgstr "Kodiranje:" - -#. +> trunk -#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 -#: optiondialog.cpp:762 -msgid "Line end style:" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 -msgid "Unix" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 -msgid "DOS" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:1759 kdiff3.cpp:831 -msgid "Top line" -msgstr "" - -#. +> trunk -#: difftextwindow.cpp:1769 -#, fuzzy -msgid "End" -msgstr "Kraj" - -#. +> trunk -#: directorymergewindow.cpp:150 -msgid "Mix of links and normal files." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:157 -msgid "Link: " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:165 -msgid "Size. " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 -msgid "Date & Size: " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 -#, kde-format -msgid "Opening %1 failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:227 -msgid "Comparing file..." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 -#, kde-format -msgid "Error reading from %1" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:372 -#, fuzzy -msgid "Name" -msgstr "Ime" - -#. +> trunk -#: directorymergewindow.cpp:372 -#, fuzzy -msgid "Operation" -msgstr "Operacija" - -#. +> trunk -#: directorymergewindow.cpp:372 -#, fuzzy -msgid "Status" -msgstr "Status" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Unsolved" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Solved" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Nonwhite" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "White" -msgstr "Bijelo" - -#. +> trunk -#: directorymergewindow.cpp:402 -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 -#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 -#, fuzzy -msgid "Warning" -msgstr "Upozorenje" - -#. +> trunk -#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 -msgid "Rescan" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:405 pdiff.cpp:1081 -msgid "Continue Merging" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:562 -msgid "Opening of directories failed:" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:565 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:568 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:571 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:573 -msgid "Directory Open Error" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:581 -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:583 -msgid "Parameter Warning" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:588 -msgid "Scanning directories..." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:621 -msgid "Reading Directory A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:643 -msgid "Reading Directory B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:665 -msgid "Reading Directory C" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:691 -msgid "Some subdirectories were not readable in" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:696 -msgid "Check the permissions of the subdirectories." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 -#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 -#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 -#, fuzzy -msgid "Ready." -msgstr "Spreman." - -#. +> trunk -#: directorymergewindow.cpp:749 -msgid "Directory Comparison Status" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:750 -msgid "Number of subdirectories:" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:751 -msgid "Number of equal files:" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:752 -msgid "Number of different files:" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:755 -msgid "Number of manual merges:" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:926 -msgid "This affects all merge operations." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:927 -msgid "Changing All Merge Operations" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1326 -msgid "Processing " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 -msgid "To do." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 -msgid "Copy A to B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 -msgid "Copy B to A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 -msgid "Delete A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 -msgid "Delete B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1828 -msgid "Delete A & B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 -msgid "Merge to A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 -msgid "Merge to B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1831 -msgid "Merge to A & B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 -msgid "Delete (if exists)" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 -#, fuzzy -msgid "Merge" -msgstr "Spajanje" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -msgid "Merge (manual)" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1838 -msgid "Error: Conflicting File Types" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1839 -msgid "Error: Changed and Deleted" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1840 -msgid "Error: Dates are equal but files are not." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 -msgid "This operation is currently not possible." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 -msgid "Operation Not Possible" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1959 -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 "" - -#. +> trunk -#: directorymergewindow.cpp:1959 -msgid "Program Error" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1970 -msgid "An error occurred while copying.\n" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 -#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 -#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 -#: directorymergewindow.cpp:2388 -#, fuzzy -msgid "Error" -msgstr "Greška" - -#. +> trunk -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 -msgid "Merge Error" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 -#, fuzzy -msgid "Error." -msgstr "Greška." - -#. +> trunk -#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 -#: directorymergewindow.cpp:2326 -#, fuzzy -msgid "Done." -msgstr "Gotovo." - -#. +> trunk -#: directorymergewindow.cpp:2004 -msgid "Not saved." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2039 -msgid "Unknown merge operation. (This must never happen!)" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2071 -msgid "Unknown merge operation." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2086 -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 "" - -#. +> trunk -#: directorymergewindow.cpp:2091 -msgid "Starting Merge" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2092 -msgid "Do It" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2093 -msgid "Simulate It" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2119 -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2128 -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2137 -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2188 -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2248 -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 "" - -#. +> trunk -#: directorymergewindow.cpp:2250 -msgid "Continue merge after an error" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2251 -msgid "Continue With Last Item" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2252 -msgid "Skip Item" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2286 -msgid "Skipped." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 -msgid "In progress..." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2341 -msgid "Merge operation complete." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 -msgid "Merge Complete" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2354 -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2388 -msgid "An error occurred. Press OK to see detailed information.\n" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2420 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2427 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2429 -#, kde-format -msgid "delete( %1 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2444 -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2463 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2473 -msgid "Error: delete operation failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2499 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2502 -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2527 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2536 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2547 -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2553 -msgid "Error: copyLink failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2578 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2604 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2610 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2619 -msgid "Error: Rename failed." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2637 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2653 -#, kde-format -msgid "makeDir( %1 )" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2663 -msgid "Error while creating directory." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 -msgid "Dest" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 -msgid "Dir" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2692 -#, fuzzy -msgid "Type" -msgstr "Tip" - -#. +> trunk -#: directorymergewindow.cpp:2692 -#, fuzzy -msgid "Size" -msgstr "Veličina" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Attr" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Last Modification" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Link-Destination" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2740 -#, fuzzy -msgid "not available" -msgstr "nije dostupno" - -#. +> trunk -#: directorymergewindow.cpp:2760 -msgid "A (Dest): " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2763 -msgid "A (Base): " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2769 -msgid "B (Dest): " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2777 -msgid "C (Dest): " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2783 -msgid "Dest: " -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2850 -msgid "Save Directory Merge State As..." -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2973 -msgid "Start/Continue Directory Merge" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2974 -msgid "Run Operation for Current Item" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2975 -msgid "Compare Selected File" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "Merge Current File" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "" -"Merge\n" -"File" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2977 -msgid "Fold All Subdirs" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2978 -msgid "Unfold All Subdirs" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2982 -msgid "Choose A for All Items" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2983 -msgid "Choose B for All Items" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2984 -msgid "Choose C for All Items" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2985 -msgid "Auto-Choose Operation for All Items" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2986 -msgid "No Operation for All Items" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "Show Identical Files" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "" -"Identical\n" -"Files" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2992 -msgid "Show Different Files" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "Show Files only in A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "" -"Files\n" -"only in A" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "Show Files only in B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "" -"Files\n" -"only in B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "Show Files only in C" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "" -"Files\n" -"only in C" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:2999 -msgid "Compare Explicitly Selected Files" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:3000 -msgid "Merge Explicitly Selected Files" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 -#, fuzzy -msgid "Do Nothing" -msgstr "Ništa nemoj raditi" - -#. +> trunk -#: directorymergewindow.cpp:3003 -#, fuzzy -msgid "A" -msgstr "A" - -#. +> trunk -#: directorymergewindow.cpp:3004 -#, fuzzy -msgid "B" -msgstr "B" - -#. +> trunk -#: directorymergewindow.cpp:3005 -#, fuzzy -msgid "C" -msgstr "C" - -#. +> trunk -#: directorymergewindow.cpp:3014 -msgid "Delete A && B" -msgstr "" - -#. +> trunk -#: directorymergewindow.cpp:3017 -msgid "Merge to A && B" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:617 -msgid "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " -msgstr "" - -#. +> trunk -#: fileaccess.cpp:624 -msgid "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " -msgstr "" - -#. +> trunk -#: fileaccess.cpp:648 -#, kde-format -msgid "Getting file status: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:691 -#, kde-format -msgid "Reading file: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:728 -#, kde-format -msgid "Writing file: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:756 -#, fuzzy -msgid "Out of memory" -msgstr "Nema više memorije" - -#. +> trunk -#: fileaccess.cpp:791 -#, kde-format -msgid "Making directory: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:811 -#, kde-format -msgid "Removing directory: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:826 -#, kde-format -msgid "Removing file: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:842 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:869 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:902 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:916 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:922 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:937 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:946 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:1236 -msgid "Reading directory: " -msgstr "" - -#. +> trunk -#: fileaccess.cpp:1360 -#, kde-format -msgid "Listing directory: %1" -msgstr "" - -#. +> trunk -#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 -#, fuzzy -msgid "&Cancel" -msgstr "&Odustani" - -#. +> trunk -#: kdiff3.cpp:169 -msgid "Current Configuration:" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:174 -msgid "Config Option Error:" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:219 -msgid "Option --auto used, but no output file specified." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:369 -msgid "Option --auto ignored for directory comparison." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:405 -msgid "Saving failed." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 -msgid "Opening of these files failed:" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:449 -msgid "File Open Error" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:477 -msgid "Opens documents for comparison..." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:479 -#, fuzzy -msgid "Reload" -msgstr "Ponovno učitati" - -#. +> trunk -#: kdiff3.cpp:482 -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:484 -msgid "Saves the current document as..." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:487 -msgid "Print the differences" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:490 -#, fuzzy -msgid "Quits the application" -msgstr "Izlazi iz aplikacije" - -#. +> trunk -#: kdiff3.cpp:492 -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:494 -#, fuzzy -msgid "Copies the selected section to the clipboard" -msgstr "Kopira označeno na odlagalište" - -#. +> trunk -#: kdiff3.cpp:496 -#, fuzzy -msgid "Pastes the clipboard contents to current position" -msgstr "Zalijepi sadržaje odlagališta" - -#. +> trunk -#: kdiff3.cpp:498 -msgid "Select everything in current window" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:500 -msgid "Search for a string" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:502 -msgid "Search again for the string" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:507 -msgid "Enables/disables the statusbar" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:511 -msgid "Configure KDiff3..." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:532 -msgid "Go to Current Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:532 -msgid "" -"Current\n" -"Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "Go to First Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "" -"First\n" -"Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "Go to Last Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "" -"Last\n" -"Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:538 -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:539 -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "Go to Previous Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "" -"Prev\n" -"Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "Go to Next Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "" -"Next\n" -"Delta" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "Go to Previous Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "" -"Prev\n" -"Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "Go to Next Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "" -"Next\n" -"Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "Go to Previous Unsolved Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "" -"Prev\n" -"Unsolved" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "Go to Next Unsolved Conflict" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "" -"Next\n" -"Unsolved" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "Select Line(s) From A" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "" -"Choose\n" -"A" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "Select Line(s) From B" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "" -"Choose\n" -"B" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "Select Line(s) From C" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "" -"Choose\n" -"C" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "" -"Auto\n" -"Next" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "Show Space && Tabulator Characters for Differences" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "" -"White\n" -"Characters" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "Show White Space" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "" -"White\n" -"Deltas" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "Show Line Numbers" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "" -"Line\n" -"Numbers" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:561 -msgid "Choose A Everywhere" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:562 -msgid "Choose B Everywhere" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:563 -msgid "Choose C Everywhere" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:564 -msgid "Choose A for All Unsolved Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:565 -msgid "Choose B for All Unsolved Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:566 -msgid "Choose C for All Unsolved Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:567 -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:568 -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:569 -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:570 -msgid "Automatically Solve Simple Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:571 -msgid "Set Deltas to Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:572 -msgid "Run Regular Expression Auto Merge" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:573 -msgid "Automatically Solve History Conflicts" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:574 -msgid "Split Diff At Selection" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:575 -msgid "Join Selected Diffs" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:577 -msgid "Show Window A" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:578 -msgid "Show Window B" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:579 -msgid "Show Window C" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:580 kdiff3.cpp:591 -msgid "Focus Next Window" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:582 -msgid "Normal Overview" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:583 -msgid "A vs. B Overview" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:584 -msgid "A vs. C Overview" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:585 -msgid "B vs. C Overview" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:586 -msgid "Word Wrap Diff Windows" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:587 -msgid "Add Manual Diff Alignment" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:588 -msgid "Clear All Manual Diff Alignments" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:593 -msgid "Focus Prev Window" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:594 -msgid "Toggle Split Orientation" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:596 -msgid "Dir && Text Split Screen View" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:598 -msgid "Toggle Between Dir && Text View" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:654 pdiff.cpp:1812 -msgid "The merge result hasn't been saved." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:656 -msgid "Save && Quit" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:657 -msgid "Quit Without Saving" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:665 pdiff.cpp:1823 -msgid "Saving the merge result failed." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:676 pdiff.cpp:1078 -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "" - -#. +> trunk -#: kdiff3.cpp:701 -#, fuzzy -msgid "Saving file..." -msgstr "Spremam datoteku …" - -#. +> trunk -#: kdiff3.cpp:718 -#, fuzzy -msgid "Saving file with a new filename..." -msgstr "Spremam datoteku pod novim nazivom…" - -#. +> trunk -#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 -#, fuzzy -msgid "Save As..." -msgstr "Spremi kao …" - -#. +> trunk -#: kdiff3.cpp:781 -#, fuzzy -msgid "Printing not implemented." -msgstr "Ovaj postupak nije ugrađen." - -#. +> trunk -#: kdiff3.cpp:815 -#, fuzzy -msgid "Printing..." -msgstr "Ispisivanje …" - -#. +> trunk -#: kdiff3.cpp:956 -#, fuzzy -msgid "Selection" -msgstr "Odabir" - -#. +> trunk -#: kdiff3.cpp:982 -msgid "Printing completed." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:986 -msgid "Printing aborted." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:993 -#, fuzzy -msgid "Exiting..." -msgstr "Izlazim …" - -#. +> trunk -#: kdiff3.cpp:1006 -msgid "Toggling toolbar..." -msgstr "" - -#. +> trunk -#: kdiff3.cpp:1027 -msgid "Toggle the statusbar..." -msgstr "" - -#. +> trunk -#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 -msgid "Couldn't find files for comparison." -msgstr "" - -#. +> trunk -#: kdiff3_part.cpp:302 -msgid "KDiff3Part" -msgstr "" - -#. +> trunk -#: kdiff3_part.cpp:303 main.cpp:174 -msgid "Joachim Eibl" -msgstr "" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:4 -msgid "&KDiff3" -msgstr "" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:13 -msgid "Configure KDiff3" -msgstr "" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_part.rc:16 -#, fuzzy -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3_shell.cpp:76 -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" - -#. i18n: ectx: Menu (file) -#. +> trunk -#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 -#, fuzzy -msgid "&File" -msgstr "&Datoteka" - -#. i18n: ectx: Menu (directory) -#. +> trunk -#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 -msgid "&Directory" -msgstr "" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk -#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 -#: kreplacements/kreplacements.cpp:497 -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk -#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 -#: kreplacements/kreplacements.cpp:498 -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 -msgid "&Movement" -msgstr "" - -#. i18n: ectx: Menu (diff) -#. +> trunk -#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 -msgid "D&iffview" -msgstr "" - -#. i18n: ectx: Menu (merge) -#. +> trunk -#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 -msgid "&Merge" -msgstr "" - -#. i18n: ectx: Menu (window) -#. +> trunk -#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 -#, fuzzy -msgid "&Window" -msgstr "&Prozor" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_shell.rc:106 -#, fuzzy -msgid "Main Toolbar" -msgstr "Glavna alatna traka" - -#. +> trunk -#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 -#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 -#, fuzzy -msgid "Cancel" -msgstr "Odustani" - -#. +> trunk -#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 -#, fuzzy -msgid "Ok" -msgstr "U redu" - -#. +> trunk -#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 -#, fuzzy -msgid "Help" -msgstr "Pomoć" - -#. +> trunk -#: kreplacements/kreplacements.cpp:185 -#, fuzzy -msgid "Defaults" -msgstr "Zadano" - -#. +> trunk -#: kreplacements/kreplacements.cpp:297 -#, fuzzy -msgid "&Edit" -msgstr "&Uredi …" - -#. +> trunk -#: kreplacements/kreplacements.cpp:305 -#, fuzzy -msgid "&Settings" -msgstr "&Postavke" - -#. +> trunk -#: kreplacements/kreplacements.cpp:306 -#, fuzzy -msgid "&Help" -msgstr "&Pomoć" - -#. +> trunk -#: kreplacements/kreplacements.cpp:353 -#, fuzzy -msgid "&About" -msgstr "O &programu" - -#. +> trunk -#: kreplacements/kreplacements.cpp:369 -#, fuzzy -msgid "A&uthor" -msgstr "&Autor" - -#. +> trunk -#: kreplacements/kreplacements.cpp:383 -#, fuzzy -msgid "&Thanks To" -msgstr "&Zahvale" - -#. +> trunk -#: kreplacements/kreplacements.cpp:597 -#, fuzzy -msgid "Open" -msgstr "Otvori" - -#. +> trunk -#: kreplacements/kreplacements.cpp:606 -#, fuzzy -msgid "Save" -msgstr "Spremi" - -#. +> trunk -#: kreplacements/kreplacements.cpp:623 -#, fuzzy -msgid "Print..." -msgstr "Ispiši…" - -#. +> trunk -#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 -#, fuzzy -msgid "Quit" -msgstr "Izlaz" - -#. +> trunk -#: kreplacements/kreplacements.cpp:639 -#, fuzzy -msgid "Cut" -msgstr "Izreži" - -#. +> trunk -#: kreplacements/kreplacements.cpp:647 -#, fuzzy -msgid "Copy" -msgstr "Kopiraj" - -#. +> trunk -#: kreplacements/kreplacements.cpp:655 -#, fuzzy -msgid "Paste" -msgstr "Zalijepi" - -#. +> trunk -#: kreplacements/kreplacements.cpp:663 -#, fuzzy -msgid "Select All" -msgstr "Označi sve" - -#. +> trunk -#: kreplacements/kreplacements.cpp:671 -msgid "Show Toolbar" -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:679 -msgid "Show &Status Bar" -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:687 -#, fuzzy, kde-format -msgid "&Configure %1..." -msgstr "" -"&Podešavanje %1… " -"|/|" -" &Podešavanje $[gen %1]" - -#. +> trunk -#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 -#, fuzzy -msgid "About" -msgstr "O programu KTux" - -#. +> trunk -#: kreplacements/kreplacements.cpp:722 -#, fuzzy -msgid "Find" -msgstr "Nađi" - -#. +> trunk -#: kreplacements/kreplacements.cpp:730 -#, fuzzy -msgid "Find Next" -msgstr "Traži sljedeće" - -#. +> trunk -#: kreplacements/kreplacements.cpp:750 -#, fuzzy -msgid "Select Font" -msgstr "Odaberi font" - -#. +> trunk -#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 -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 "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:792 -msgid "Incompatible font." -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Continue at my own risk" -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Select another font" -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1134 -msgid "For more documentation, see the help-menu or the subdirectory doc." -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "KDiff3-Usage" -msgstr "" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -#, fuzzy -msgid "Ignore" -msgstr "Zanemari" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -#, fuzzy -msgid "Exit" -msgstr "Izađi" - -#. +> trunk -#: kreplacements/kreplacements.h:105 -#, fuzzy -msgid "Continue" -msgstr "Nastavi" - -#. +> trunk -#: main.cpp:74 main.cpp:76 -msgid "Ignored. (User defined.)" -msgstr "" - -#. +> trunk -#: main.cpp:162 -msgid "kdiff3" -msgstr "" - -#. +> trunk -#: main.cpp:166 -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" - -#. +> trunk -#: main.cpp:167 -#, fuzzy -msgid "(c) 2002-2011 Joachim Eibl" -msgstr "© 2006 Sebastian Sauer" - -#. +> trunk -#: main.cpp:175 -msgid "Eike Sauer" -msgstr "" - -#. +> trunk -#: main.cpp:175 -msgid "Bugfixes, Debian package maintainer" -msgstr "" - -#. +> trunk -#: main.cpp:176 -msgid "Sebastien Fricker" -msgstr "" - -#. +> trunk -#: main.cpp:176 -msgid "Windows installer" -msgstr "" - -#. +> trunk -#: main.cpp:177 -#, fuzzy -msgid "Stephan Binner" -msgstr "Stephan Binner" - -#. +> trunk -#: main.cpp:177 -msgid "i18n-help" -msgstr "" - -#. +> trunk -#: main.cpp:178 -msgid "Stefan Partheymueller" -msgstr "" - -#. +> trunk -#: main.cpp:178 -msgid "Clipboard-patch" -msgstr "" - -#. +> trunk -#: main.cpp:179 -#, fuzzy -msgid "David Faure" -msgstr "David Faure" - -#. +> trunk -#: main.cpp:179 -msgid "KIO-Help" -msgstr "" - -#. +> trunk -#: main.cpp:180 -#, fuzzy -msgid "Bernd Gehrmann" -msgstr "Bernd Gehrmann" - -#. +> trunk -#: main.cpp:180 -msgid "Class CvsIgnoreList from Cervisia" -msgstr "" - -#. +> trunk -#: main.cpp:181 -msgid "Andre Woebbeking" -msgstr "" - -#. +> trunk -#: main.cpp:181 -msgid "Class StringMatcher" -msgstr "" - -#. +> trunk -#: main.cpp:182 -msgid "Michael Denio" -msgstr "" - -#. +> trunk -#: main.cpp:182 -msgid "Directory Equality-Coloring patch" -msgstr "" - -#. +> trunk -#: main.cpp:183 -msgid "Manfred Koehler" -msgstr "" - -#. +> trunk -#: main.cpp:183 -msgid "Fix for slow startup on Windows" -msgstr "" - -#. +> trunk -#: main.cpp:184 -msgid "Sergey Zorin" -msgstr "" - -#. +> trunk -#: main.cpp:184 -msgid "Diff Ext for Windows" -msgstr "" - -#. +> trunk -#: main.cpp:185 -msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -msgstr "" - -#. +> trunk -#: main.cpp:185 -msgid "GNU-Diffutils" -msgstr "" - -#. +> trunk -#: main.cpp:186 -msgid "Tino Boellsterling, Timothy Mee" -msgstr "" - -#. +> trunk -#: main.cpp:186 -msgid "Intensive test, use and feedback" -msgstr "" - -#. +> trunk -#: main.cpp:187 -msgid "Michael Schmidt" -msgstr "" - -#. +> trunk -#: main.cpp:187 -msgid "Mac support" -msgstr "" - -#. +> trunk -#: main.cpp:188 -msgid "Valentin Rusu" -msgstr "" - -#. +> trunk -#: main.cpp:188 main.cpp:189 -#, fuzzy -msgid "KDE4 porting" -msgstr "Prijelaz u KDE4" - -#. +> trunk -#: main.cpp:189 -#, fuzzy -msgid "Albert Astals Cid" -msgstr "Albert Astals Cid" - -#. +> trunk -#: main.cpp:190 -#, fuzzy -msgid "Silvan Scherrer" -msgstr "Simon Schmeisser" - -#. +> trunk -#: main.cpp:190 -#, fuzzy -msgid "OS2 port" -msgstr "Prebacio na SGI" - -#. +> trunk -#: main.cpp:192 -msgid "+ Many thanks to those who reported bugs and contributed ideas!" -msgstr "" - -#. +> trunk -#: main.cpp:198 -msgid "Merge the input." -msgstr "" - -#. +> trunk -#: main.cpp:199 -msgid "Explicit base file. For compatibility with certain tools." -msgstr "" - -#. +> trunk -#: main.cpp:200 -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" - -#. +> trunk -#: main.cpp:201 -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "" - -#. +> trunk -#: main.cpp:202 -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" - -#. +> trunk -#: main.cpp:203 -msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "" - -#. +> trunk -#: main.cpp:204 -msgid "Visible name replacement for input file 1 (base)." -msgstr "" - -#. +> trunk -#: main.cpp:205 -msgid "Visible name replacement for input file 2." -msgstr "" - -#. +> trunk -#: main.cpp:206 -msgid "Visible name replacement for input file 3." -msgstr "" - -#. +> trunk -#: main.cpp:207 -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" - -#. +> trunk -#: main.cpp:208 -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "" - -#. +> trunk -#: main.cpp:209 -msgid "Show list of config settings and current values." -msgstr "" - -#. +> trunk -#: main.cpp:210 -msgid "Use a different config file." -msgstr "" - -#. +> trunk -#: main.cpp:213 -msgid "file1 to open (base, if not specified via --base)" -msgstr "" - -#. +> trunk -#: main.cpp:214 -msgid "file2 to open" -msgstr "" - -#. +> trunk -#: main.cpp:215 -msgid "file3 to open" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 -#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 -#: mergeresultwindow.cpp:1014 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:303 -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:834 pdiff.cpp:532 -msgid "All input files are binary equal." -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:836 -msgid "All input files contain the same text." -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 -#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 -#: mergeresultwindow.cpp:843 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:849 -msgid "Total number of conflicts: " -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:850 -msgid "" -"\n" -"Nr of automatically solved conflicts: " -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:851 -msgid "" -"\n" -"Nr of unsolved conflicts: " -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:853 -msgid "Conflicts" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1728 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1736 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2725 -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 -msgid "Conflicts Left" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2734 -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2748 -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 -msgid "File Save Error" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2792 -msgid "Error while writing." -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:3122 -#, fuzzy -msgid "Output" -msgstr "Izlaz" - -#. +> trunk -#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 -msgid "[Modified]" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:3141 -msgid "Encoding for saving" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:3229 -#, fuzzy -msgid "Conflict" -msgstr "Konflikt" - -#. +> trunk -#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 -#: mergeresultwindow.cpp:3265 -msgid "Codec from" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:367 -msgid "Unicode, 8 bit" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:368 -#, fuzzy -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk -#: optiondialog.cpp:369 -msgid "Latin1" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:388 -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:465 -#, fuzzy -msgid "Configure" -msgstr "Postavi" - -#. +> trunk -#: optiondialog.cpp:531 -#, fuzzy -msgid "Font" -msgstr "Pismo" - -#. +> trunk -#: optiondialog.cpp:532 -msgid "Editor & Diff Output Font" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:556 -msgid "Italic font for deltas" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:559 -msgid "" -"Selects the italic version of the font for differences.\n" -"If the font doesn't support italic characters, then this does nothing." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:568 -#, fuzzy -msgid "Color" -msgstr "Boja" - -#. +> trunk -#: optiondialog.cpp:569 -msgid "Colors Settings" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:588 -msgid "Editor and Diff Views:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:596 -#, fuzzy -msgid "Foreground color:" -msgstr "Boja prednjeg plana:" - -#. +> trunk -#: optiondialog.cpp:603 -#, fuzzy -msgid "Background color:" -msgstr "Boja pozadine:" - -#. +> trunk -#: optiondialog.cpp:612 -msgid "Diff background color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:620 -msgid "Color A:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:628 -msgid "Color B:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:636 -msgid "Color C:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:643 -msgid "Conflict color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:651 -msgid "Current range background color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:659 -msgid "Current range diff background color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:666 -msgid "Color for manually aligned difference ranges:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:672 -msgid "Directory Comparison View:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:678 -msgid "Newest file color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:682 -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:687 -msgid "Oldest file color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:695 -msgid "Middle age file color:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:703 -msgid "Color for missing files:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:717 -#, fuzzy -msgid "Editor" -msgstr "Uređivač" - -#. +> trunk -#: optiondialog.cpp:718 -msgid "Editor Behavior" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:732 -msgid "Tab inserts spaces" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:735 -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:741 -msgid "Tab size:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:747 -msgid "Auto indentation" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:750 -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:754 -msgid "Auto copy selection" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:757 -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:772 -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:784 -#, fuzzy -msgid "Diff" -msgstr "Razlika" - -#. +> trunk -#: optiondialog.cpp:785 -msgid "Diff Settings" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:809 -msgid "Treat as white space." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:811 -msgid "Ignore numbers" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:814 -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:819 -msgid "Ignore C/C++ comments" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:821 -msgid "Treat C/C++ comments like white space." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:825 -msgid "Ignore case" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:828 -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:832 -msgid "Preprocessor command:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:836 -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:839 -msgid "Line-matching preprocessor command:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:843 -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:846 -msgid "Try hard (slower)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:849 -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:854 -msgid "Align B and C for 3 input files" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:857 -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:870 -msgid "Merge Settings" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:885 -msgid "Auto advance delay (ms):" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:890 -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 "" - -#. +> trunk -#: optiondialog.cpp:895 -msgid "Show info dialogs" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:897 -msgid "Show a dialog with information about the number of conflicts." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:900 -msgid "White space 2-file merge default:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:904 optiondialog.cpp:917 -msgid "Manual Choice" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:908 optiondialog.cpp:922 -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:913 -msgid "White space 3-file merge default:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:927 -msgid "Automatic Merge Regular Expression" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:936 smalldialogs.cpp:414 -msgid "Auto merge regular expression:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:940 -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:946 -msgid "Run regular expression auto merge on merge start" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:948 -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:953 -msgid "Version Control History Merging" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:962 smalldialogs.cpp:441 -msgid "History start regular expression:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:966 -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:972 smalldialogs.cpp:469 -msgid "History entry start regular expression:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:984 -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:992 -msgid "History merge sorting" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:994 -msgid "Sort version control history by a key." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1004 -msgid "History entry start sort key order:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1008 -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1019 -msgid "Merge version control history on merge start" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1021 -msgid "Run version control history automerge on merge start." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1025 -msgid "Max number of history entries:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1028 -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1032 -msgid "Test your regular expressions" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1037 -msgid "Irrelevant merge command:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1041 -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1047 -msgid "Auto save and quit on merge without conflicts" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1050 -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1061 optiondialog.cpp:1062 -#, fuzzy -msgid "Directory" -msgstr "Direktorij" - -#. +> trunk -#: optiondialog.cpp:1075 -msgid "Recursive directories" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1077 -msgid "Whether to analyze subdirectories or not." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1079 -msgid "File pattern(s):" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1084 -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1090 -msgid "File-anti-pattern(s):" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1095 -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1101 -msgid "Dir-anti-pattern(s):" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1106 -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1112 -msgid "Use .cvsignore" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1115 -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1120 -msgid "Find hidden files and directories" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1123 -msgid "Finds files and directories with the hidden attribute." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1125 -msgid "Finds files and directories starting with '.'." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1129 -msgid "Follow file links" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1132 -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1137 -msgid "Follow directory links" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1140 -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1156 -msgid "Case sensitive filename comparison" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1159 -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1163 -msgid "File Comparison Mode" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1169 -msgid "Binary comparison" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1170 -msgid "Binary comparison of each file. (Default)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1173 -msgid "Full analysis" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1174 -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1178 -msgid "Trust the size and modification date (unsafe)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1179 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1184 -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1185 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1190 -msgid "Trust the size (unsafe)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1191 -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 "" - -#. +> trunk -#: optiondialog.cpp:1199 -msgid "Synchronize directories" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1202 -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 "" - -#. +> trunk -#: optiondialog.cpp:1208 -msgid "White space differences considered equal" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1211 -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1217 -msgid "Copy newer instead of merging (unsafe)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1220 -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 "" - -#. +> trunk -#: optiondialog.cpp:1225 -msgid "Backup files (.orig)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1228 -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1301 optiondialog.cpp:1302 -msgid "Regional Settings" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1405 -msgid "Language (restart required)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1448 -msgid "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1466 -msgid "Use the same encoding for everything:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1469 -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1474 -msgid "Note: Local Encoding is " -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1478 -msgid "File Encoding for A:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1484 -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 -msgid "Auto Detect Unicode" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1493 -msgid "File Encoding for B:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1502 -msgid "File Encoding for C:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1511 -msgid "File Encoding for Merge Output and Saving:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1515 -#, fuzzy -msgid "Auto Select" -msgstr "Automatsko biranje" - -#. +> trunk -#: optiondialog.cpp:1518 -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1522 -msgid "File Encoding for Preprocessor Files:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1533 -msgid "Right To Left Language" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1536 -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1551 -msgid "Integration" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1552 -msgid "Integration Settings" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1566 -msgid "Command line options to ignore:" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1571 -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1578 -msgid "Quit also via Escape key" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1581 -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1586 -msgid "Integrate with ClearCase" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1589 -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1595 -msgid "Remove ClearCase Integration" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1598 -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1683 -msgid "Incompatible Font" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1684 -msgid "Continue at Own Risk" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1685 -msgid "Select Another Font" -msgstr "" - -#. +> trunk -#: optiondialog.cpp:1720 -msgid "This resets all options. Not only those of the current topic." -msgstr "" - -#. +> trunk -#: pdiff.cpp:260 -msgid "PreprocessorCmd: " -msgstr "" - -#. +> trunk -#: pdiff.cpp:265 -msgid "The following option(s) you selected might change data:\n" -msgstr "" - -#. +> trunk -#: pdiff.cpp:266 -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" - -#. +> trunk -#: pdiff.cpp:268 -msgid "Option Unsafe for Merging" -msgstr "" - -#. +> trunk -#: pdiff.cpp:269 -msgid "Use These Options During Merge" -msgstr "" - -#. +> trunk -#: pdiff.cpp:270 -msgid "Disable Unsafe Options" -msgstr "" - -#. +> trunk -#: pdiff.cpp:300 -msgid "Loading A" -msgstr "" - -#. +> trunk -#: pdiff.cpp:304 -msgid "Loading B" -msgstr "" - -#. +> trunk -#: pdiff.cpp:321 pdiff.cpp:347 -msgid "Diff: A <-> B" -msgstr "" - -#. +> trunk -#: pdiff.cpp:327 pdiff.cpp:372 -msgid "Linediff: A <-> B" -msgstr "" - -#. +> trunk -#: pdiff.cpp:338 -msgid "Loading C" -msgstr "" - -#. +> trunk -#: pdiff.cpp:350 -msgid "Diff: B <-> C" -msgstr "" - -#. +> trunk -#: pdiff.cpp:353 -msgid "Diff: A <-> C" -msgstr "" - -#. +> trunk -#: pdiff.cpp:375 -msgid "Linediff: B <-> C" -msgstr "" - -#. +> trunk -#: pdiff.cpp:378 -msgid "Linediff: A <-> C" -msgstr "" - -#. +> trunk -#: pdiff.cpp:534 -msgid "All input files contain the same text, but are not binary equal." -msgstr "" - -#. +> trunk -#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" - -#. +> trunk -#: pdiff.cpp:551 -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 "" - -#. +> trunk -#: pdiff.cpp:566 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Don't save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" - -#. +> trunk -#: pdiff.cpp:1080 -#, fuzzy -msgid "Abort" -msgstr "Prekid" - -#. +> trunk -#: pdiff.cpp:1087 pdiff.cpp:1175 -msgid "Opening files..." -msgstr "" - -#. +> trunk -#: pdiff.cpp:1152 pdiff.cpp:1223 -msgid "File open error" -msgstr "" - -#. +> trunk -#: pdiff.cpp:1255 -#, fuzzy -msgid "Cutting selection..." -msgstr "Režem izabrano …" - -#. +> trunk -#: pdiff.cpp:1276 -#, fuzzy -msgid "Copying selection to clipboard..." -msgstr "Kopiranje odabira u odlagalište …" - -#. +> trunk -#: pdiff.cpp:1292 -#, fuzzy -msgid "Inserting clipboard contents..." -msgstr "Ubacivanje sadržaja odlagališta …" - -#. +> trunk -#: pdiff.cpp:1814 -msgid "Save && Continue" -msgstr "" - -#. +> trunk -#: pdiff.cpp:1815 -msgid "Continue Without Saving" -msgstr "" - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search complete." -msgstr "" - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search Complete" -msgstr "" - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Nothing is selected in either diff input window." -msgstr "" - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Error while adding manual diff range" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:58 -msgid "A (Base):" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 -#: smalldialogs.cpp:142 -#, fuzzy -msgid "File..." -msgstr "Datoteka…" - -#. +> trunk -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:144 -msgid "Dir..." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:93 -msgid "C (Optional):" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:116 -msgid "Swap/Copy Names ..." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 -#, kde-format -msgid "Swap %1<->%2" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 -#, kde-format -msgid "Copy %1->Output" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 -#, kde-format -msgid "Swap %1<->Output" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:136 -msgid "Output (optional):" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:168 -#, fuzzy -msgid "Configure..." -msgstr "Konfiguriranje …" - -#. +> trunk -#: smalldialogs.cpp:174 -#, fuzzy -msgid "&OK" -msgstr "&U redu" - -#. +> trunk -#: smalldialogs.cpp:362 -msgid "Search text:" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:369 -#, fuzzy -msgid "Case sensitive" -msgstr "Osjetljivost na veličinu slova" - -#. +> trunk -#: smalldialogs.cpp:372 -msgid "Search A" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:377 -msgid "Search B" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:382 -msgid "Search C" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:387 -msgid "Search output" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:392 -#, fuzzy -msgid "&Search" -msgstr "&Traži" - -#. +> trunk -#: smalldialogs.cpp:409 -msgid "Regular Expression Tester" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:422 -msgid "Example auto merge line:" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:424 -msgid "To test auto merge, copy a line as used in your files." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 -msgid "Match result:" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:449 -msgid "Example history start line (with leading comment):" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:451 -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:477 -msgid "History sort key order:" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:485 -msgid "Example history entry start line (without leading comment):" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:487 -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:501 -msgid "Sort key result:" -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:508 -#, fuzzy -msgid "OK" -msgstr "U redu" - -#. +> trunk -#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 -msgid "Match success." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 -msgid "Match failed." -msgstr "" - -#. +> trunk -#: smalldialogs.cpp:574 -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "" - -#, fuzzy -#~ msgid "Not matching quotation marks." -#~ msgstr "Automatski dodaj završni znak citata" - -#, fuzzy -#~ msgid "Dos/Windows" -#~ msgstr "Dos/Windows" - -#, fuzzy -#~ msgid "Autodetect" -#~ msgstr "Samodetekcija" Index: trunk/l10n-support/it/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/it/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/it/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,54 @@ +# translation of desktop_extragear-utils_kdiff3.po to Italian +# Giovanni Venturi , 2003. +# Giovanni Venturi , 2003, 2004, 2005. +# Federico Zenith , 2003, 2004, 2005, 2007, 2009, 2011. +# FiNeX , 2007. +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2011-05-02 08:09+0200\n" +"Last-Translator: Federico Zenith \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Interfaccia per i comandi diff e patch" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Uno strumento di confronto e fusione di file e cartelle" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "Confronta o fondi file e cartelle con KDiff3" + +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "KDiff3" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "Confronta o fondi file e cartelle" Property changes on: trunk/l10n-support/it/summit/messages/kdereview/kdiff3._desktop_.po ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,0 ## Index: trunk/l10n-support/it/summit/messages/kdereview/kdiff3._json_.po =================================================================== --- trunk/l10n-support/it/summit/messages/kdereview/kdiff3._json_.po (nonexistent) +++ trunk/l10n-support/it/summit/messages/kdereview/kdiff3._json_.po (revision 1522187) @@ -0,0 +1,21 @@ +# Paolo Zamponi , 2018. +msgid "" +msgstr "" +"Project-Id-Version: json files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2018-05-25 17:14+0100\n" +"Last-Translator: Paolo Zamponi \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "Confronta e fonde i file o le cartelle con KDiff3" Index: trunk/l10n-support/it/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/it/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/it/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4490 @@ +# translation of kdiff3.po to Italian +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +# +# Andrea Celli , 2003, 2004, 2005. +# Marcello Anni , 2006, 2007. +# Giovanni Venturi , 2006. +# Federico Zenith , 2009, 2010, 2011. +# Valter Mura , 2018. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-06 07:33+0200\n" +"PO-Revision-Date: 2018-03-26 21:42+0100\n" +"Last-Translator: Valter Mura \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Valter Mura,Federico Zenith,Marcello Anni,Andrea Celli" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "valtermura@gmail.com,,," + +#. +> trunk5 +#: diff.cpp:258 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "La copia da appunti a file temporaneo non è riuscita." + +#. +> trunk5 +#: diff.cpp:262 +#, kde-format +msgid "From Clipboard" +msgstr "Dagli appunti" + +#. +> trunk5 +#: diff.cpp:563 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Atteso spazio dopo apostrofo di chiusura." + +#. +> trunk5 +#: diff.cpp:566 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Apostrofi corrisponenti mancanti." + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Apostrofo inatteso in argomento." + +#. +> trunk5 +#: diff.cpp:595 +#, kde-format +msgid "No program specified." +msgstr "Nessun programma specificato" + +#. +> trunk5 +#: diff.cpp:710 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"La pre-elaborazione non sembra riuscita. Controlla questo comando:\n" +"\n" +" %1\n" +"\n" +"Il comando di pre-elaborazione verrà ora disabilitato." + +#. +> trunk5 +#: diff.cpp:757 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"La pre-ricerca di righe simili non sembra riuscita. Controlla questo " +"comando:\n" +"\n" +" %1\n" +"\n" +"Il comando di pre-ricerca di righe simili verrà ora disabilitato." + +#. +> trunk5 +#: diff.cpp:784 +#, kde-format +msgid "File %1 too large to process. Skipping." +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, fuzzy, kde-format +#| msgid "Line not available" +msgid "File %1: Line not available" +msgstr "Riga non disponibile" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, kde-format +msgid "Encoding:" +msgstr "Codifica:" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 +#, kde-format +msgid "Line end style:" +msgstr "Tipo di fine riga:" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 +#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 +#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 +#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 +#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 +#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 +#: smalldialogs.cpp:126 smalldialogs.cpp:129 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 +#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 +#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 +#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 +#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 +#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 +#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 +#: smalldialogs.cpp:127 smalldialogs.cpp:130 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 +#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 +#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 +#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 +#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 +#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: difftextwindow.cpp:1858 +#, fuzzy, kde-format +#| msgid "A (Base):" +msgid "A (Base)" +msgstr "A (Base):" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Encoding: %1" +msgstr "Codifica:" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, fuzzy, kde-format +#| msgid "Line end style:" +msgid "Line end style: %1" +msgstr "Tipo di fine riga:" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "Riga superiore" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, kde-format +msgid "End" +msgstr "Fine" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, kde-format +msgid "Open File" +msgstr "Apri file" + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, kde-format +msgid "Other" +msgstr "Altro" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "Non risolto" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "Risolto" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "Non vuoto" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "Vuoto" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "Copia A su B" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "Copia B su A" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "Elimina A" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "Elimina B" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Elimina A e B" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "Fondi con A" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "Fondi con B" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Fondi con A e B" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "Elimina (se esiste)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Fondi" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Fondi (manuale)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Errore: tipi di file in conflitto" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Errore: modificato ed eliminato." + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Errore: le date coincidono ma i file sono diversi." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, kde-format +msgid "Done" +msgstr "Fatto" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "Errore" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Saltato." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Non salvato." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "In esecuzione..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "Da fare." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "Nome" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "Operazione" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "Stato" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Insieme di collegamenti e file normali." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Collegamento: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Dimensione. " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Data e dimensione: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Creazione di una copia temporanea di %1 non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Apertura di %1 non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Confronto del file..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Errore nella lettura di %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" +"Stai fondendo delle cartelle. Sei sicuro di voler interrompere la fusione e " +"riesaminare la cartella?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 +#, kde-format +msgid "Warning" +msgstr "Avviso" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "Riesamina" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1030 +#, kde-format +msgid "Continue Merging" +msgstr "Continua la fusione" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Apertura di cartelle non riuscita:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "La cartella A «%1» non esiste o non è una cartella.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "" +"La cartella B «%1» non esiste o non è una cartella.\n" +".\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "La cartella C «%1» non esiste o non è una cartella.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Errore nell'apertura di una cartella" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" +"Check again before continuing." +msgstr "" +"La cartella di destinazione non può essere la stessa di A o B quando si " +"fondono tre cartelle.\n" +"Ricontrolla prima di continuare." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Attenzione ai parametri" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Esame delle cartelle..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Lettura della cartella A" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Lettura della cartella B" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Lettura della cartella C" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Alcune sottocartelle non erano leggibili" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Controlla i permessi per le sottocartelle." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 +#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 +#, kde-format +msgid "Ready." +msgstr "Pronto." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of manual merges:" +msgid "Number of manual merges: %1" +msgstr "Numero di fusioni manuali:" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "Questo riguarda tutte le operazioni di fusione." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Modifica di tutte le operazioni di fusione" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgid "Processing " +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "Elaborazione in corso " + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Questa operazione non è attualmente possibile." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "Operazione non possibile" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "Si è verificato un errore durante la copia.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "Errore di fusione" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Operazione di fusione sconosciuta (non deve mai succedere)." + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "Operazione di fusione sconosciuta." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" +"La fusione sta per iniziare.\n" +"\n" +"Scegli «Procedi» se hai letto le istruzioni e sai cosa stai facendo.\n" +"\n" +"Scegli «Simula» per vedere cosa succederebbe.\n" +"\n" +"Stai attento perché questo programma è ancora una «beta» e non c'è " +"nessuna garanzia che funzioni! Fai una copia di sicurezza dei tuoi " +"dati importanti!" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "Inizio della fusione" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "Procedi" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "Simula" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" +"L'elemento evidenziato è di diverso tipo nelle diverse cartelle. Scegli cosa " +"fare." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " +"fare." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "" +"The highlighted item was changed in one directory and deleted in the other. " +"Select what to do." +msgstr "" +"L'elemento evidenziato è stato modificato in una cartella ed eliminato " +"nell'altra. Scegli cosa fare." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "" +"This operation is currently not possible because directory merge is " +"currently running." +msgstr "" +"Attualmente non si può effettuare questa operazione perché è in corso una " +"fusione tra cartelle." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" +"Si è verificato un errore nell'ultimo passaggio.\n" +"Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "Continua la fusione dopo un errore" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "Continua con l'ultimo" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "Saltalo" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "Operazione di fusione completata." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "Fusione completata" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "" +"Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" +"Fusione simulata completata: controlla se ti vanno bene le operazioni " +"proposte." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "Si è verificato un errore. Premi OK per maggiori informazioni.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Errore: nell'eliminare %1: impossibile creare una copia di sicurezza." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "elimina cartella ricorsivamente (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "elimina (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" +"Errore: eliminazione della cartella non riuscita durante la sua lettura." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Errore: operazione di rimozione di una cartella (%1) non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Errore: eliminazione non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "fusione manuale (%1, %2,%3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid "" +" Note: After a manual merge the user should continue by pressing F7." +msgstr "" +" Nota: dopo una fusione manuale l'utente dovrebbe premere F7 per " +"continuare." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"Errore: copia (%1 -> %2) non riuscita. Eliminazione della destinazione " +"esistente non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copia collegamento (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" +"Errore: copia di collegamento non riuscita: i collegamenti remoti non sono " +"ancora supportati." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Errore: copia di collegamento non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "copia (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" +"Errore nella rinomina (%1 -> %2): impossibile eliminare la destinazione " +"esistente." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "rinomina (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "Errore: rinomina non riuscita." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" +"Errore durante la creazione della cartella %1. Impossibile eliminare un file " +"esistente." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "crea cartella (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "Errore nella creazione di una cartella." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "Destinazione" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "Cartella" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "Tipo" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "Dimensione" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "Attributo" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "Ultima modifica" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "Destinazione del collegamento" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "File" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +#| msgid "Link: " +msgid "-Link" +msgstr "Collegamento: " + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "non disponibile" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (destinazione): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (base): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (destinazione): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (destinazione): " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "Destinazione: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Salva lo stato di fusione tra cartelle come..." + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Avvia o continua fusione tra cartelle" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Esegui operazione sull'elemento attuale" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "Confronta il file selezionato" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "Fondi il file attuale" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Fondi\n" +"file" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Chiudi tutte le sottocartelle" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Apri tutte le sottocartelle" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "Scegli A per tutti gli elementi" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "Scegli B per tutti gli elementi" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "Scegli C per tutti gli elementi" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Operazione di scelta automatica per tutti gli elementi" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "Nessuna operazione per tutti gli elementi" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "Mostra file identici" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"File\n" +"identici" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "Mostra file diversi" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "Mostra file solo in A" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"File\n" +"solo in A" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "Mostra file solo in B" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"File\n" +"solo in B" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "Mostra file solo in C" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"File\n" +"solo in C" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Confronta file selezionati esplicitamente" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Fondi file selezionati esplicitamente" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "Non fare nulla" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "Elimina A e B" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "Fondi con A e B" + +#. +> trunk5 +#: fileaccess.cpp:915 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"Cercando di creare una copia di sicurezza, non è stato possibile rimuoverne " +"una precedente.\n" +"Nome del file: " + +#. +> trunk5 +#: fileaccess.cpp:922 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"Cercando di creare una copia di sicurezza, non è riuscita la rinomina.\n" +"Nomi dei file: " + +#. +> trunk5 +#: fileaccess.cpp:946 +#, kde-format +msgid "Getting file status: %1" +msgstr "Recupero informazioni sullo stato del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:988 +#, kde-format +msgid "Reading file: %1" +msgstr "Lettura del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1026 +#, kde-format +msgid "Writing file: %1" +msgstr "Scrittura del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1059 +#, kde-format +msgid "Out of memory" +msgstr "Memoria esaurita" + +#. +> trunk5 +#: fileaccess.cpp:1094 +#, kde-format +msgid "Making directory: %1" +msgstr "Creazione della cartella: %1" + +#. +> trunk5 +#: fileaccess.cpp:1114 +#, kde-format +msgid "Removing directory: %1" +msgstr "Rimozione della cartella: %1" + +#. +> trunk5 +#: fileaccess.cpp:1129 +#, kde-format +msgid "Removing file: %1" +msgstr "Rimozione del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1145 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Creazione del collegamento simbolico: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1173 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Rinomina del file: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1205 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Copia del file: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1219 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "" +"Errore durante la copia di un file: apertura del file in lettura non " +"riuscita. Nome del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1225 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "" +"Errore durante la copia di un file: l'apertura del file in scrittura non " +"riuscita. Nome del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1237 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" +"Errore durante la copia di un file: lettura non riuscita. Nome del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1246 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "" +"Errore durante la copia di un file: Scrittura non riuscita. Nome del file: %1" + +#. +> trunk5 +#: fileaccess.cpp:1529 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "Lettura della cartella: " + +#. +> trunk5 +#: fileaccess.cpp:1650 +#, kde-format +msgid "Listing directory: %1" +msgstr "Elenco della cartella: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "Configurazione attuale:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "Errore nelle opzioni di configurazione:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "" +"Opzione --auto inserita, ma non è stato indicato nessun del file di uscita." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "Opzione --auto ignorata nel confronto di cartelle." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "Salvataggio non riuscito." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Apertura di questi file non riuscita:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "Errore nell'apertura di un file" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Apre documenti per confrontarli..." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "Ricarica" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Salva il risultato della fusione. Tutti i conflitti vanno risolti!" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "Salva il documento attuale come..." + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "Stampa le differenze" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "Esce dall'applicazione" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Taglia la sezione selezionata e la mette negli appunti" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Copia la sezione selezionata negli appunti" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Incolla il contenuto degli appunti nella posizione attuale" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "Seleziona tutto nella finestra attuale" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "Cerca una stringa" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "Cerca di nuovo la stringa" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Abilita o disabilita la barra di stato" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "Configura KDiff3..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "Vai alla differenza attuale" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Differenza\n" +"attuale" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "Vai alla prima differenza" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"Prima\n" +"differenza" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "Vai all'ultima differenza" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Ultima\n" +"differenza" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" +"(Ignora le differenze di soli spazi quando «Mostra spazi» è disattivato)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "" +"(Does not skip white space differences even when \"Show White Space\" is " +"disabled.)" +msgstr "" +"(Non salta le differenze di soli spazi bianchi anche quando «Mostra spazi» è " +"disattivato)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Vai alla differenza precedente" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Differenza\n" +"precedente" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "Vai alla differenza successiva" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Differenza\n" +"successiva" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Vai al conflitto precedente" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Conflitto\n" +"precedente" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Vai al conflitto successivo" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Conflitto\n" +"successivo" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Vai al conflitto non risolto precedente" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Non risolto\n" +"precedente" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Vai al conflitto non risolto successivo" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Non risolto\n" +"successivo" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Seleziona righe da A" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Scegli\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Seleziona righe da B" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Scegli\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Seleziona righe da C" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Scegli\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "" +"Vai automaticamente al conflitto non risolto successivo dopo aver " +"selezionato la fonte" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Successivo\n" +"automatico" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "Show Space && Tabulator Characters" +msgstr "Mostra spazi e tabulazioni" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "Spazi" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "Mostra spazi" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"Differenze\n" +"di spazi" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "Mostra numeri di riga" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Numeri\n" +"di riga" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Scegli A ovunque" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Scegli B ovunque" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Scegli C ovunque" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Scegli A per tutti i conflitti non risolti" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Scegli B per tutti i conflitti non risolti" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Scegli C per tutti i conflitti non risolti" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Scegli A per tutti i conflitti di spazi non risolti" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Scegli B per tutti i conflitti di spazi non risolti" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Scegli C per tutti i conflitti di spazi non risolti" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Risolvi automaticamente i conflitti semplici" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Imposta le differenze a conflitti" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Esegui la fusione automatica con espressioni regolari" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Risolvi automaticamente i conflitti di cronologia" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Dividi differenze alla selezione" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Unisci le differenze selezionate" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "Mostra finestra A" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "Mostra finestra B" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "Mostra finestra C" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "Riassunto normale" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "Riassunto tra A e B" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "Riassunto tra A e C" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "Riassunto tra B e C" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "A capo automatico nelle finestre delle differenze" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Aggiungi allineamento manuale delle differenze" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Cancella tutti gli allineamenti manuali delle differenze" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "Attiva la finestra successiva" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "Attiva la finestra precedente" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Inverti l'orientamento di divisione" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Vista separata di cartelle e testi" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Cambia tra vista di testi e di cartelle" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1928 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "Il risultato della fusione non è stato salvato." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "Salva ed esci" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "Esci senza salvare" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1939 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Il salvataggio della fusione non è riuscito." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1027 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "È in corso una fusione di cartelle. Sei sicuro di voler interrompere?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "Salvataggio del file..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Salvataggio del file con un nuovo nome..." + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "Salva come..." + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "Stampa non implementata." + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "Stampa..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "Stampa della pagina %1 di %2" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +#| msgid "Selection" +msgid " (Selection)" +msgstr "Selezione" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "Stampa completata." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "Stampa interrotta." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "Uscita..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "Commutazione della barra degli strumenti..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "Commutazione della barra di stato..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, kde-format +msgid "KDiff3 Part" +msgstr "KDiff3 Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "Componente per visualizzare immagini SVG" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "Copyright 2007, Aurélien Gâteau " + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "Impossibile trovare i file da confrontare." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "Configura KDiff3" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:113 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" +"Impossibile inizializzare il componente KDiff3.\n" +"Questo di solito accade per problemi di installazione. Per maggiori dettagli " +"leggi il file README nel pacchetto del codice sorgente." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "&File" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "&Cartella" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Operazione di fusione dell'elemento attuale" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Operazione di sincronizzazione dell'elemento attuale" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgid "&Movement" +msgid "M&ovement" +msgstr "Mo&vimento" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "V&ista di confronto" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +#| msgid "Merge" +msgid "M&erge" +msgstr "Fondi" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "Fi&nestra" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Barra degli strumenti principale" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Ignorato. (definito dall'utente)" + +#. +> trunk5 +#: main.cpp:117 +#, kde-format +msgid " (64 bit)" +msgstr "" + +#. +> trunk5 +#: main.cpp:119 +#, kde-format +msgid " (32 bit)" +msgstr "" + +#. +> trunk5 +#: main.cpp:120 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Strumento per il confronto e la fusione di file e cartelle" + +#. +> trunk5 +#: main.cpp:121 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Merge the input." +msgstr "Fondi l'ingresso." + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "File di base esplicito. Per compatibilità con certi programmi." + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "File di uscita. Implica «-m». Per esempio: -o file_nuovo.txt" + +#. +> trunk5 +#: main.cpp:143 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "File di uscita, di nuovo. Per compatibilità con certi programmi." + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" +"Senza interfaccia se ogni conflitto è risolvibile automaticamente. Serve «-o " +"file»." + +#. +> trunk5 +#: main.cpp:145 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically." +msgid "Do not solve conflicts automatically." +msgstr "Non risolvere i conflitti automaticamente." + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "Mostra sostituzione del nome per il file di ingresso 1 (base)." + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "Mostra sostituzione del nome per il file di ingresso 2." + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "Mostra sostituzione del nome per il file di ingresso 3." + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" +"Sostituzione del nome visibile alternativo. Da specificare una volta per " +"ogni ingresso." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "" +"Override a config setting. Use once for every setting. E.g.: --cs " +"\"AutoAdvance=1\"" +msgstr "" +"Ignora un'impostazione di configurazione. Usa una volta per ogni " +"impostazione. Per esempio: «--cs \"AutoAdvance=1\"»" + +#. +> trunk5 +#: main.cpp:151 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "" +"Mostra la lista delle impostazioni di configurazione e i valori attuali." + +#. +> trunk5 +#: main.cpp:152 +#, kde-format +msgid "Use a different config file." +msgstr "Usa un file di configurazione diverso." + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "File1 da aprire (base, se non specificato con «--base»)" + +#. +> trunk5 +#: main.cpp:156 +#, kde-format +msgid "file2 to open" +msgstr "File2 da aprire" + +#. +> trunk5 +#: main.cpp:157 +#, kde-format +msgid "file3 to open" +msgstr "File3 da aprire" + +#. +> trunk5 +#: main.cpp:168 +#, kde-format +msgid "See kdiff3 --help for supported options." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Numero di conflitti non ancora risolti: %1 (di cui %2 sono di spazi)" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"L'uscita è stata modificata.\n" +"Se continui le modifiche andranno perse." + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:771 +#, kde-format +msgid "All input files are binary equal." +msgstr "Tutti i file di ingresso sono uguali a livello binario." + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "Tutti i file di ingresso contengono lo stesso testo." + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "I file %1 e %2 sono uguali a livello binario.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "I file %1 e %2 hanno lo stesso testo.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, kde-format +msgid "Conflicts" +msgstr "Conflitti" + +#. +> trunk5 +#: mergeresultwindow.cpp:1840 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2934 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"Non sono ancora risolti tutti i conflitti.\n" +"File non salvato.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 +#, kde-format +msgid "Conflicts Left" +msgstr "Conflitti rimanenti" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, fuzzy, kde-format +#| msgid "" +#| "There is a line end style conflict. Please choose the line end style " +#| "manually.\n" +#| "File not saved.\n" +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved." +msgstr "" +"C'è un conflitto di stili di fine riga. Seleziona manualmente lo stile.\n" +"File non salvato.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Creazione della copia di sicurezza non riuscita. File non salvato." + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 +#, kde-format +msgid "File Save Error" +msgstr "Errore nel salvataggio del file" + +#. +> trunk5 +#: mergeresultwindow.cpp:3005 +#, kde-format +msgid "Error while writing." +msgstr "Errore in scrittura." + +#. +> trunk5 +#: mergeresultwindow.cpp:3365 +#, fuzzy, kde-format +#| msgid "Output" +msgid "Output:" +msgstr "Uscita" + +#. +> trunk5 +#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 +#, kde-format +msgid "[Modified]" +msgstr "[Modificato]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3384 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "Codifica per il salvataggio" + +#. +> trunk5 +#: mergeresultwindow.cpp:3484 +#, kde-format +msgid "Conflict" +msgstr "Conflitto" + +#. +> trunk5 +#: mergeresultwindow.cpp:3516 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from A: %1" +msgstr "Codec da" + +#. +> trunk5 +#: mergeresultwindow.cpp:3518 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from B: %1" +msgstr "Codec da" + +#. +> trunk5 +#: mergeresultwindow.cpp:3520 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from C: %1" +msgstr "Codec da" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "Cambia tipo di carattere" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" +"Carattere: %1, %2, %3\n" +"\n" +"Esempio:" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Cambialo se i caratteri non-ASCII non vengono mostrati correttamente." + +#. +> trunk5 +#: optiondialog.cpp:613 +#, kde-format +msgid "Configure" +msgstr "Configura" + +#. +> trunk5 +#: optiondialog.cpp:690 +#, kde-format +msgid "Font" +msgstr "Carattere" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Carattere per l'editor e per l'uscita delle differenze" + +#. +> trunk5 +#: optiondialog.cpp:710 +#, kde-format +msgid "Application font" +msgstr "Carattere applicazione" + +#. +> trunk5 +#: optiondialog.cpp:714 +#, kde-format +msgid "File view font" +msgstr "Carattere vista file" + +#. +> trunk5 +#: optiondialog.cpp:732 +#, kde-format +msgid "Color" +msgstr "Colore" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Colors Settings" +msgstr "Impostazioni dei colori" + +#. +> trunk5 +#: optiondialog.cpp:750 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Editor e visore delle differenze:" + +#. +> trunk5 +#: optiondialog.cpp:758 +#, kde-format +msgid "Foreground color:" +msgstr "Colore di primo piano:" + +#. +> trunk5 +#: optiondialog.cpp:765 +#, kde-format +msgid "Background color:" +msgstr "Colore di sfondo:" + +#. +> trunk5 +#: optiondialog.cpp:774 +#, kde-format +msgid "Diff background color:" +msgstr "Colore di sfondo per le differenze:" + +#. +> trunk5 +#: optiondialog.cpp:782 +#, kde-format +msgid "Color A:" +msgstr "Colore per A:" + +#. +> trunk5 +#: optiondialog.cpp:790 +#, kde-format +msgid "Color B:" +msgstr "Colore per B:" + +#. +> trunk5 +#: optiondialog.cpp:798 +#, kde-format +msgid "Color C:" +msgstr "Colore per C:" + +#. +> trunk5 +#: optiondialog.cpp:805 +#, kde-format +msgid "Conflict color:" +msgstr "Colore per i conflitti:" + +#. +> trunk5 +#: optiondialog.cpp:813 +#, kde-format +msgid "Current range background color:" +msgstr "Colore di sfondo per l'intervallo attuale:" + +#. +> trunk5 +#: optiondialog.cpp:821 +#, kde-format +msgid "Current range diff background color:" +msgstr "Colore di sfondo per le differenze dell'intervallo attuale:" + +#. +> trunk5 +#: optiondialog.cpp:828 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Colore per intervalli di differenze allineate manualmente:" + +#. +> trunk5 +#: optiondialog.cpp:834 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Vista di confronto delle cartelle:" + +#. +> trunk5 +#: optiondialog.cpp:840 +#, kde-format +msgid "Newest file color:" +msgstr "Colore del file più recente:" + +#. +> trunk5 +#: optiondialog.cpp:844 +#, kde-format +msgid "" +"Changing this color will only be effective when starting the next directory " +"comparison." +msgstr "" +"Il cambiamento di questo colore sarà effettivo quando si avvierà un nuovo " +"confronto tra cartelle." + +#. +> trunk5 +#: optiondialog.cpp:849 +#, kde-format +msgid "Oldest file color:" +msgstr "Colore del file più vecchio:" + +#. +> trunk5 +#: optiondialog.cpp:857 +#, kde-format +msgid "Middle age file color:" +msgstr "Colore del file di età media:" + +#. +> trunk5 +#: optiondialog.cpp:865 +#, kde-format +msgid "Color for missing files:" +msgstr "Colore per file mancanti:" + +#. +> trunk5 +#: optiondialog.cpp:878 +#, kde-format +msgid "Editor" +msgstr "Editor" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor Behavior" +msgstr "Comportamento dell'editor" + +#. +> trunk5 +#: optiondialog.cpp:892 +#, kde-format +msgid "Tab inserts spaces" +msgstr "Il tabulatore inserisce spazi" + +#. +> trunk5 +#: optiondialog.cpp:895 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Attivo: premere il tabulatore è come inserire l'appropriato numero di " +"spazi.\n" +"Non attivo: viene inserito un carattere di tabulazione." + +#. +> trunk5 +#: optiondialog.cpp:900 +#, kde-format +msgid "Tab size:" +msgstr "Dimensione della tabulazione:" + +#. +> trunk5 +#: optiondialog.cpp:906 +#, kde-format +msgid "Auto indentation" +msgstr "Rientro automatico" + +#. +> trunk5 +#: optiondialog.cpp:909 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Attivo: la nuova riga avrà lo stesso rientro della riga precedente.\n" + +#. +> trunk5 +#: optiondialog.cpp:912 +#, kde-format +msgid "Auto copy selection" +msgstr "Copia automaticamente la selezione" + +#. +> trunk5 +#: optiondialog.cpp:915 +#, fuzzy, kde-format +#| msgid "" +#| "On: Any selection is immediately written to the clipboard.\n" +#| "Off: You must explicitely copy e.g. via Ctrl-C." +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" +"Attivo: ogni selezione è immediatamente copiata negli appunti.\n" +"Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C." + +#. +> trunk5 +#: optiondialog.cpp:929 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Imposta il fine riga da usare quando salvi un file modificato:\n" +"DOS/Windows: CR+LF; Unix: LF; dove CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:939 +#, kde-format +msgid "Diff" +msgstr "Differenze" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff Settings" +msgstr "Impostazioni delle differenze" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:964 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore numbers (treat as white space)" +msgstr "Tratta come spazio." + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Ignora i caratteri numerici durante il confronto (simile a «Ignora spazi»).\n" +"Può essere utile per confrontare file con dati numerici." + +#. +> trunk5 +#: optiondialog.cpp:971 +#, fuzzy, kde-format +#| msgid "Treat C/C++ comments like white space." +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "Tratta i commenti C e C++ come spazi." + +#. +> trunk5 +#: optiondialog.cpp:973 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Tratta i commenti C e C++ come spazi." + +#. +> trunk5 +#: optiondialog.cpp:976 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore case (treat as white space)" +msgstr "Tratta come spazio." + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" +"Tratta le differenze tra maiuscole e minuscole come modifiche di spazi " +"(«a»<=>«A»)." + +#. +> trunk5 +#: optiondialog.cpp:982 +#, kde-format +msgid "Preprocessor command:" +msgstr "Comando per il preprocessore:" + +#. +> trunk5 +#: optiondialog.cpp:986 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" +"Preprocessore definito dall'utente; vedi il manuale per maggiori dettagli." + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "Preprocessore per il confronto di righe:" + +#. +> trunk5 +#: optiondialog.cpp:993 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Questo preprocessore viene utilizzato solo\n" +"per verificare la corrispondenza di righe;\n" +"vedi il manuale per maggiori dettagli." + +#. +> trunk5 +#: optiondialog.cpp:996 +#, kde-format +msgid "Try hard (slower)" +msgstr "Ricerca approfondita (lenta)" + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Abilita l'opzione --minimal del comando «diff» esterno.\n" +"L'analisi di grandi file sarà molto più lenta." + +#. +> trunk5 +#: optiondialog.cpp:1003 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Allinea B e C per tre file di ingresso" + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Cerca di allineare B e C quando si confrontano o fondono tre file di " +"ingresso.\n" +"Non è raccomandato per la fusione perché potrebbe divenire più complicata.\n" +"Come impostazione predefinita è disattivato." + +#. +> trunk5 +#: optiondialog.cpp:1018 +#, kde-format +msgid "Merge Settings" +msgstr "Impostazioni di fusione" + +#. +> trunk5 +#: optiondialog.cpp:1032 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Ritardo nell'avanzamento automatico (ms):" + +#. +> trunk5 +#: optiondialog.cpp:1037 +#, kde-format +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 "" +"Quando si è in modalità di avanzamento automatico, il risultato della\n" +"selezione attuale viene mostrato per il tempo specificato, prima di\n" +"passare al conflitto successivo. Valori ammessi: 0-2000 ms." + +#. +> trunk5 +#: optiondialog.cpp:1041 +#, kde-format +msgid "Show info dialogs" +msgstr "Mostra finestre informative" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Mostra una finestra con informazioni sul numero di conflitti." + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "Trattamento predefinito degli spazi nel fondere due file:" + +#. +> trunk5 +#: optiondialog.cpp:1050 optiondialog.cpp:1062 +#, kde-format +msgid "Manual Choice" +msgstr "Scelta manuale" + +#. +> trunk5 +#: optiondialog.cpp:1054 optiondialog.cpp:1067 +#, kde-format +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" +"Consenti all'algoritmo di fusione di selezionare automaticamente un ingresso " +"per le modifiche di soli spazi." + +#. +> trunk5 +#: optiondialog.cpp:1058 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "Trattamento predefinito degli spazi nel fondere tre file:" + +#. +> trunk5 +#: optiondialog.cpp:1071 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "Espressione regolare di fusione automatica" + +#. +> trunk5 +#: optiondialog.cpp:1079 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "Espressione regolare di fusione automatica:" + +#. +> trunk5 +#: optiondialog.cpp:1083 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one " +"source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Espressione regolare per le righe dove Kdiff3 dovrebbe scegliere " +"automaticamente una fonte.\n" +"Quando una riga con un conflitto corrisponde all'espressione regolare,\n" +"sarà scelto (se disponibile) C, altrimenti B." + +#. +> trunk5 +#: optiondialog.cpp:1089 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "" +"Esegui la fusione automatica con espressioni regolari all'avvio della fusione" + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Esegui la fusione per le espressioni regolari di fusione\n" +"automatica all'avvio dell'operazione.\n" + +#. +> trunk5 +#: optiondialog.cpp:1096 +#, kde-format +msgid "Version Control History Merging" +msgstr "Fusione della cronologia del controllo di versione" + +#. +> trunk5 +#: optiondialog.cpp:1104 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "Espressione regolare dell'inizio di cronologia:" + +#. +> trunk5 +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Espressione regolare per l'inizio dell'elemento di cronologia del controllo " +"di versione.\n" +"Di solito questa riga contiene la parola chiave «$Log$».\n" +"Valore predefinito: «.*\\$Log.*\\$.*»." + +#. +> trunk5 +#: optiondialog.cpp:1114 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "Espressione regolare di inizio dell'elemento di cronologia:" + +#. +> trunk5 +#: optiondialog.cpp:1126 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading " +"comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" +"See the documentation for details." +msgstr "" +"Un elemento di cronologia del controllo di versione consiste di diverse " +"linee.\n" +"Specifica l'espressione regolare per individuarne la prima (senza il " +"commento iniziale).\n" +"Usa le parentesi per raggruppare le chiavi che vuoi usare per " +"l'ordinamento.\n" +"Se la parte sinistra è mancante, KDiff3 assume che siano delle linee vuote a " +"separare gli elementi della cronologia.\n" +"Vedi la documentazione per i dettagli." + +#. +> trunk5 +#: optiondialog.cpp:1134 +#, kde-format +msgid "History merge sorting" +msgstr "Ordinamento della fusione della cronologia" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "Sort version control history by a key." +msgstr "Ordina la cronologia del controllo di versione secondo una chiave." + +#. +> trunk5 +#: optiondialog.cpp:1146 +#, kde-format +msgid "History entry start sort key order:" +msgstr "" +"Ordine della chiave d'ordinamento d'inizio degli elementi della cronologia:" + +#. +> trunk5 +#: optiondialog.cpp:1150 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history " +"start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Ogni coppia di parentesi usata nell'espressione regolare per la voce di " +"inizio\n" +"della cronologia raggruppa una chiave che può essere usata per " +"l'ordinamento.\n" +"Specifica l'elenco delle chiavi (numerate in ordine di occorrenza a\n" +"partire da 1) usando «,» come separatore (per esempio «4,5,6,1,2,3,7»).\n" +"Se viene lasciato vuoto, non verrà effettuato nessun ordinamento.\n" +"Consulta la documentazione per i ulteriori dettagli." + +#. +> trunk5 +#: optiondialog.cpp:1161 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "Fondi la cronologia del controllo di versione all'inizio della fusione" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "" +"Esegui la fusione automatica della cronologia del controllo di versione " +"all'inizio della fusione." + +#. +> trunk5 +#: optiondialog.cpp:1167 +#, kde-format +msgid "Max number of history entries:" +msgstr "Numero massimo di elementi nella cronologia:" + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Taglia al numero specificato. Usa -1 per un numero infinito di voci." + +#. +> trunk5 +#: optiondialog.cpp:1174 +#, kde-format +msgid "Test your regular expressions" +msgstr "Prova le espressioni regolari" + +#. +> trunk5 +#: optiondialog.cpp:1179 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "Comando di fusione irrilevante:" + +#. +> trunk5 +#: optiondialog.cpp:1183 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Se specificato questo script viene eseguito dopo la fusione\n" +"automatica quando non sono rilevati altri cambiamenti rilevanti.\n" +"Chiamato con i parametri: nome_file1 nome_file2 nome_file3" + +#. +> trunk5 +#: optiondialog.cpp:1188 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "Salvataggio automatico e uscita in caso di fusione senza conflitti" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Quando KDiff3 viene avviato per una fusione di file dalla riga di comando\n" +"e tutti i conflitti sono risolvibili senza azione da parte dell'utente,\n" +"salva automaticamente ed esci.\n" +"È simile all'opzione da riga di comando «--auto»." + +#. +> trunk5 +#: optiondialog.cpp:1202 optiondialog.cpp:1203 +#, kde-format +msgid "Directory" +msgstr "Cartella" + +#. +> trunk5 +#: optiondialog.cpp:1215 +#, kde-format +msgid "Recursive directories" +msgstr "Cartelle ricorsive" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Se analizzare o meno anche le sottocartelle." + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "File pattern(s):" +msgstr "Schemi di file:" + +#. +> trunk5 +#: optiondialog.cpp:1224 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Schemi di file da analizzare.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." + +#. +> trunk5 +#: optiondialog.cpp:1229 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "Schemi di file da escludere:" + +#. +> trunk5 +#: optiondialog.cpp:1234 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Schemi di file da escludere dall'analisi.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." + +#. +> trunk5 +#: optiondialog.cpp:1239 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "Schemi di cartelle da escludere:" + +#. +> trunk5 +#: optiondialog.cpp:1244 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Schemi di cartelle da escludere dall'analisi.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." + +#. +> trunk5 +#: optiondialog.cpp:1249 +#, kde-format +msgid "Use .cvsignore" +msgstr "Usa .cvsignore" + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Estendi l'esclusione a tutto quello che sarebbe ignorato da CVS.\n" +"Si possono usare dei file «.cvsignore» diversi per ogni cartella." + +#. +> trunk5 +#: optiondialog.cpp:1256 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Trova file e cartelle nascosti" + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Trova file e cartelle con l'attributo «nascosto»." + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Trova file e cartelle che iniziano con «.»." + +#. +> trunk5 +#: optiondialog.cpp:1265 +#, kde-format +msgid "Follow file links" +msgstr "Segui i collegamenti dei file" + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Attivo: confronta il file a cui punta il collegamento.\n" +"Non attivo: confronta i collegamenti." + +#. +> trunk5 +#: optiondialog.cpp:1272 +#, kde-format +msgid "Follow directory links" +msgstr "Segui i collegamenti delle cartelle" + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Attivo: confronta la cartella a cui punta il collegamento.\n" +"Non attivo: confronta i collegamenti." + +#. +> trunk5 +#: optiondialog.cpp:1290 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Distingui le maiuscole nel confronto dei nomi dei file" + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names " +"match.\n" +"Set this option if the case of the names must match. (Default for Windows is " +"off, otherwise on.)" +msgstr "" +"Il confronto tra cartelle confronterà file o cartelle quando i loro nomi " +"coincideranno.\n" +"Imposta questa opzione se le lettere maiuscole e minuscole devono essere " +"considerate diverse. L'opzione predefinita per Windows è disattivo, " +"altrimenti è attivo." + +#. +> trunk5 +#: optiondialog.cpp:1297 +#, kde-format +msgid "Unfold all subdirectories on load" +msgstr "Apri tutte le sottocartelle al caricamento" + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" +"Attivo: apre tutte le sottocartelle quando avvii una diff tra cartelle.\n" +"Disattivo: lascia chiuse le sottocartelle." + +#. +> trunk5 +#: optiondialog.cpp:1304 +#, kde-format +msgid "Skip directory status report" +msgstr "Salta rapporto dello stato della cartella" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" +"Attivo: non mostra lo stato del confronto tra le cartelle.\n" +"Disattivo: mostra la finestra di dialogo dello stato all'avvio." + +#. +> trunk5 +#: optiondialog.cpp:1311 +#, kde-format +msgid "File Comparison Mode" +msgstr "Modalità di confronto dei file" + +#. +> trunk5 +#: optiondialog.cpp:1316 +#, kde-format +msgid "Binary comparison" +msgstr "Confronto binario" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Confronto binario per ogni file (predefinito)." + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, kde-format +msgid "Full analysis" +msgstr "Analisi completa" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Fai un'analisi completa e mostra informazioni statistiche in nuove colonne.\n" +"È più lento di un confronto binario e lentissimo su file binari." + +#. +> trunk5 +#: optiondialog.cpp:1325 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Fidati della grandezza e della data di modifica (non sicuro)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assumi che i file sono uguali se hanno la stessa data di modifica e " +"dimensione.\n" +"I file con contenuti identici ma diverse date di modifica risulteranno " +"diversi.\n" +"Utile per confrontare cartelle grandi o per connessioni lente." + +#. +> trunk5 +#: optiondialog.cpp:1331 +#, kde-format +msgid "" +"Trust the size and date, but use binary comparison if date does not match " +"(unsafe)" +msgstr "" +"Fidati della grandezza e della data, ma usa il confronto binario se la data " +"non corrisponde (non sicuro)" + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assumi che i file sono uguali se hanno la stessa data di modifica e " +"dimensione.\n" +"Se le date non sono uguali ma la dimensione sì, usa il confronto binario.\n" +"Utile per confrontare cartelle grandi o per connessioni lente." + +#. +> trunk5 +#: optiondialog.cpp:1337 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Fidati della dimensione (non sicuro)" + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during " +"download." +msgstr "" +"Assumi che i file sono uguali se hanno la stessa dimensione.\n" +"Utile per confrontare cartelle grandi o per connessioni lente,\n" +"dove la data viene modificata nello scaricamento." + +#. +> trunk5 +#: optiondialog.cpp:1345 +#, kde-format +msgid "Synchronize directories" +msgstr "Sincronizza cartelle" + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Permette di memorizzare i file in entrambe le cartelle,\n" +"in modo che poi risultino uguali.\n" +"Funziona solo quando si confrontano due cartelle\n" +"senza specificare una destinazione." + +#. +> trunk5 +#: optiondialog.cpp:1354 +#, kde-format +msgid "White space differences considered equal" +msgstr "Differenze di spazi considerate uguali" + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Se i file differiscono solo per degli spazi, considerali uguali.\n" +"Funziona solo quando si effettua un'analisi completa." + +#. +> trunk5 +#: optiondialog.cpp:1363 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Copia il più recente invece di fondere (non sicuro)" + +#. +> trunk5 +#: optiondialog.cpp:1366 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"Non guardare i contenuti, prendi il più recente e basta.\n" +"Usalo solo se sai quello che stai facendo!\n" +"Funziona solo quando si confrontano due cartelle." + +#. +> trunk5 +#: optiondialog.cpp:1371 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Copie di sicurezza (.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Quando un file sarebbe stato salvato sovrascrivendone su un altro\n" +"quest'ultimo verrà rinominato con l'estensione «.orig» invece di\n" +"essere cancellato." + +#. +> trunk5 +#: optiondialog.cpp:1450 optiondialog.cpp:1451 +#, kde-format +msgid "Regional Settings" +msgstr "Impostazioni locali" + +#. +> trunk5 +#: optiondialog.cpp:1465 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Usa la stessa codifica per tutto:" + +#. +> trunk5 +#: optiondialog.cpp:1468 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Permette di cambiare tutte le codifiche cambiando solo la prima.\n" +"Disattivala se servono impostazioni differenziate." + +#. +> trunk5 +#: optiondialog.cpp:1472 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "Nota: la codifica locale è " + +#. +> trunk5 +#: optiondialog.cpp:1476 +#, kde-format +msgid "File Encoding for A:" +msgstr "Codifica per il file A:" + +#. +> trunk5 +#: optiondialog.cpp:1482 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as " +"fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Se abilitato, verrà rilevata la codifica Unicode (UTF-16 o UTF-8).\n" +"Se il file non è in Unicode, la codifica selezionata sarà usata come " +"ripiego.\n" +"La rilevazione di Unicode dipende dai primi byte di un file." + +#. +> trunk5 +#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Rileva Unicode automaticamente" + +#. +> trunk5 +#: optiondialog.cpp:1490 +#, kde-format +msgid "File Encoding for B:" +msgstr "Codifica per il file B:" + +#. +> trunk5 +#: optiondialog.cpp:1499 +#, kde-format +msgid "File Encoding for C:" +msgstr "Codifica per il file C:" + +#. +> trunk5 +#: optiondialog.cpp:1508 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Codifica per il file fuso e il salvataggio:" + +#. +> trunk5 +#: optiondialog.cpp:1512 +#, kde-format +msgid "Auto Select" +msgstr "Seleziona automaticamente" + +#. +> trunk5 +#: optiondialog.cpp:1515 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for " +"saving." +msgstr "" +"Se abilitato viene usata la codifica dei file di ingresso.\n" +"Nei casi ambigui una finestra chiederà all'utente di scegliere la codifica " +"per il salvataggio." + +#. +> trunk5 +#: optiondialog.cpp:1518 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Codifica per i file del preprocessore:" + +#. +> trunk5 +#: optiondialog.cpp:1529 +#, kde-format +msgid "Right To Left Language" +msgstr "Lingue scritte da destra a sinistra" + +#. +> trunk5 +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Alcune lingue si leggono da destra a sinistra.\n" +"Questa opzione cambia in tal senso l'editor e la visualizzazione." + +#. +> trunk5 +#: optiondialog.cpp:1542 +#, kde-format +msgid "Integration" +msgstr "Integrazione" + +#. +> trunk5 +#: optiondialog.cpp:1543 +#, kde-format +msgid "Integration Settings" +msgstr "Impostazioni di integrazione" + +#. +> trunk5 +#: optiondialog.cpp:1556 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Opzioni da riga di comando da ignorare:" + +#. +> trunk5 +#: optiondialog.cpp:1561 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by " +"other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Lista delle opzioni da riga di comando che dovrebbero essere ignorate quando " +"KDiff3 viene usato da altri strumenti.\n" +"Si possono specificare diversi valori se separati con «;»\n" +"Questo eliminerà l'errore «Opzione sconosciuta»." + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Esci anche con il tasto Esc" + +#. +> trunk5 +#: optiondialog.cpp:1569 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Metodo di uscita veloce.\n" +"Per chi è abituato a usare il tasto Esc." + +#. +> trunk5 +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "" +"Questo ripristina tutte le opzioni, non solo quelle dell'argomento attuale." + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Errore: perdita dati\n" +"Se è riproducibile, sei pregato di segnalarlo all'autore.\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "Grave errore interno" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Comando del preprocessore: " + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "" +"Le opzioni seguenti che hai selezionato potrebbero modificare dei dati:\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Di solito questo non è quello che si vuole in una fusione.\n" +"Vuoi disabilitare queste opzioni o continuare mantenendole in funzione?" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Opzioni non sicure per la fusione" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Usa queste opzioni nella fusione" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Disattiva le opzioni non sicure" + +#. +> trunk5 +#: pdiff.cpp:170 +#, kde-format +msgid "Loading A" +msgstr "Caricamento di A" + +#. +> trunk5 +#: pdiff.cpp:177 +#, kde-format +msgid "Errors occurred during pre-processing of file A." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:181 +#, kde-format +msgid "Loading B" +msgstr "Caricamento di B" + +#. +> trunk5 +#: pdiff.cpp:188 +#, kde-format +msgid "Errors occurred during pre-processing of file B." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Differenze: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Differenze per righe: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:223 +#, kde-format +msgid "Loading C" +msgstr "Caricamento di C" + +#. +> trunk5 +#: pdiff.cpp:230 +#, kde-format +msgid "Errors occurred during pre-processing of file C." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Differenze: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Differenze: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Differenze per righe: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Differenze per righe: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:773 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "" +"Tutti i file di ingresso contengono lo stesso testo, ma non sono uguali a " +"livello binario." + +#. +> trunk5 +#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" +"I file %1 e %2 contengono lo stesso testo, ma non sono uguali a livello " +"binario. \n" + +#. +> trunk5 +#: pdiff.cpp:797 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"Alcuni file di ingresso non sembrano essere file puramente di testo.\n" +"Tieni conto che la fusione di KDiff3 non è fatta per i file binari.\n" +"Se vuoi continuare, lo fai a tuo rischio e pericolo." + +#. +> trunk5 +#: pdiff.cpp:807 +#, kde-format +msgid ", B" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:809 +#, kde-format +msgid ", C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:811 +#, fuzzy, kde-format +#| msgid "" +#| "Some input characters could not be converted to valid unicode.\n" +#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +#| "Don't save the result if unsure. Continue at your own risk.\n" +#| "Affected input files are in %1." +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Non si è potuto convertire alcuni caratteri in ingresso in Unicode.\n" +"Forse usi la codifica sbagliata (per esempio UTF8 per file non UTF8).\n" +"Non salvare i risultati se non sei sicuro. Continua a tuo rischio e " +"pericolo.\n" +"I file di ingresso in questione sono in %1." + +#. +> trunk5 +#: pdiff.cpp:1029 +#, kde-format +msgid "Abort" +msgstr "Interrompi" + +#. +> trunk5 +#: pdiff.cpp:1035 pdiff.cpp:1123 +#, kde-format +msgid "Opening files..." +msgstr "Apertura dei file..." + +#. +> trunk5 +#: pdiff.cpp:1100 pdiff.cpp:1171 +#, kde-format +msgid "File open error" +msgstr "Errore nell'apertura del file" + +#. +> trunk5 +#: pdiff.cpp:1210 +#, kde-format +msgid "Cutting selection..." +msgstr "Taglio della selezione..." + +#. +> trunk5 +#: pdiff.cpp:1231 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Copia della selezione negli appunti..." + +#. +> trunk5 +#: pdiff.cpp:1247 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Inserimento dei contenuti degli appunti..." + +#. +> trunk5 +#: pdiff.cpp:1718 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "A capo automatico (il comando Annulla lo disabilita)" + +#. +> trunk5 +#: pdiff.cpp:1719 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" +"Calcolo della massima larghezza per la barra di scorrimento orizzontale" + +#. +> trunk5 +#: pdiff.cpp:1930 +#, kde-format +msgid "Save && Continue" +msgstr "Salva e continua" + +#. +> trunk5 +#: pdiff.cpp:1931 +#, kde-format +msgid "Continue Without Saving" +msgstr "Continua senza salvare" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search complete." +msgstr "Ricerca completata." + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search Complete" +msgstr "Ricerca completata" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "" +"Non è selezionato niente in nessuna delle finestre di ingresso delle " +"differenze." + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Errore nell'aggiunta di intervalli di differenze manuali" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "&Annulla" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (Base):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "File..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Cartella..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (Opzionale):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "Scambia e copia nomi..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Scambia %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Copia %1->Uscita" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Scambia %1<->Uscita" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Uscita (opzionale):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Configura..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, kde-format +msgid "Open Directory" +msgstr "Apri cartella" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format +msgid "Select Output File" +msgstr "Seleziona il nome del file di uscita" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Testo da cercare:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Distingui le maiuscole" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Cerca in A" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Cerca in B" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Cerca in C" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Cerca nell'uscita" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Cerca" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Tester delle espressioni regolari" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Esempio di riga di fusione automatica:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "Per provare la fusione automatica, copia una riga così com'è nei file." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Risultato di corrispondenza:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Esempio di riga di inizio di cronologia (con commento iniziale):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Copia una riga di inizio di cronologia così com'è nei file,\n" +"incluso il commento iniziale." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Ordine della chiave d'ordinamento cronologico:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "" +"Esempio di riga di inizio di un elemento di cronologia (senza commento " +"iniziale):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Copia una riga di inizio di un elemento di cronologia così com'è nei file,\n" +"ma ometti il commento iniziale." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "Risultato della chiave di ordinamento:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Confronto riuscito." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Confronto non riuscito." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "" +"Le parentesi aperte e chiuse nell'espressione regolare non corrispondono." + +#~ msgid "Integrate with ClearCase" +#~ msgstr "Integra con ClearCase" + +#~ msgid "" +#~ "Integrate with Rational ClearCase from IBM.\n" +#~ "Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +#~ "(Only enabled when ClearCase \"bin\" directory is in the path.)" +#~ msgstr "" +#~ "Integra con Rational ClearCase di IBM.\n" +#~ "Modifica il file «map» nella sottocartella di ClearCase «lib/mgrs»\n" +#~ "(abilitato solo quando la cartella «bin» di ClearCase è nel percorso)." + +#~ msgid "Remove ClearCase Integration" +#~ msgstr "Rimuovi l'integrazione con ClearCase" + +#~ msgid "" +#~ "Restore the old \"map\" file from before doing the ClearCase integration." +#~ msgstr "" +#~ "Ripristina il vecchio file «map» com'era prima dell'integrazione con " +#~ "ClearCase." + +#~ msgid "&Merge" +#~ msgstr "F&ondi" + +#~ msgid "Line" +#~ msgstr "Riga" + +#~ msgid "Directory Comparison Status" +#~ msgstr "Stato del confronto tra cartelle" + +#~ msgid "Number of subdirectories:" +#~ msgstr "Numero di sottocartelle:" + +#~ msgid "Number of equal files:" +#~ msgstr "Numero di file uguali:" + +#~ msgid "Number of different files:" +#~ msgstr "Numero di file diversi:" + +#~ msgid "Total number of conflicts: " +#~ msgstr "Numero totale di conflitti: " + +#~ msgid "" +#~ "\n" +#~ "Nr of automatically solved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Nº di conflitti risolti automaticamente: " + +#~ msgid "" +#~ "\n" +#~ "Nr of unsolved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "Nº di conflitti non risolti: " + +#~ msgid "Ignore numbers" +#~ msgstr "Ignora i numeri" + +#~ msgid "Ignore C/C++ comments" +#~ msgstr "Ignora i commenti C e C++" + +#~ msgid "Ignore case" +#~ msgstr "Ignora le maiuscole" + +#~ msgid "Cancel" +#~ msgstr "Annulla" + +#~ msgid "Ok" +#~ msgstr "Ok" + +#~ msgid "Help" +#~ msgstr "Aiuto" + +#~ msgid "Defaults" +#~ msgstr "Valori predefiniti" + +#~ msgid "&Edit" +#~ msgstr "&Modifica" + +#~ msgid "&Settings" +#~ msgstr "Imp&ostazioni" + +#~ msgid "&Help" +#~ msgstr "Ai&uto" + +#~ msgid "&About" +#~ msgstr "&Informazioni" + +#~ msgid "A&uthor" +#~ msgstr "A&utore" + +#~ msgid "&Thanks To" +#~ msgstr "&Ringraziamenti" + +#~ msgid "Open" +#~ msgstr "Apri" + +#~ msgid "Save" +#~ msgstr "Salva" + +#~ msgid "Print..." +#~ msgstr "Stampa..." + +#~ msgid "Quit" +#~ msgstr "Esci" + +#~ msgid "Cut" +#~ msgstr "Taglia" + +#~ msgid "Copy" +#~ msgstr "Copia" + +#~ msgid "Paste" +#~ msgstr "Incolla" + +#~ msgid "Select All" +#~ msgstr "Seleziona tutto" + +#~ msgid "Show Toolbar" +#~ msgstr "Mostra la barra degli strumenti" + +#~ msgid "Show &Status Bar" +#~ msgstr "Mostra la barra di &stato" + +#~ msgid "&Configure %1..." +#~ msgstr "&Configura %1..." + +#~ msgid "About" +#~ msgstr "Informazioni" + +#~ msgid "Find" +#~ msgstr "Trova" + +#~ msgid "Find Next" +#~ msgstr "Trova successivo" + +#~ msgid "For more documentation, see the help-menu or the subdirectory doc." +#~ msgstr "" +#~ "Per maggiore documentazione, vedi il menu «Aiuto» o la sottocartella doc." + +#~ msgid "KDiff3-Usage" +#~ msgstr "Uso di KDiff3" + +#~ msgid "Ignore" +#~ msgstr "Ignora" + +#~ msgid "Exit" +#~ msgstr "Esci" + +#~ msgid "Continue" +#~ msgstr "Continua" + +#~ msgid "Language (restart required)" +#~ msgstr "Lingua (riavvio necessario)" + +#~ msgid "" +#~ "Choose the language of the GUI strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "Scegli la lingua dell'interfaccia grafica o «Auto».\n" +#~ "Per cambiare la lingua devi uscire e riavviare KDiff3." + +#~ msgid "kdiff3" +#~ msgstr "kdiff3" + +#~ msgid "&OK" +#~ msgstr "&OK" + +#~ msgid "OK" +#~ msgstr "OK" + +#~| msgid "(c) 2002-2011 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "(c) 2002-2014 Joachim Eibl" + +#~ 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 "" +#~ "Questo non dovrebbe mai succedere:\n" +#~ "\n" +#~ "mergeResultSaved: m_pMFI=0\n" +#~ "\n" +#~ "Se sai come riprodurlo, per favore comunicalo all'autore del programma." + +#~ msgid "Program Error" +#~ msgstr "Errore nel programma" + +#~ msgid "Error." +#~ msgstr "Errore." + +#~ msgid "Select Font" +#~ msgstr "Seleziona carattere" + +#~ 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 "" +#~ "Hai selezionato un carattere a ampiezza variabile.\n" +#~ "\n" +#~ "Siccome questo programma non gestisce correttamente questo\n" +#~ "tipo di caratteri, potresti avere problemi a modificare i file.\n" +#~ "\n" +#~ "Vuoi continuare o preferisci cambiare carattere?" + +#~ msgid "Incompatible font." +#~ msgstr "Carattere non compatibile." + +#~ msgid "Continue at my own risk" +#~ msgstr "Continuo a mio rischio" + +#~ msgid "Select another font" +#~ msgstr "Seleziona un altro carattere" + +#~ msgid "Eike Sauer" +#~ msgstr "Eike Sauer" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "Correzioni, responsabile del pacchetto di Debian" + +#~ msgid "Sebastien Fricker" +#~ msgstr "Sebastien Fricker" + +#~ msgid "Windows installer" +#~ msgstr "Installatore per Windows" + +#~ msgid "Stephan Binner" +#~ msgstr "Stephan Binner" + +#~ msgid "i18n-help" +#~ msgstr "Aiuto per la localizzazione" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "Stefan Partheymueller" + +#~ msgid "Clipboard-patch" +#~ msgstr "Correzione per gli appunti" + +#~ msgid "David Faure" +#~ msgstr "David Faure" + +#~ msgid "KIO-Help" +#~ msgstr "Aiuto per KIO" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "Bernd Gehrmann" + +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Classe CvsIgnoreList da Cervisia" + +#~ msgid "Andre Woebbeking" +#~ msgstr "Andre Woebbeking" + +#~ msgid "Class StringMatcher" +#~ msgstr "Classe StringMatcher" + +#~ msgid "Michael Denio" +#~ msgstr "Michael Denio" + +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "Correzione per la colorazione delle cartelle identiche" + +#~ msgid "Manfred Koehler" +#~ msgstr "Manfred Koehler" + +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Correzione per l'avvio lento su Windows" + +#~ msgid "Sergey Zorin" +#~ msgstr "Sergey Zorin" + +#~ msgid "Diff Ext for Windows" +#~ msgstr "Estensione per le differenze su Windows" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#~ msgid "GNU-Diffutils" +#~ msgstr "Diffutils di GNU" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "Tino Boellsterling, Timothy Mee" + +#~ msgid "Intensive test, use and feedback" +#~ msgstr "Molte prove, uso e segnalazioni" + +#~ msgid "Michael Schmidt" +#~ msgstr "Michael Schmidt" + +#~ msgid "Mac support" +#~ msgstr "Supporto su Macintosh" + +#~ msgid "Valentin Rusu" +#~ msgstr "Valentin Rusu" + +#~ msgid "KDE4 porting" +#~ msgstr "Trasferimento su KDE4" + +#~ msgid "Albert Astals Cid" +#~ msgstr "Albert Astals Cid" + +#~ msgid "Silvan Scherrer" +#~ msgstr "Silvan Scherrer" + +#~ msgid "OS2 port" +#~ msgstr "Trasferimento su OS2" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "E grazie mille a chi ha segnalato errori o fornito idee!" + +#~ msgid "Italic font for deltas" +#~ msgstr "Carattere corsivo per le differenze" + +#~ msgid "" +#~ "Selects the italic version of the font for differences.\n" +#~ "If the font doesn't support italic characters, then this does nothing." +#~ msgstr "" +#~ "Seleziona la versione corsiva del carattere per le differenze.\n" +#~ "Se il carattere non supporta il corsivo, non succede nulla." + +#~ msgid "Incompatible Font" +#~ msgstr "Carattere non compatibile" + +#~ msgid "Continue at Own Risk" +#~ msgstr "Continua a tuo rischio" + +#~ msgid "Select Another Font" +#~ msgstr "Scegli un altro carattere" Property changes on: trunk/l10n-support/it/summit/messages/kdereview/kdiff3.po ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/x-gettext \ No newline at end of property Index: trunk/l10n-support/it/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/it/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/it/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,133 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the kdiff3 package. +# +# Federico Zenith , 2011. +# Valter Mura , 2018. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2018-03-26 21:44+0100\n" +"Last-Translator: Valter Mura \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, fuzzy, kde-format +#| msgid "KDiff3 ..." +msgid "KDiff3..." +msgstr "KDiff3..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Confronta con %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Fondi con %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Memorizza «%1»" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "Fusione a tre con base" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, fuzzy, kde-format +#| msgid "Compare with ..." +msgid "Compare with..." +msgstr "Confronta con..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Pulisci elenco" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Confronta" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "Confronto a tre" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, fuzzy, kde-format +#| msgid "About KDiff3 menu plugin ..." +msgid "About KDiff3 menu plugin..." +msgstr "Informazioni sull'estensione KDiff3 per menu..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Estensione KDiff3 per azioni su file: copyright 2011 di Joachim Eibl\n" +"Pagina Web di KDiff3: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, fuzzy, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It " +#| "will appear in the \"Compare With ...\" submenu. Then use \"Compare With" +#| "\" on the second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge " +#| "and choose \"3-way merge with base\" on the other branch which will be " +#| "used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It " +"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " +"the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and " +"choose \"3-way merge with base\" on the other branch which will be used as " +"destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Usare l'estensione del menu contestuale:\n" +"Per un confronto semplice di due file selezionati, seleziona «Confronta».\n" +"Se l'altro file è da un'altra parte, «Memorizza» il primo file: apparirà nel " +"sottomenu «Confronta con...». Usa quindi «Confronta con» sul secondo file.\n" +"Per una fusione a tre «Salva» prima il file di base, quindi il ramo da " +"fondere e seleziona «Fusione a tre con base» sull'altro ramo che verrà usato " +"come destinazione.\n" +"Lo stesso vale per il confronto e la fusione tra cartelle." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "Informazioni sull'estensione KDiff3 per azioni sui file" Index: trunk/l10n-support/it/summit/messages/kdereview/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/it/summit/messages/kdereview/org.kde.kdiff3.appdata.po (nonexistent) +++ trunk/l10n-support/it/summit/messages/kdereview/org.kde.kdiff3.appdata.po (revision 1522187) @@ -0,0 +1,90 @@ +# Paolo Zamponi , 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2018-07-11 09:18+0200\n" +"PO-Revision-Date: 2018-07-12 17:51+0100\n" +"Last-Translator: Paolo Zamponi \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" + +#. (itstool) path: component/name +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:6 +msgid "KDiff3" +msgstr "KDiff3" + +#. (itstool) path: component/summary +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:7 +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Uno strumento di confronto e di fusione di file e cartelle" + +#. (itstool) path: description/p +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:11 +msgid "KDiff3 is a file and directory diff and merge tool which" +msgstr "KDiff3 è uno strumento per fondere file e cartelle che" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:13 +msgid "compares and merges two or three text input files or directories," +msgstr "confronta e fonde due o tre file di testo o cartelle in ingresso," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:14 +msgid "shows the differences line by line and character by character(!)," +msgstr "mostra le differenze riga per riga e carattere per carattere(!)," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:15 +msgid "provides an automatic merge-facility," +msgstr "fornisce un servizio automatico per la fusione," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:16 +msgid "has an editor for comfortable solving of merge-conflicts," +msgstr "dispone di un editor per risolvere comodamente i conflitti di fusione," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:17 +msgid "provides network transparency via KIO," +msgstr "fornisce trasparenza di rete tramite KIO," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:18 +msgid "has options to highlight or hide changes in white-space or comments," +msgstr "" +"ha opzioni per evidenziare o per nascondere le modifiche negli spazi o nei " +"commenti," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:19 +msgid "supports Unicode, UTF-8 and other file encodings," +msgstr "supporta Unicode, UTF-8 e altre codifiche di file," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:20 +msgid "prints differences," +msgstr "stampa le differenze," + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:21 +msgid "supports version control keyword and history merging." +msgstr "" +"supporta le parole chiave per il controllo di versione e la fusione della " +"cronologia." Index: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4490 +0,0 @@ -# translation of kdiff3.po to Italian -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. -# -# Andrea Celli , 2003, 2004, 2005. -# Marcello Anni , 2006, 2007. -# Giovanni Venturi , 2006. -# Federico Zenith , 2009, 2010, 2011. -# Valter Mura , 2018. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-06 07:33+0200\n" -"PO-Revision-Date: 2018-03-26 21:42+0100\n" -"Last-Translator: Valter Mura \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Valter Mura,Federico Zenith,Marcello Anni,Andrea Celli" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "valtermura@gmail.com,,," - -#. +> trunk5 -#: diff.cpp:258 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "La copia da appunti a file temporaneo non è riuscita." - -#. +> trunk5 -#: diff.cpp:262 -#, kde-format -msgid "From Clipboard" -msgstr "Dagli appunti" - -#. +> trunk5 -#: diff.cpp:563 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Atteso spazio dopo apostrofo di chiusura." - -#. +> trunk5 -#: diff.cpp:566 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Apostrofi corrisponenti mancanti." - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Apostrofo inatteso in argomento." - -#. +> trunk5 -#: diff.cpp:595 -#, kde-format -msgid "No program specified." -msgstr "Nessun programma specificato" - -#. +> trunk5 -#: diff.cpp:710 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"La pre-elaborazione non sembra riuscita. Controlla questo comando:\n" -"\n" -" %1\n" -"\n" -"Il comando di pre-elaborazione verrà ora disabilitato." - -#. +> trunk5 -#: diff.cpp:757 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"La pre-ricerca di righe simili non sembra riuscita. Controlla questo " -"comando:\n" -"\n" -" %1\n" -"\n" -"Il comando di pre-ricerca di righe simili verrà ora disabilitato." - -#. +> trunk5 -#: diff.cpp:784 -#, kde-format -msgid "File %1 too large to process. Skipping." -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line %2" -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, fuzzy, kde-format -#| msgid "Line not available" -msgid "File %1: Line not available" -msgstr "Riga non disponibile" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, kde-format -msgid "Encoding:" -msgstr "Codifica:" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 -#, kde-format -msgid "Line end style:" -msgstr "Tipo di fine riga:" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 -#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 -#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 -#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 -#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 -#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 -#: smalldialogs.cpp:126 smalldialogs.cpp:129 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 -#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 -#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 -#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 -#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 -#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 -#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 -#: smalldialogs.cpp:127 smalldialogs.cpp:130 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 -#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 -#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 -#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 -#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 -#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: difftextwindow.cpp:1858 -#, fuzzy, kde-format -#| msgid "A (Base):" -msgid "A (Base)" -msgstr "A (Base):" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, fuzzy, kde-format -#| msgid "Encoding:" -msgid "Encoding: %1" -msgstr "Codifica:" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, fuzzy, kde-format -#| msgid "Line end style:" -msgid "Line end style: %1" -msgstr "Tipo di fine riga:" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "Riga superiore" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, kde-format -msgid "End" -msgstr "Fine" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, kde-format -msgid "Open File" -msgstr "Apri file" - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 bit" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, kde-format -msgid "Other" -msgstr "Altro" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "Non risolto" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "Risolto" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "Non vuoto" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "Vuoto" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "Copia A su B" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "Copia B su A" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "Elimina A" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "Elimina B" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Elimina A e B" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "Fondi con A" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "Fondi con B" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Fondi con A e B" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "Elimina (se esiste)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Fondi" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Fondi (manuale)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Errore: tipi di file in conflitto" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Errore: modificato ed eliminato." - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Errore: le date coincidono ma i file sono diversi." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, kde-format -msgid "Done" -msgstr "Fatto" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "Errore" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Saltato." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Non salvato." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "In esecuzione..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "Da fare." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "Nome" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "Operazione" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "Stato" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Insieme di collegamenti e file normali." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Collegamento: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Dimensione. " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Data e dimensione: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Creazione di una copia temporanea di %1 non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Apertura di %1 non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Confronto del file..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Errore nella lettura di %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort " -"the merge and rescan the directory?" -msgstr "" -"Stai fondendo delle cartelle. Sei sicuro di voler interrompere la fusione e " -"riesaminare la cartella?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 -#, kde-format -msgid "Warning" -msgstr "Avviso" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "Riesamina" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1030 -#, kde-format -msgid "Continue Merging" -msgstr "Continua la fusione" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Apertura di cartelle non riuscita:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "La cartella A «%1» non esiste o non è una cartella.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"La cartella B «%1» non esiste o non è una cartella.\n" -".\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "La cartella C «%1» non esiste o non è una cartella.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Errore nell'apertura di una cartella" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three " -"directories are merged.\n" -"Check again before continuing." -msgstr "" -"La cartella di destinazione non può essere la stessa di A o B quando si " -"fondono tre cartelle.\n" -"Ricontrolla prima di continuare." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Attenzione ai parametri" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Esame delle cartelle..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Lettura della cartella A" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Lettura della cartella B" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Lettura della cartella C" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Alcune sottocartelle non erano leggibili" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Controlla i permessi per le sottocartelle." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 -#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 -#, kde-format -msgid "Ready." -msgstr "Pronto." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" -msgid "Number of manual merges: %1" -msgstr "Numero di fusioni manuali:" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "Questo riguarda tutte le operazioni di fusione." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Modifica di tutte le operazioni di fusione" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgid "Processing " -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "Elaborazione in corso " - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Questa operazione non è attualmente possibile." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "Operazione non possibile" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "Si è verificato un errore durante la copia.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "Errore di fusione" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Operazione di fusione sconosciuta (non deve mai succedere)." - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "Operazione di fusione sconosciuta." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" -"La fusione sta per iniziare.\n" -"\n" -"Scegli «Procedi» se hai letto le istruzioni e sai cosa stai facendo.\n" -"\n" -"Scegli «Simula» per vedere cosa succederebbe.\n" -"\n" -"Stai attento perché questo programma è ancora una «beta» e non c'è " -"nessuna garanzia che funzioni! Fai una copia di sicurezza dei tuoi " -"dati importanti!" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "Inizio della fusione" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "Procedi" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "Simula" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "" -"The highlighted item has a different type in the different directories. " -"Select what to do." -msgstr "" -"L'elemento evidenziato è di diverso tipo nelle diverse cartelle. Scegli cosa " -"fare." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "" -"The modification dates of the file are equal but the files are not. Select " -"what to do." -msgstr "" -"Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " -"fare." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "" -"The highlighted item was changed in one directory and deleted in the other. " -"Select what to do." -msgstr "" -"L'elemento evidenziato è stato modificato in una cartella ed eliminato " -"nell'altra. Scegli cosa fare." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "" -"This operation is currently not possible because directory merge is " -"currently running." -msgstr "" -"Attualmente non si può effettuare questa operazione perché è in corso una " -"fusione tra cartelle." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" -"Si è verificato un errore nell'ultimo passaggio.\n" -"Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "Continua la fusione dopo un errore" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "Continua con l'ultimo" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "Saltalo" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "Operazione di fusione completata." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "Fusione completata" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" -"Fusione simulata completata: controlla se ti vanno bene le operazioni " -"proposte." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "Si è verificato un errore. Premi OK per maggiori informazioni.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Errore: nell'eliminare %1: impossibile creare una copia di sicurezza." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "elimina cartella ricorsivamente (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "elimina (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" -"Errore: eliminazione della cartella non riuscita durante la sua lettura." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Errore: operazione di rimozione di una cartella (%1) non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Errore: eliminazione non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "fusione manuale (%1, %2,%3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid "" -" Note: After a manual merge the user should continue by pressing F7." -msgstr "" -" Nota: dopo una fusione manuale l'utente dovrebbe premere F7 per " -"continuare." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"Errore: copia (%1 -> %2) non riuscita. Eliminazione della destinazione " -"esistente non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "copia collegamento (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" -"Errore: copia di collegamento non riuscita: i collegamenti remoti non sono " -"ancora supportati." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Errore: copia di collegamento non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "copia (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" -"Errore nella rinomina (%1 -> %2): impossibile eliminare la destinazione " -"esistente." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "rinomina (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "Errore: rinomina non riuscita." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" -"Errore durante la creazione della cartella %1. Impossibile eliminare un file " -"esistente." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "crea cartella (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "Errore nella creazione di una cartella." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "Destinazione" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "Cartella" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "Tipo" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "Dimensione" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "Attributo" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "Ultima modifica" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "Destinazione del collegamento" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "File" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -#| msgid "Link: " -msgid "-Link" -msgstr "Collegamento: " - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "non disponibile" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (destinazione): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (base): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (destinazione): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (destinazione): " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "Destinazione: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Salva lo stato di fusione tra cartelle come..." - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Avvia o continua fusione tra cartelle" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Esegui operazione sull'elemento attuale" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "Confronta il file selezionato" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "Fondi il file attuale" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Fondi\n" -"file" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Chiudi tutte le sottocartelle" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Apri tutte le sottocartelle" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "Scegli A per tutti gli elementi" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "Scegli B per tutti gli elementi" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "Scegli C per tutti gli elementi" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Operazione di scelta automatica per tutti gli elementi" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "Nessuna operazione per tutti gli elementi" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "Mostra file identici" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"File\n" -"identici" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "Mostra file diversi" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "Mostra file solo in A" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"File\n" -"solo in A" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "Mostra file solo in B" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"File\n" -"solo in B" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "Mostra file solo in C" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"File\n" -"solo in C" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Confronta file selezionati esplicitamente" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Fondi file selezionati esplicitamente" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "Non fare nulla" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "Elimina A e B" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "Fondi con A e B" - -#. +> trunk5 -#: fileaccess.cpp:915 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"Cercando di creare una copia di sicurezza, non è stato possibile rimuoverne " -"una precedente.\n" -"Nome del file: " - -#. +> trunk5 -#: fileaccess.cpp:922 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"Cercando di creare una copia di sicurezza, non è riuscita la rinomina.\n" -"Nomi dei file: " - -#. +> trunk5 -#: fileaccess.cpp:946 -#, kde-format -msgid "Getting file status: %1" -msgstr "Recupero informazioni sullo stato del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:988 -#, kde-format -msgid "Reading file: %1" -msgstr "Lettura del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1026 -#, kde-format -msgid "Writing file: %1" -msgstr "Scrittura del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1059 -#, kde-format -msgid "Out of memory" -msgstr "Memoria esaurita" - -#. +> trunk5 -#: fileaccess.cpp:1094 -#, kde-format -msgid "Making directory: %1" -msgstr "Creazione della cartella: %1" - -#. +> trunk5 -#: fileaccess.cpp:1114 -#, kde-format -msgid "Removing directory: %1" -msgstr "Rimozione della cartella: %1" - -#. +> trunk5 -#: fileaccess.cpp:1129 -#, kde-format -msgid "Removing file: %1" -msgstr "Rimozione del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1145 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Creazione del collegamento simbolico: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1173 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Rinomina del file: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1205 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Copia del file: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1219 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: " -"%1" -msgstr "" -"Errore durante la copia di un file: apertura del file in lettura non " -"riuscita. Nome del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1225 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: " -"%1" -msgstr "" -"Errore durante la copia di un file: l'apertura del file in scrittura non " -"riuscita. Nome del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1237 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" -"Errore durante la copia di un file: lettura non riuscita. Nome del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1246 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" -"Errore durante la copia di un file: Scrittura non riuscita. Nome del file: %1" - -#. +> trunk5 -#: fileaccess.cpp:1529 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "Lettura della cartella: " - -#. +> trunk5 -#: fileaccess.cpp:1650 -#, kde-format -msgid "Listing directory: %1" -msgstr "Elenco della cartella: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "Configurazione attuale:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "Errore nelle opzioni di configurazione:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "" -"Opzione --auto inserita, ma non è stato indicato nessun del file di uscita." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "Opzione --auto ignorata nel confronto di cartelle." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "Salvataggio non riuscito." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Apertura di questi file non riuscita:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "Errore nell'apertura di un file" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Apre documenti per confrontarli..." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "Ricarica" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Salva il risultato della fusione. Tutti i conflitti vanno risolti!" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "Salva il documento attuale come..." - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "Stampa le differenze" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "Esce dall'applicazione" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Taglia la sezione selezionata e la mette negli appunti" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Copia la sezione selezionata negli appunti" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Incolla il contenuto degli appunti nella posizione attuale" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "Seleziona tutto nella finestra attuale" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "Cerca una stringa" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "Cerca di nuovo la stringa" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Abilita o disabilita la barra di stato" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "Configura KDiff3..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "Vai alla differenza attuale" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Differenza\n" -"attuale" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "Vai alla prima differenza" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"Prima\n" -"differenza" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "Vai all'ultima differenza" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Ultima\n" -"differenza" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" -"(Ignora le differenze di soli spazi quando «Mostra spazi» è disattivato)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "" -"(Does not skip white space differences even when \"Show White Space\" is " -"disabled.)" -msgstr "" -"(Non salta le differenze di soli spazi bianchi anche quando «Mostra spazi» è " -"disattivato)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Vai alla differenza precedente" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Differenza\n" -"precedente" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "Vai alla differenza successiva" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Differenza\n" -"successiva" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Vai al conflitto precedente" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Conflitto\n" -"precedente" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Vai al conflitto successivo" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Conflitto\n" -"successivo" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Vai al conflitto non risolto precedente" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Non risolto\n" -"precedente" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Vai al conflitto non risolto successivo" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Non risolto\n" -"successivo" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Seleziona righe da A" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Scegli\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Seleziona righe da B" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Scegli\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Seleziona righe da C" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Scegli\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" -"Vai automaticamente al conflitto non risolto successivo dopo aver " -"selezionato la fonte" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Successivo\n" -"automatico" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "Show Space && Tabulator Characters" -msgstr "Mostra spazi e tabulazioni" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "Spazi" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "Mostra spazi" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"Differenze\n" -"di spazi" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "Mostra numeri di riga" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Numeri\n" -"di riga" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Scegli A ovunque" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Scegli B ovunque" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Scegli C ovunque" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Scegli A per tutti i conflitti non risolti" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Scegli B per tutti i conflitti non risolti" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Scegli C per tutti i conflitti non risolti" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Scegli A per tutti i conflitti di spazi non risolti" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Scegli B per tutti i conflitti di spazi non risolti" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Scegli C per tutti i conflitti di spazi non risolti" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Risolvi automaticamente i conflitti semplici" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Imposta le differenze a conflitti" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Esegui la fusione automatica con espressioni regolari" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Risolvi automaticamente i conflitti di cronologia" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Dividi differenze alla selezione" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Unisci le differenze selezionate" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "Mostra finestra A" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "Mostra finestra B" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "Mostra finestra C" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "Riassunto normale" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "Riassunto tra A e B" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "Riassunto tra A e C" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "Riassunto tra B e C" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "A capo automatico nelle finestre delle differenze" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Aggiungi allineamento manuale delle differenze" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Cancella tutti gli allineamenti manuali delle differenze" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "Attiva la finestra successiva" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "Attiva la finestra precedente" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Inverti l'orientamento di divisione" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Vista separata di cartelle e testi" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Cambia tra vista di testi e di cartelle" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1928 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "Il risultato della fusione non è stato salvato." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "Salva ed esci" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "Esci senza salvare" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1939 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Il salvataggio della fusione non è riuscito." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1027 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "È in corso una fusione di cartelle. Sei sicuro di voler interrompere?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "Salvataggio del file..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Salvataggio del file con un nuovo nome..." - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "Salva come..." - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "Stampa non implementata." - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "Stampa..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "Stampa della pagina %1 di %2" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -#| msgid "Selection" -msgid " (Selection)" -msgstr "Selezione" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "Stampa completata." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "Stampa interrotta." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "Uscita..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "Commutazione della barra degli strumenti..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "Commutazione della barra di stato..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, kde-format -msgid "KDiff3 Part" -msgstr "KDiff3 Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "Componente per visualizzare immagini SVG" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "Copyright 2007, Aurélien Gâteau " - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "Impossibile trovare i file da confrontare." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "Configura KDiff3" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:113 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-" -"file in the source package for details." -msgstr "" -"Impossibile inizializzare il componente KDiff3.\n" -"Questo di solito accade per problemi di installazione. Per maggiori dettagli " -"leggi il file README nel pacchetto del codice sorgente." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "&File" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "&Cartella" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Operazione di fusione dell'elemento attuale" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Operazione di sincronizzazione dell'elemento attuale" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" -msgid "M&ovement" -msgstr "Mo&vimento" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "V&ista di confronto" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" -msgid "M&erge" -msgstr "Fondi" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "Fi&nestra" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Barra degli strumenti principale" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Ignorato. (definito dall'utente)" - -#. +> trunk5 -#: main.cpp:117 -#, kde-format -msgid " (64 bit)" -msgstr "" - -#. +> trunk5 -#: main.cpp:119 -#, kde-format -msgid " (32 bit)" -msgstr "" - -#. +> trunk5 -#: main.cpp:120 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Strumento per il confronto e la fusione di file e cartelle" - -#. +> trunk5 -#: main.cpp:121 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Merge the input." -msgstr "Fondi l'ingresso." - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "File di base esplicito. Per compatibilità con certi programmi." - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "File di uscita. Implica «-m». Per esempio: -o file_nuovo.txt" - -#. +> trunk5 -#: main.cpp:143 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "File di uscita, di nuovo. Per compatibilità con certi programmi." - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" -"Senza interfaccia se ogni conflitto è risolvibile automaticamente. Serve «-o " -"file»." - -#. +> trunk5 -#: main.cpp:145 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically." -msgid "Do not solve conflicts automatically." -msgstr "Non risolvere i conflitti automaticamente." - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "Mostra sostituzione del nome per il file di ingresso 1 (base)." - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "Mostra sostituzione del nome per il file di ingresso 2." - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "Mostra sostituzione del nome per il file di ingresso 3." - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" -"Sostituzione del nome visibile alternativo. Da specificare una volta per " -"ogni ingresso." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "" -"Override a config setting. Use once for every setting. E.g.: --cs " -"\"AutoAdvance=1\"" -msgstr "" -"Ignora un'impostazione di configurazione. Usa una volta per ogni " -"impostazione. Per esempio: «--cs \"AutoAdvance=1\"»" - -#. +> trunk5 -#: main.cpp:151 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "" -"Mostra la lista delle impostazioni di configurazione e i valori attuali." - -#. +> trunk5 -#: main.cpp:152 -#, kde-format -msgid "Use a different config file." -msgstr "Usa un file di configurazione diverso." - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "File1 da aprire (base, se non specificato con «--base»)" - -#. +> trunk5 -#: main.cpp:156 -#, kde-format -msgid "file2 to open" -msgstr "File2 da aprire" - -#. +> trunk5 -#: main.cpp:157 -#, kde-format -msgid "file3 to open" -msgstr "File3 da aprire" - -#. +> trunk5 -#: main.cpp:168 -#, kde-format -msgid "See kdiff3 --help for supported options." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Numero di conflitti non ancora risolti: %1 (di cui %2 sono di spazi)" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"L'uscita è stata modificata.\n" -"Se continui le modifiche andranno perse." - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:771 -#, kde-format -msgid "All input files are binary equal." -msgstr "Tutti i file di ingresso sono uguali a livello binario." - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "Tutti i file di ingresso contengono lo stesso testo." - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "I file %1 e %2 sono uguali a livello binario.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "I file %1 e %2 hanno lo stesso testo.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, kde-format -msgid "Conflicts" -msgstr "Conflitti" - -#. +> trunk5 -#: mergeresultwindow.cpp:1840 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2934 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"Non sono ancora risolti tutti i conflitti.\n" -"File non salvato.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 -#, kde-format -msgid "Conflicts Left" -msgstr "Conflitti rimanenti" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style " -#| "manually.\n" -#| "File not saved.\n" -msgid "" -"There is a line end style conflict. Please choose the line end style " -"manually.\n" -"File not saved." -msgstr "" -"C'è un conflitto di stili di fine riga. Seleziona manualmente lo stile.\n" -"File non salvato.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Creazione della copia di sicurezza non riuscita. File non salvato." - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 -#, kde-format -msgid "File Save Error" -msgstr "Errore nel salvataggio del file" - -#. +> trunk5 -#: mergeresultwindow.cpp:3005 -#, kde-format -msgid "Error while writing." -msgstr "Errore in scrittura." - -#. +> trunk5 -#: mergeresultwindow.cpp:3365 -#, fuzzy, kde-format -#| msgid "Output" -msgid "Output:" -msgstr "Uscita" - -#. +> trunk5 -#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 -#, kde-format -msgid "[Modified]" -msgstr "[Modificato]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3384 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "Codifica per il salvataggio" - -#. +> trunk5 -#: mergeresultwindow.cpp:3484 -#, kde-format -msgid "Conflict" -msgstr "Conflitto" - -#. +> trunk5 -#: mergeresultwindow.cpp:3516 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from A: %1" -msgstr "Codec da" - -#. +> trunk5 -#: mergeresultwindow.cpp:3518 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from B: %1" -msgstr "Codec da" - -#. +> trunk5 -#: mergeresultwindow.cpp:3520 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from C: %1" -msgstr "Codec da" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "Cambia tipo di carattere" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" -"Carattere: %1, %2, %3\n" -"\n" -"Esempio:" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Cambialo se i caratteri non-ASCII non vengono mostrati correttamente." - -#. +> trunk5 -#: optiondialog.cpp:613 -#, kde-format -msgid "Configure" -msgstr "Configura" - -#. +> trunk5 -#: optiondialog.cpp:690 -#, kde-format -msgid "Font" -msgstr "Carattere" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Carattere per l'editor e per l'uscita delle differenze" - -#. +> trunk5 -#: optiondialog.cpp:710 -#, kde-format -msgid "Application font" -msgstr "Carattere applicazione" - -#. +> trunk5 -#: optiondialog.cpp:714 -#, kde-format -msgid "File view font" -msgstr "Carattere vista file" - -#. +> trunk5 -#: optiondialog.cpp:732 -#, kde-format -msgid "Color" -msgstr "Colore" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Colors Settings" -msgstr "Impostazioni dei colori" - -#. +> trunk5 -#: optiondialog.cpp:750 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Editor e visore delle differenze:" - -#. +> trunk5 -#: optiondialog.cpp:758 -#, kde-format -msgid "Foreground color:" -msgstr "Colore di primo piano:" - -#. +> trunk5 -#: optiondialog.cpp:765 -#, kde-format -msgid "Background color:" -msgstr "Colore di sfondo:" - -#. +> trunk5 -#: optiondialog.cpp:774 -#, kde-format -msgid "Diff background color:" -msgstr "Colore di sfondo per le differenze:" - -#. +> trunk5 -#: optiondialog.cpp:782 -#, kde-format -msgid "Color A:" -msgstr "Colore per A:" - -#. +> trunk5 -#: optiondialog.cpp:790 -#, kde-format -msgid "Color B:" -msgstr "Colore per B:" - -#. +> trunk5 -#: optiondialog.cpp:798 -#, kde-format -msgid "Color C:" -msgstr "Colore per C:" - -#. +> trunk5 -#: optiondialog.cpp:805 -#, kde-format -msgid "Conflict color:" -msgstr "Colore per i conflitti:" - -#. +> trunk5 -#: optiondialog.cpp:813 -#, kde-format -msgid "Current range background color:" -msgstr "Colore di sfondo per l'intervallo attuale:" - -#. +> trunk5 -#: optiondialog.cpp:821 -#, kde-format -msgid "Current range diff background color:" -msgstr "Colore di sfondo per le differenze dell'intervallo attuale:" - -#. +> trunk5 -#: optiondialog.cpp:828 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Colore per intervalli di differenze allineate manualmente:" - -#. +> trunk5 -#: optiondialog.cpp:834 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Vista di confronto delle cartelle:" - -#. +> trunk5 -#: optiondialog.cpp:840 -#, kde-format -msgid "Newest file color:" -msgstr "Colore del file più recente:" - -#. +> trunk5 -#: optiondialog.cpp:844 -#, kde-format -msgid "" -"Changing this color will only be effective when starting the next directory " -"comparison." -msgstr "" -"Il cambiamento di questo colore sarà effettivo quando si avvierà un nuovo " -"confronto tra cartelle." - -#. +> trunk5 -#: optiondialog.cpp:849 -#, kde-format -msgid "Oldest file color:" -msgstr "Colore del file più vecchio:" - -#. +> trunk5 -#: optiondialog.cpp:857 -#, kde-format -msgid "Middle age file color:" -msgstr "Colore del file di età media:" - -#. +> trunk5 -#: optiondialog.cpp:865 -#, kde-format -msgid "Color for missing files:" -msgstr "Colore per file mancanti:" - -#. +> trunk5 -#: optiondialog.cpp:878 -#, kde-format -msgid "Editor" -msgstr "Editor" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor Behavior" -msgstr "Comportamento dell'editor" - -#. +> trunk5 -#: optiondialog.cpp:892 -#, kde-format -msgid "Tab inserts spaces" -msgstr "Il tabulatore inserisce spazi" - -#. +> trunk5 -#: optiondialog.cpp:895 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Attivo: premere il tabulatore è come inserire l'appropriato numero di " -"spazi.\n" -"Non attivo: viene inserito un carattere di tabulazione." - -#. +> trunk5 -#: optiondialog.cpp:900 -#, kde-format -msgid "Tab size:" -msgstr "Dimensione della tabulazione:" - -#. +> trunk5 -#: optiondialog.cpp:906 -#, kde-format -msgid "Auto indentation" -msgstr "Rientro automatico" - -#. +> trunk5 -#: optiondialog.cpp:909 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "Attivo: la nuova riga avrà lo stesso rientro della riga precedente.\n" - -#. +> trunk5 -#: optiondialog.cpp:912 -#, kde-format -msgid "Auto copy selection" -msgstr "Copia automaticamente la selezione" - -#. +> trunk5 -#: optiondialog.cpp:915 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" -"Attivo: ogni selezione è immediatamente copiata negli appunti.\n" -"Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C." - -#. +> trunk5 -#: optiondialog.cpp:929 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Imposta il fine riga da usare quando salvi un file modificato:\n" -"DOS/Windows: CR+LF; Unix: LF; dove CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:939 -#, kde-format -msgid "Diff" -msgstr "Differenze" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff Settings" -msgstr "Impostazioni delle differenze" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:964 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore numbers (treat as white space)" -msgstr "Tratta come spazio." - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore " -"white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Ignora i caratteri numerici durante il confronto (simile a «Ignora spazi»).\n" -"Può essere utile per confrontare file con dati numerici." - -#. +> trunk5 -#: optiondialog.cpp:971 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "Tratta i commenti C e C++ come spazi." - -#. +> trunk5 -#: optiondialog.cpp:973 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Tratta i commenti C e C++ come spazi." - -#. +> trunk5 -#: optiondialog.cpp:976 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore case (treat as white space)" -msgstr "Tratta come spazio." - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" -"Tratta le differenze tra maiuscole e minuscole come modifiche di spazi " -"(«a»<=>«A»)." - -#. +> trunk5 -#: optiondialog.cpp:982 -#, kde-format -msgid "Preprocessor command:" -msgstr "Comando per il preprocessore:" - -#. +> trunk5 -#: optiondialog.cpp:986 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" -"Preprocessore definito dall'utente; vedi il manuale per maggiori dettagli." - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "Preprocessore per il confronto di righe:" - -#. +> trunk5 -#: optiondialog.cpp:993 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Questo preprocessore viene utilizzato solo\n" -"per verificare la corrispondenza di righe;\n" -"vedi il manuale per maggiori dettagli." - -#. +> trunk5 -#: optiondialog.cpp:996 -#, kde-format -msgid "Try hard (slower)" -msgstr "Ricerca approfondita (lenta)" - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Abilita l'opzione --minimal del comando «diff» esterno.\n" -"L'analisi di grandi file sarà molto più lenta." - -#. +> trunk5 -#: optiondialog.cpp:1003 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Allinea B e C per tre file di ingresso" - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Cerca di allineare B e C quando si confrontano o fondono tre file di " -"ingresso.\n" -"Non è raccomandato per la fusione perché potrebbe divenire più complicata.\n" -"Come impostazione predefinita è disattivato." - -#. +> trunk5 -#: optiondialog.cpp:1018 -#, kde-format -msgid "Merge Settings" -msgstr "Impostazioni di fusione" - -#. +> trunk5 -#: optiondialog.cpp:1032 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Ritardo nell'avanzamento automatico (ms):" - -#. +> trunk5 -#: optiondialog.cpp:1037 -#, kde-format -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 "" -"Quando si è in modalità di avanzamento automatico, il risultato della\n" -"selezione attuale viene mostrato per il tempo specificato, prima di\n" -"passare al conflitto successivo. Valori ammessi: 0-2000 ms." - -#. +> trunk5 -#: optiondialog.cpp:1041 -#, kde-format -msgid "Show info dialogs" -msgstr "Mostra finestre informative" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Mostra una finestra con informazioni sul numero di conflitti." - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "Trattamento predefinito degli spazi nel fondere due file:" - -#. +> trunk5 -#: optiondialog.cpp:1050 optiondialog.cpp:1062 -#, kde-format -msgid "Manual Choice" -msgstr "Scelta manuale" - -#. +> trunk5 -#: optiondialog.cpp:1054 optiondialog.cpp:1067 -#, kde-format -msgid "" -"Allow the merge algorithm to automatically select an input for white-space-" -"only changes." -msgstr "" -"Consenti all'algoritmo di fusione di selezionare automaticamente un ingresso " -"per le modifiche di soli spazi." - -#. +> trunk5 -#: optiondialog.cpp:1058 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "Trattamento predefinito degli spazi nel fondere tre file:" - -#. +> trunk5 -#: optiondialog.cpp:1071 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "Espressione regolare di fusione automatica" - -#. +> trunk5 -#: optiondialog.cpp:1079 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "Espressione regolare di fusione automatica:" - -#. +> trunk5 -#: optiondialog.cpp:1083 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one " -"source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Espressione regolare per le righe dove Kdiff3 dovrebbe scegliere " -"automaticamente una fonte.\n" -"Quando una riga con un conflitto corrisponde all'espressione regolare,\n" -"sarà scelto (se disponibile) C, altrimenti B." - -#. +> trunk5 -#: optiondialog.cpp:1089 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "" -"Esegui la fusione automatica con espressioni regolari all'avvio della fusione" - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Esegui la fusione per le espressioni regolari di fusione\n" -"automatica all'avvio dell'operazione.\n" - -#. +> trunk5 -#: optiondialog.cpp:1096 -#, kde-format -msgid "Version Control History Merging" -msgstr "Fusione della cronologia del controllo di versione" - -#. +> trunk5 -#: optiondialog.cpp:1104 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "Espressione regolare dell'inizio di cronologia:" - -#. +> trunk5 -#: optiondialog.cpp:1108 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Espressione regolare per l'inizio dell'elemento di cronologia del controllo " -"di versione.\n" -"Di solito questa riga contiene la parola chiave «$Log$».\n" -"Valore predefinito: «.*\\$Log.*\\$.*»." - -#. +> trunk5 -#: optiondialog.cpp:1114 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "Espressione regolare di inizio dell'elemento di cronologia:" - -#. +> trunk5 -#: optiondialog.cpp:1126 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading " -"comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history " -"entries.\n" -"See the documentation for details." -msgstr "" -"Un elemento di cronologia del controllo di versione consiste di diverse " -"linee.\n" -"Specifica l'espressione regolare per individuarne la prima (senza il " -"commento iniziale).\n" -"Usa le parentesi per raggruppare le chiavi che vuoi usare per " -"l'ordinamento.\n" -"Se la parte sinistra è mancante, KDiff3 assume che siano delle linee vuote a " -"separare gli elementi della cronologia.\n" -"Vedi la documentazione per i dettagli." - -#. +> trunk5 -#: optiondialog.cpp:1134 -#, kde-format -msgid "History merge sorting" -msgstr "Ordinamento della fusione della cronologia" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "Sort version control history by a key." -msgstr "Ordina la cronologia del controllo di versione secondo una chiave." - -#. +> trunk5 -#: optiondialog.cpp:1146 -#, kde-format -msgid "History entry start sort key order:" -msgstr "" -"Ordine della chiave d'ordinamento d'inizio degli elementi della cronologia:" - -#. +> trunk5 -#: optiondialog.cpp:1150 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history " -"start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Ogni coppia di parentesi usata nell'espressione regolare per la voce di " -"inizio\n" -"della cronologia raggruppa una chiave che può essere usata per " -"l'ordinamento.\n" -"Specifica l'elenco delle chiavi (numerate in ordine di occorrenza a\n" -"partire da 1) usando «,» come separatore (per esempio «4,5,6,1,2,3,7»).\n" -"Se viene lasciato vuoto, non verrà effettuato nessun ordinamento.\n" -"Consulta la documentazione per i ulteriori dettagli." - -#. +> trunk5 -#: optiondialog.cpp:1161 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "Fondi la cronologia del controllo di versione all'inizio della fusione" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "" -"Esegui la fusione automatica della cronologia del controllo di versione " -"all'inizio della fusione." - -#. +> trunk5 -#: optiondialog.cpp:1167 -#, kde-format -msgid "Max number of history entries:" -msgstr "Numero massimo di elementi nella cronologia:" - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Taglia al numero specificato. Usa -1 per un numero infinito di voci." - -#. +> trunk5 -#: optiondialog.cpp:1174 -#, kde-format -msgid "Test your regular expressions" -msgstr "Prova le espressioni regolari" - -#. +> trunk5 -#: optiondialog.cpp:1179 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "Comando di fusione irrilevante:" - -#. +> trunk5 -#: optiondialog.cpp:1183 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Se specificato questo script viene eseguito dopo la fusione\n" -"automatica quando non sono rilevati altri cambiamenti rilevanti.\n" -"Chiamato con i parametri: nome_file1 nome_file2 nome_file3" - -#. +> trunk5 -#: optiondialog.cpp:1188 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "Salvataggio automatico e uscita in caso di fusione senza conflitti" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and " -"quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Quando KDiff3 viene avviato per una fusione di file dalla riga di comando\n" -"e tutti i conflitti sono risolvibili senza azione da parte dell'utente,\n" -"salva automaticamente ed esci.\n" -"È simile all'opzione da riga di comando «--auto»." - -#. +> trunk5 -#: optiondialog.cpp:1202 optiondialog.cpp:1203 -#, kde-format -msgid "Directory" -msgstr "Cartella" - -#. +> trunk5 -#: optiondialog.cpp:1215 -#, kde-format -msgid "Recursive directories" -msgstr "Cartelle ricorsive" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Se analizzare o meno anche le sottocartelle." - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "File pattern(s):" -msgstr "Schemi di file:" - -#. +> trunk5 -#: optiondialog.cpp:1224 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Schemi di file da analizzare.\n" -"Caratteri jolly: «*» e «?».\n" -"Si possono specificare più schemi con il separatore «;»." - -#. +> trunk5 -#: optiondialog.cpp:1229 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "Schemi di file da escludere:" - -#. +> trunk5 -#: optiondialog.cpp:1234 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Schemi di file da escludere dall'analisi.\n" -"Caratteri jolly: «*» e «?».\n" -"Si possono specificare più schemi con il separatore «;»." - -#. +> trunk5 -#: optiondialog.cpp:1239 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "Schemi di cartelle da escludere:" - -#. +> trunk5 -#: optiondialog.cpp:1244 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Schemi di cartelle da escludere dall'analisi.\n" -"Caratteri jolly: «*» e «?».\n" -"Si possono specificare più schemi con il separatore «;»." - -#. +> trunk5 -#: optiondialog.cpp:1249 -#, kde-format -msgid "Use .cvsignore" -msgstr "Usa .cvsignore" - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Estendi l'esclusione a tutto quello che sarebbe ignorato da CVS.\n" -"Si possono usare dei file «.cvsignore» diversi per ogni cartella." - -#. +> trunk5 -#: optiondialog.cpp:1256 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Trova file e cartelle nascosti" - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Trova file e cartelle con l'attributo «nascosto»." - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Trova file e cartelle che iniziano con «.»." - -#. +> trunk5 -#: optiondialog.cpp:1265 -#, kde-format -msgid "Follow file links" -msgstr "Segui i collegamenti dei file" - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Attivo: confronta il file a cui punta il collegamento.\n" -"Non attivo: confronta i collegamenti." - -#. +> trunk5 -#: optiondialog.cpp:1272 -#, kde-format -msgid "Follow directory links" -msgstr "Segui i collegamenti delle cartelle" - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Attivo: confronta la cartella a cui punta il collegamento.\n" -"Non attivo: confronta i collegamenti." - -#. +> trunk5 -#: optiondialog.cpp:1290 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Distingui le maiuscole nel confronto dei nomi dei file" - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names " -"match.\n" -"Set this option if the case of the names must match. (Default for Windows is " -"off, otherwise on.)" -msgstr "" -"Il confronto tra cartelle confronterà file o cartelle quando i loro nomi " -"coincideranno.\n" -"Imposta questa opzione se le lettere maiuscole e minuscole devono essere " -"considerate diverse. L'opzione predefinita per Windows è disattivo, " -"altrimenti è attivo." - -#. +> trunk5 -#: optiondialog.cpp:1297 -#, kde-format -msgid "Unfold all subdirectories on load" -msgstr "Apri tutte le sottocartelle al caricamento" - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" -"Attivo: apre tutte le sottocartelle quando avvii una diff tra cartelle.\n" -"Disattivo: lascia chiuse le sottocartelle." - -#. +> trunk5 -#: optiondialog.cpp:1304 -#, kde-format -msgid "Skip directory status report" -msgstr "Salta rapporto dello stato della cartella" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" -"Attivo: non mostra lo stato del confronto tra le cartelle.\n" -"Disattivo: mostra la finestra di dialogo dello stato all'avvio." - -#. +> trunk5 -#: optiondialog.cpp:1311 -#, kde-format -msgid "File Comparison Mode" -msgstr "Modalità di confronto dei file" - -#. +> trunk5 -#: optiondialog.cpp:1316 -#, kde-format -msgid "Binary comparison" -msgstr "Confronto binario" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Confronto binario per ogni file (predefinito)." - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, kde-format -msgid "Full analysis" -msgstr "Analisi completa" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Fai un'analisi completa e mostra informazioni statistiche in nuove colonne.\n" -"È più lento di un confronto binario e lentissimo su file binari." - -#. +> trunk5 -#: optiondialog.cpp:1325 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Fidati della grandezza e della data di modifica (non sicuro)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"Files with equal contents but different modification dates will appear as " -"different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Assumi che i file sono uguali se hanno la stessa data di modifica e " -"dimensione.\n" -"I file con contenuti identici ma diverse date di modifica risulteranno " -"diversi.\n" -"Utile per confrontare cartelle grandi o per connessioni lente." - -#. +> trunk5 -#: optiondialog.cpp:1331 -#, kde-format -msgid "" -"Trust the size and date, but use binary comparison if date does not match " -"(unsafe)" -msgstr "" -"Fidati della grandezza e della data, ma usa il confronto binario se la data " -"non corrisponde (non sicuro)" - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Assumi che i file sono uguali se hanno la stessa data di modifica e " -"dimensione.\n" -"Se le date non sono uguali ma la dimensione sì, usa il confronto binario.\n" -"Utile per confrontare cartelle grandi o per connessioni lente." - -#. +> trunk5 -#: optiondialog.cpp:1337 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Fidati della dimensione (non sicuro)" - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during " -"download." -msgstr "" -"Assumi che i file sono uguali se hanno la stessa dimensione.\n" -"Utile per confrontare cartelle grandi o per connessioni lente,\n" -"dove la data viene modificata nello scaricamento." - -#. +> trunk5 -#: optiondialog.cpp:1345 -#, kde-format -msgid "Synchronize directories" -msgstr "Sincronizza cartelle" - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Permette di memorizzare i file in entrambe le cartelle,\n" -"in modo che poi risultino uguali.\n" -"Funziona solo quando si confrontano due cartelle\n" -"senza specificare una destinazione." - -#. +> trunk5 -#: optiondialog.cpp:1354 -#, kde-format -msgid "White space differences considered equal" -msgstr "Differenze di spazi considerate uguali" - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Se i file differiscono solo per degli spazi, considerali uguali.\n" -"Funziona solo quando si effettua un'analisi completa." - -#. +> trunk5 -#: optiondialog.cpp:1363 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Copia il più recente invece di fondere (non sicuro)" - -#. +> trunk5 -#: optiondialog.cpp:1366 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"Non guardare i contenuti, prendi il più recente e basta.\n" -"Usalo solo se sai quello che stai facendo!\n" -"Funziona solo quando si confrontano due cartelle." - -#. +> trunk5 -#: optiondialog.cpp:1371 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Copie di sicurezza (.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Quando un file sarebbe stato salvato sovrascrivendone su un altro\n" -"quest'ultimo verrà rinominato con l'estensione «.orig» invece di\n" -"essere cancellato." - -#. +> trunk5 -#: optiondialog.cpp:1450 optiondialog.cpp:1451 -#, kde-format -msgid "Regional Settings" -msgstr "Impostazioni locali" - -#. +> trunk5 -#: optiondialog.cpp:1465 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Usa la stessa codifica per tutto:" - -#. +> trunk5 -#: optiondialog.cpp:1468 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Permette di cambiare tutte le codifiche cambiando solo la prima.\n" -"Disattivala se servono impostazioni differenziate." - -#. +> trunk5 -#: optiondialog.cpp:1472 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "Nota: la codifica locale è " - -#. +> trunk5 -#: optiondialog.cpp:1476 -#, kde-format -msgid "File Encoding for A:" -msgstr "Codifica per il file A:" - -#. +> trunk5 -#: optiondialog.cpp:1482 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Se abilitato, verrà rilevata la codifica Unicode (UTF-16 o UTF-8).\n" -"Se il file non è in Unicode, la codifica selezionata sarà usata come " -"ripiego.\n" -"La rilevazione di Unicode dipende dai primi byte di un file." - -#. +> trunk5 -#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Rileva Unicode automaticamente" - -#. +> trunk5 -#: optiondialog.cpp:1490 -#, kde-format -msgid "File Encoding for B:" -msgstr "Codifica per il file B:" - -#. +> trunk5 -#: optiondialog.cpp:1499 -#, kde-format -msgid "File Encoding for C:" -msgstr "Codifica per il file C:" - -#. +> trunk5 -#: optiondialog.cpp:1508 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Codifica per il file fuso e il salvataggio:" - -#. +> trunk5 -#: optiondialog.cpp:1512 -#, kde-format -msgid "Auto Select" -msgstr "Seleziona automaticamente" - -#. +> trunk5 -#: optiondialog.cpp:1515 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for " -"saving." -msgstr "" -"Se abilitato viene usata la codifica dei file di ingresso.\n" -"Nei casi ambigui una finestra chiederà all'utente di scegliere la codifica " -"per il salvataggio." - -#. +> trunk5 -#: optiondialog.cpp:1518 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Codifica per i file del preprocessore:" - -#. +> trunk5 -#: optiondialog.cpp:1529 -#, kde-format -msgid "Right To Left Language" -msgstr "Lingue scritte da destra a sinistra" - -#. +> trunk5 -#: optiondialog.cpp:1532 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Alcune lingue si leggono da destra a sinistra.\n" -"Questa opzione cambia in tal senso l'editor e la visualizzazione." - -#. +> trunk5 -#: optiondialog.cpp:1542 -#, kde-format -msgid "Integration" -msgstr "Integrazione" - -#. +> trunk5 -#: optiondialog.cpp:1543 -#, kde-format -msgid "Integration Settings" -msgstr "Impostazioni di integrazione" - -#. +> trunk5 -#: optiondialog.cpp:1556 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Opzioni da riga di comando da ignorare:" - -#. +> trunk5 -#: optiondialog.cpp:1561 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by " -"other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Lista delle opzioni da riga di comando che dovrebbero essere ignorate quando " -"KDiff3 viene usato da altri strumenti.\n" -"Si possono specificare diversi valori se separati con «;»\n" -"Questo eliminerà l'errore «Opzione sconosciuta»." - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Esci anche con il tasto Esc" - -#. +> trunk5 -#: optiondialog.cpp:1569 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Metodo di uscita veloce.\n" -"Per chi è abituato a usare il tasto Esc." - -#. +> trunk5 -#: optiondialog.cpp:1653 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "" -"Questo ripristina tutte le opzioni, non solo quelle dell'argomento attuale." - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Errore: perdita dati\n" -"Se è riproducibile, sei pregato di segnalarlo all'autore.\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "Grave errore interno" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Comando del preprocessore: " - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "" -"Le opzioni seguenti che hai selezionato potrebbero modificare dei dati:\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Di solito questo non è quello che si vuole in una fusione.\n" -"Vuoi disabilitare queste opzioni o continuare mantenendole in funzione?" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Opzioni non sicure per la fusione" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Usa queste opzioni nella fusione" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Disattiva le opzioni non sicure" - -#. +> trunk5 -#: pdiff.cpp:170 -#, kde-format -msgid "Loading A" -msgstr "Caricamento di A" - -#. +> trunk5 -#: pdiff.cpp:177 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:181 -#, kde-format -msgid "Loading B" -msgstr "Caricamento di B" - -#. +> trunk5 -#: pdiff.cpp:188 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Differenze: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Differenze per righe: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:223 -#, kde-format -msgid "Loading C" -msgstr "Caricamento di C" - -#. +> trunk5 -#: pdiff.cpp:230 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Differenze: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Differenze: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Differenze per righe: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Differenze per righe: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:773 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "" -"Tutti i file di ingresso contengono lo stesso testo, ma non sono uguali a " -"livello binario." - -#. +> trunk5 -#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"I file %1 e %2 contengono lo stesso testo, ma non sono uguali a livello " -"binario. \n" - -#. +> trunk5 -#: pdiff.cpp:797 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"Alcuni file di ingresso non sembrano essere file puramente di testo.\n" -"Tieni conto che la fusione di KDiff3 non è fatta per i file binari.\n" -"Se vuoi continuare, lo fai a tuo rischio e pericolo." - -#. +> trunk5 -#: pdiff.cpp:807 -#, kde-format -msgid ", B" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:809 -#, kde-format -msgid ", C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:811 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Non si è potuto convertire alcuni caratteri in ingresso in Unicode.\n" -"Forse usi la codifica sbagliata (per esempio UTF8 per file non UTF8).\n" -"Non salvare i risultati se non sei sicuro. Continua a tuo rischio e " -"pericolo.\n" -"I file di ingresso in questione sono in %1." - -#. +> trunk5 -#: pdiff.cpp:1029 -#, kde-format -msgid "Abort" -msgstr "Interrompi" - -#. +> trunk5 -#: pdiff.cpp:1035 pdiff.cpp:1123 -#, kde-format -msgid "Opening files..." -msgstr "Apertura dei file..." - -#. +> trunk5 -#: pdiff.cpp:1100 pdiff.cpp:1171 -#, kde-format -msgid "File open error" -msgstr "Errore nell'apertura del file" - -#. +> trunk5 -#: pdiff.cpp:1210 -#, kde-format -msgid "Cutting selection..." -msgstr "Taglio della selezione..." - -#. +> trunk5 -#: pdiff.cpp:1231 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Copia della selezione negli appunti..." - -#. +> trunk5 -#: pdiff.cpp:1247 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Inserimento dei contenuti degli appunti..." - -#. +> trunk5 -#: pdiff.cpp:1718 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "A capo automatico (il comando Annulla lo disabilita)" - -#. +> trunk5 -#: pdiff.cpp:1719 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" -"Calcolo della massima larghezza per la barra di scorrimento orizzontale" - -#. +> trunk5 -#: pdiff.cpp:1930 -#, kde-format -msgid "Save && Continue" -msgstr "Salva e continua" - -#. +> trunk5 -#: pdiff.cpp:1931 -#, kde-format -msgid "Continue Without Saving" -msgstr "Continua senza salvare" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search complete." -msgstr "Ricerca completata." - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search Complete" -msgstr "Ricerca completata" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "" -"Non è selezionato niente in nessuna delle finestre di ingresso delle " -"differenze." - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Errore nell'aggiunta di intervalli di differenze manuali" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "&Annulla" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (Base):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "File..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Cartella..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (Opzionale):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "Scambia e copia nomi..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Scambia %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Copia %1->Uscita" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Scambia %1<->Uscita" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Uscita (opzionale):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Configura..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, kde-format -msgid "Open Directory" -msgstr "Apri cartella" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "Seleziona il nome del file di uscita" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Testo da cercare:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Distingui le maiuscole" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Cerca in A" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Cerca in B" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Cerca in C" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Cerca nell'uscita" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Cerca" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Tester delle espressioni regolari" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Esempio di riga di fusione automatica:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "Per provare la fusione automatica, copia una riga così com'è nei file." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Risultato di corrispondenza:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Esempio di riga di inizio di cronologia (con commento iniziale):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Copia una riga di inizio di cronologia così com'è nei file,\n" -"incluso il commento iniziale." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Ordine della chiave d'ordinamento cronologico:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "" -"Esempio di riga di inizio di un elemento di cronologia (senza commento " -"iniziale):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Copia una riga di inizio di un elemento di cronologia così com'è nei file,\n" -"ma ometti il commento iniziale." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "Risultato della chiave di ordinamento:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Confronto riuscito." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Confronto non riuscito." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "" -"Le parentesi aperte e chiuse nell'espressione regolare non corrispondono." - -#~ msgid "Integrate with ClearCase" -#~ msgstr "Integra con ClearCase" - -#~ msgid "" -#~ "Integrate with Rational ClearCase from IBM.\n" -#~ "Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -#~ "(Only enabled when ClearCase \"bin\" directory is in the path.)" -#~ msgstr "" -#~ "Integra con Rational ClearCase di IBM.\n" -#~ "Modifica il file «map» nella sottocartella di ClearCase «lib/mgrs»\n" -#~ "(abilitato solo quando la cartella «bin» di ClearCase è nel percorso)." - -#~ msgid "Remove ClearCase Integration" -#~ msgstr "Rimuovi l'integrazione con ClearCase" - -#~ msgid "" -#~ "Restore the old \"map\" file from before doing the ClearCase integration." -#~ msgstr "" -#~ "Ripristina il vecchio file «map» com'era prima dell'integrazione con " -#~ "ClearCase." - -#~ msgid "&Merge" -#~ msgstr "F&ondi" - -#~ msgid "Line" -#~ msgstr "Riga" - -#~ msgid "Directory Comparison Status" -#~ msgstr "Stato del confronto tra cartelle" - -#~ msgid "Number of subdirectories:" -#~ msgstr "Numero di sottocartelle:" - -#~ msgid "Number of equal files:" -#~ msgstr "Numero di file uguali:" - -#~ msgid "Number of different files:" -#~ msgstr "Numero di file diversi:" - -#~ msgid "Total number of conflicts: " -#~ msgstr "Numero totale di conflitti: " - -#~ msgid "" -#~ "\n" -#~ "Nr of automatically solved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Nº di conflitti risolti automaticamente: " - -#~ msgid "" -#~ "\n" -#~ "Nr of unsolved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "Nº di conflitti non risolti: " - -#~ msgid "Ignore numbers" -#~ msgstr "Ignora i numeri" - -#~ msgid "Ignore C/C++ comments" -#~ msgstr "Ignora i commenti C e C++" - -#~ msgid "Ignore case" -#~ msgstr "Ignora le maiuscole" - -#~ msgid "Cancel" -#~ msgstr "Annulla" - -#~ msgid "Ok" -#~ msgstr "Ok" - -#~ msgid "Help" -#~ msgstr "Aiuto" - -#~ msgid "Defaults" -#~ msgstr "Valori predefiniti" - -#~ msgid "&Edit" -#~ msgstr "&Modifica" - -#~ msgid "&Settings" -#~ msgstr "Imp&ostazioni" - -#~ msgid "&Help" -#~ msgstr "Ai&uto" - -#~ msgid "&About" -#~ msgstr "&Informazioni" - -#~ msgid "A&uthor" -#~ msgstr "A&utore" - -#~ msgid "&Thanks To" -#~ msgstr "&Ringraziamenti" - -#~ msgid "Open" -#~ msgstr "Apri" - -#~ msgid "Save" -#~ msgstr "Salva" - -#~ msgid "Print..." -#~ msgstr "Stampa..." - -#~ msgid "Quit" -#~ msgstr "Esci" - -#~ msgid "Cut" -#~ msgstr "Taglia" - -#~ msgid "Copy" -#~ msgstr "Copia" - -#~ msgid "Paste" -#~ msgstr "Incolla" - -#~ msgid "Select All" -#~ msgstr "Seleziona tutto" - -#~ msgid "Show Toolbar" -#~ msgstr "Mostra la barra degli strumenti" - -#~ msgid "Show &Status Bar" -#~ msgstr "Mostra la barra di &stato" - -#~ msgid "&Configure %1..." -#~ msgstr "&Configura %1..." - -#~ msgid "About" -#~ msgstr "Informazioni" - -#~ msgid "Find" -#~ msgstr "Trova" - -#~ msgid "Find Next" -#~ msgstr "Trova successivo" - -#~ msgid "For more documentation, see the help-menu or the subdirectory doc." -#~ msgstr "" -#~ "Per maggiore documentazione, vedi il menu «Aiuto» o la sottocartella doc." - -#~ msgid "KDiff3-Usage" -#~ msgstr "Uso di KDiff3" - -#~ msgid "Ignore" -#~ msgstr "Ignora" - -#~ msgid "Exit" -#~ msgstr "Esci" - -#~ msgid "Continue" -#~ msgstr "Continua" - -#~ msgid "Language (restart required)" -#~ msgstr "Lingua (riavvio necessario)" - -#~ msgid "" -#~ "Choose the language of the GUI strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "Scegli la lingua dell'interfaccia grafica o «Auto».\n" -#~ "Per cambiare la lingua devi uscire e riavviare KDiff3." - -#~ msgid "kdiff3" -#~ msgstr "kdiff3" - -#~ msgid "&OK" -#~ msgstr "&OK" - -#~ msgid "OK" -#~ msgstr "OK" - -#~| msgid "(c) 2002-2011 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "(c) 2002-2014 Joachim Eibl" - -#~ 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 "" -#~ "Questo non dovrebbe mai succedere:\n" -#~ "\n" -#~ "mergeResultSaved: m_pMFI=0\n" -#~ "\n" -#~ "Se sai come riprodurlo, per favore comunicalo all'autore del programma." - -#~ msgid "Program Error" -#~ msgstr "Errore nel programma" - -#~ msgid "Error." -#~ msgstr "Errore." - -#~ msgid "Select Font" -#~ msgstr "Seleziona carattere" - -#~ 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 "" -#~ "Hai selezionato un carattere a ampiezza variabile.\n" -#~ "\n" -#~ "Siccome questo programma non gestisce correttamente questo\n" -#~ "tipo di caratteri, potresti avere problemi a modificare i file.\n" -#~ "\n" -#~ "Vuoi continuare o preferisci cambiare carattere?" - -#~ msgid "Incompatible font." -#~ msgstr "Carattere non compatibile." - -#~ msgid "Continue at my own risk" -#~ msgstr "Continuo a mio rischio" - -#~ msgid "Select another font" -#~ msgstr "Seleziona un altro carattere" - -#~ msgid "Eike Sauer" -#~ msgstr "Eike Sauer" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "Correzioni, responsabile del pacchetto di Debian" - -#~ msgid "Sebastien Fricker" -#~ msgstr "Sebastien Fricker" - -#~ msgid "Windows installer" -#~ msgstr "Installatore per Windows" - -#~ msgid "Stephan Binner" -#~ msgstr "Stephan Binner" - -#~ msgid "i18n-help" -#~ msgstr "Aiuto per la localizzazione" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "Stefan Partheymueller" - -#~ msgid "Clipboard-patch" -#~ msgstr "Correzione per gli appunti" - -#~ msgid "David Faure" -#~ msgstr "David Faure" - -#~ msgid "KIO-Help" -#~ msgstr "Aiuto per KIO" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "Bernd Gehrmann" - -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Classe CvsIgnoreList da Cervisia" - -#~ msgid "Andre Woebbeking" -#~ msgstr "Andre Woebbeking" - -#~ msgid "Class StringMatcher" -#~ msgstr "Classe StringMatcher" - -#~ msgid "Michael Denio" -#~ msgstr "Michael Denio" - -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "Correzione per la colorazione delle cartelle identiche" - -#~ msgid "Manfred Koehler" -#~ msgstr "Manfred Koehler" - -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Correzione per l'avvio lento su Windows" - -#~ msgid "Sergey Zorin" -#~ msgstr "Sergey Zorin" - -#~ msgid "Diff Ext for Windows" -#~ msgstr "Estensione per le differenze su Windows" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#~ msgid "GNU-Diffutils" -#~ msgstr "Diffutils di GNU" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "Tino Boellsterling, Timothy Mee" - -#~ msgid "Intensive test, use and feedback" -#~ msgstr "Molte prove, uso e segnalazioni" - -#~ msgid "Michael Schmidt" -#~ msgstr "Michael Schmidt" - -#~ msgid "Mac support" -#~ msgstr "Supporto su Macintosh" - -#~ msgid "Valentin Rusu" -#~ msgstr "Valentin Rusu" - -#~ msgid "KDE4 porting" -#~ msgstr "Trasferimento su KDE4" - -#~ msgid "Albert Astals Cid" -#~ msgstr "Albert Astals Cid" - -#~ msgid "Silvan Scherrer" -#~ msgstr "Silvan Scherrer" - -#~ msgid "OS2 port" -#~ msgstr "Trasferimento su OS2" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "E grazie mille a chi ha segnalato errori o fornito idee!" - -#~ msgid "Italic font for deltas" -#~ msgstr "Carattere corsivo per le differenze" - -#~ msgid "" -#~ "Selects the italic version of the font for differences.\n" -#~ "If the font doesn't support italic characters, then this does nothing." -#~ msgstr "" -#~ "Seleziona la versione corsiva del carattere per le differenze.\n" -#~ "Se il carattere non supporta il corsivo, non succede nulla." - -#~ msgid "Incompatible Font" -#~ msgstr "Carattere non compatibile" - -#~ msgid "Continue at Own Risk" -#~ msgstr "Continua a tuo rischio" - -#~ msgid "Select Another Font" -#~ msgstr "Scegli un altro carattere" Property changes on: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3.po ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Author Date Id Revision \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/x-gettext \ No newline at end of property Index: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,54 +0,0 @@ -# translation of desktop_extragear-utils_kdiff3.po to Italian -# Giovanni Venturi , 2003. -# Giovanni Venturi , 2003, 2004, 2005. -# Federico Zenith , 2003, 2004, 2005, 2007, 2009, 2011. -# FiNeX , 2007. -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2011-05-02 08:09+0200\n" -"Last-Translator: Federico Zenith \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Interfaccia per i comandi diff e patch" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Uno strumento di confronto e fusione di file e cartelle" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "Confronta o fondi file e cartelle con KDiff3" - -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "KDiff3" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "Confronta o fondi file e cartelle" Property changes on: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._desktop_.po ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,0 +0,0 ## Index: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._json_.po =================================================================== --- trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._json_.po (revision 1522186) +++ trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3._json_.po (nonexistent) @@ -1,21 +0,0 @@ -# Paolo Zamponi , 2018. -msgid "" -msgstr "" -"Project-Id-Version: json files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2018-05-25 17:14+0100\n" -"Last-Translator: Paolo Zamponi \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "Confronta e fonde i file o le cartelle con KDiff3" Index: trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/it/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,133 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the kdiff3 package. -# -# Federico Zenith , 2011. -# Valter Mura , 2018. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2018-03-26 21:44+0100\n" -"Last-Translator: Valter Mura \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." -msgid "KDiff3..." -msgstr "KDiff3..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "Confronta con %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "Fondi con %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "Memorizza «%1»" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "Fusione a tre con base" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." -msgid "Compare with..." -msgstr "Confronta con..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "Pulisci elenco" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "Confronta" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "Confronto a tre" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." -msgid "About KDiff3 menu plugin..." -msgstr "Informazioni sull'estensione KDiff3 per menu..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Estensione KDiff3 per azioni su file: copyright 2011 di Joachim Eibl\n" -"Pagina Web di KDiff3: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It " -#| "will appear in the \"Compare With ...\" submenu. Then use \"Compare With" -#| "\" on the second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge " -#| "and choose \"3-way merge with base\" on the other branch which will be " -#| "used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It " -"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " -"the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and " -"choose \"3-way merge with base\" on the other branch which will be used as " -"destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Usare l'estensione del menu contestuale:\n" -"Per un confronto semplice di due file selezionati, seleziona «Confronta».\n" -"Se l'altro file è da un'altra parte, «Memorizza» il primo file: apparirà nel " -"sottomenu «Confronta con...». Usa quindi «Confronta con» sul secondo file.\n" -"Per una fusione a tre «Salva» prima il file di base, quindi il ramo da " -"fondere e seleziona «Fusione a tre con base» sull'altro ramo che verrà usato " -"come destinazione.\n" -"Lo stesso vale per il confronto e la fusione tra cartelle." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "Informazioni sull'estensione KDiff3 per azioni sui file" Index: trunk/l10n-support/it/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/it/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (revision 1522186) +++ trunk/l10n-support/it/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (nonexistent) @@ -1,90 +0,0 @@ -# Paolo Zamponi , 2018. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: 2018-07-11 09:18+0200\n" -"PO-Revision-Date: 2018-07-12 17:51+0100\n" -"Last-Translator: Paolo Zamponi \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" - -#. (itstool) path: component/name -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:6 -msgid "KDiff3" -msgstr "KDiff3" - -#. (itstool) path: component/summary -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:7 -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Uno strumento di confronto e di fusione di file e cartelle" - -#. (itstool) path: description/p -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:11 -msgid "KDiff3 is a file and directory diff and merge tool which" -msgstr "KDiff3 è uno strumento per fondere file e cartelle che" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:13 -msgid "compares and merges two or three text input files or directories," -msgstr "confronta e fonde due o tre file di testo o cartelle in ingresso," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:14 -msgid "shows the differences line by line and character by character(!)," -msgstr "mostra le differenze riga per riga e carattere per carattere(!)," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:15 -msgid "provides an automatic merge-facility," -msgstr "fornisce un servizio automatico per la fusione," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:16 -msgid "has an editor for comfortable solving of merge-conflicts," -msgstr "dispone di un editor per risolvere comodamente i conflitti di fusione," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:17 -msgid "provides network transparency via KIO," -msgstr "fornisce trasparenza di rete tramite KIO," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:18 -msgid "has options to highlight or hide changes in white-space or comments," -msgstr "" -"ha opzioni per evidenziare o per nascondere le modifiche negli spazi o nei " -"commenti," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:19 -msgid "supports Unicode, UTF-8 and other file encodings," -msgstr "supporta Unicode, UTF-8 e altre codifiche di file," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:20 -msgid "prints differences," -msgstr "stampa le differenze," - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:21 -msgid "supports version control keyword and history merging." -msgstr "" -"supporta le parole chiave per il controllo di versione e la fusione della " -"cronologia." Index: trunk/l10n-support/ja/summit/messages/kdereview/diff_ext.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/diff_ext.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/diff_ext.po (revision 1522187) @@ -0,0 +1,159 @@ +msgid "" +msgstr "" +"Project-Id-Version: diff_ext\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-06 07:33+0200\n" +"PO-Revision-Date: 2018-08-07 21:05-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: diff_ext.cpp:391 +#, kde-format +msgid "Compare with %1" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:392 +#, kde-format +msgid "Merge with %1" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:408 +#, kde-format +msgid "3-way merge with base" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:411 +#, kde-format +msgid "Save '%1' for later" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:426 +#, kde-format +msgid "Compare with ..." +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:429 +#, kde-format +msgid "Clear list" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:434 +#, kde-format +msgid "Compare" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:438 +#, kde-format +msgid "3 way comparison" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:444 +#, kde-format +msgid "About Diff-Ext ..." +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:515 +#, kde-format +msgid "(32 Bit)" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:517 +#, kde-format +msgid "(64 Bit)" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:518 +#, kde-format +msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:519 +#, kde-format +msgid "This software is distributable under the BSD-2-Clause license.\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:520 +#, kde-format +msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:521 +#, kde-format +msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:522 +#, kde-format +msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:523 +#, kde-format +msgid "About Diff-Ext for KDiff3 " +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:552 +#, kde-format +msgid "Compare selected files" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:558 diff_ext.cpp:578 +#, kde-format +msgid "Compare '%1' with '%2'" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:564 +#, kde-format +msgid "Save '%1' for later operation" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:620 +#, kde-format +msgid "Could not start KDiff3. Please rerun KDiff3 installation." +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:621 +#, kde-format +msgid "Command" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:622 +#, kde-format +msgid "CommandLine" +msgstr "" + +#. +> trunk5 +#: diff_ext.cpp:623 +#, kde-format +msgid "Diff-Ext For KDiff3" +msgstr "" Index: trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,57 @@ +# Translation of desktop_extragear-utils_kdiff3 into Japanese. +# Yukiko Bando , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2008-09-27 13:16+0900\n" +"Last-Translator: Yukiko Bando \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch フロントエンド" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "ファイルやディレクトリの比較/マージを行うツール" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "KDiff3 でファイルやディレクトリを比較/マージ" + +#, fuzzy +#~| msgctxt "Name" +#~| msgid "KDiff3" +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "KDiff3" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "ファイルやディレクトリを比較/マージ" Index: trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._json_.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._json_.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/kdiff3._json_.po (revision 1522187) @@ -0,0 +1,21 @@ +msgid "" +msgstr "" +"Project-Id-Version: json files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2018-02-24 15:01-0800\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "" Index: trunk/l10n-support/ja/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4341 @@ +# Translation of kdiff3 into Japanese. +# SATOH Satoru , 2004. +# Yukiko Bando , 2008. +# Fumiaki Okushi , 2010. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-07 09:31+0200\n" +"PO-Revision-Date: 2010-10-03 21:09-0700\n" +"Last-Translator: Fumiaki Okushi \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "SATOH Satoru,Yukiko Bando" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "ss@kde.gr.jp,ybando@k6.dion.ne.jp" + +#. +> trunk5 +#: diff.cpp:258 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" + +#. +> trunk5 +#: diff.cpp:262 +#, kde-format +msgid "From Clipboard" +msgstr "クリップボードから" + +#. +> trunk5 +#: diff.cpp:563 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "" + +#. +> trunk5 +#: diff.cpp:566 +#, kde-format +msgid "Not matching apostrophs." +msgstr "" + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "" + +#. +> trunk5 +#: diff.cpp:595 +#, kde-format +msgid "No program specified." +msgstr "" + +#. +> trunk5 +#: diff.cpp:710 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" + +#. +> trunk5 +#: diff.cpp:757 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" + +#. +> trunk5 +#: diff.cpp:784 +#, kde-format +msgid "File %1 too large to process. Skipping." +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, fuzzy, kde-format +#| msgid "Line not available" +msgid "File %1: Line not available" +msgstr "行がありません" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, kde-format +msgid "Encoding:" +msgstr "エンコーディング:" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 +#, kde-format +msgid "Line end style:" +msgstr "改行コード:" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 +#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 +#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 +#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 +#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 +#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 +#: smalldialogs.cpp:126 smalldialogs.cpp:129 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 +#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 +#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 +#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 +#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 +#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 +#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 +#: smalldialogs.cpp:127 smalldialogs.cpp:130 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 +#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 +#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 +#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 +#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 +#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: difftextwindow.cpp:1858 +#, fuzzy, kde-format +#| msgid "A (Base):" +msgid "A (Base)" +msgstr "A (ベース):" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Encoding: %1" +msgstr "エンコーディング:" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, fuzzy, kde-format +#| msgid "Line end style:" +msgid "Line end style: %1" +msgstr "改行コード:" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "上部行" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, kde-format +msgid "End" +msgstr "最後" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, fuzzy, kde-format +#| msgid "Opening files..." +msgid "Open File" +msgstr "ファイルを開いています..." + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 ビット" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, kde-format +msgid "Other" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "未解決" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "解決済み" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "ホワイトスペース以外" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "ホワイトスペース" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "A を B にコピー" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "B を A にコピー" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "A を削除" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "B を削除" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "A と B を削除" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "A にマージ" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "B にマージ" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "A と B にマージ" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "(存在すれば) 削除" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "マージ" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "マージ (手作業)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "エラー: ファイルタイプが衝突しています" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "エラー: 日付は同じですが、ファイルは等しくありません。" + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgid "Done." +msgid "Done" +msgstr "完了" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "エラー" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "スキップしました。" + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "未保存" + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "進行中..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, fuzzy, kde-format +msgid "To do." +msgstr "To do." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "名前" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "操作" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "状態" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "リンクと普通のファイルが混在しています。" + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "リンク: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "サイズ" + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "日付とサイズ: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "%1 の一時コピーの作成に失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "%1 を開けませんでした。" + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "ファイルを比較中..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "%1 からの読み込みエラー" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" +"ディレクトリマージを実行中です。本当にマージを中止し、ディレクトリを再スキャ" +"ンしますか？" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 +#, kde-format +msgid "Warning" +msgstr "警告" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "再スキャン" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1030 +#, kde-format +msgid "Continue Merging" +msgstr "マージを続行" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "ディレクトリを開けませんでした:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ A ‘%1’ は存在しないか、ディレクトリではありません。\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ B ‘%1’ は存在しないか、ディレクトリではありません。\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ C ‘%1’ は存在しないか、ディレクトリではありません。\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "ディレクトリのオープンエラー" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" +"Check again before continuing." +msgstr "" +"3 つのディレクトリをマージする場合、マージ先ディレクトリは A や B と同じで" +"あってはいけません。\n" +"続行する前にもう一度確認してください。" + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "パラメータ警告" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "ディレクトリをスキャン中..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "ディレクトリ A を読み込み中" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "ディレクトリ B を読み込み中" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "ディレクトリ C を読み込み中" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "いくつかのサブディレクトリが読み込み不可でした" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "サブディレクトリのパーミッションを確認してください。" + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 +#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 +#, kde-format +msgid "Ready." +msgstr "準備完了。" + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of manual merges:" +msgid "Number of manual merges: %1" +msgstr "手作業でのマージ数:" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "これはすべてのマージ操作に影響します。" + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "すべてのマージ操作を更新中" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgid "Processing " +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "処理中" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "この操作は今はできません。" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "操作不可" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "コピー中にエラーが発生しました。\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "マージエラー" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "不明なマージ操作 (これは起きてはならないことです)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "不明なマージ操作です。" + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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" +"\n" +"このプログラムはまだベータ段階で何が起きても無保証だということに注意してくだ" +"さい!重要なデータはバックアップを取ってください!" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "マージ開始" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "実行" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "試行" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" +"強調表示された項目はディレクトリによってタイプが違います。どうするか選択して" +"ください。" + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"ファイルの更新日時は同じですが、ファイルは等しくありません。どうするか選択し" +"てください。" + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "" +"The highlighted item was changed in one directory and deleted in the other. " +"Select what to do." +msgstr "" +"強調表示された項目は一方のディレクトリで変更され、他方のディレクトリで削除さ" +"れました。どうするか選択してください。" + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "" +"This operation is currently not possible because directory merge is " +"currently running." +msgstr "ディレクトリマージ中なのでこの操作を実行することはできません。" + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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" +"エラーを起した項目について続行しますか？それともスキップしますか？" + +# @title:window? +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "エラー後のマージ続行" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "最後の項目について続行" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "項目をスキップ" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "マージ操作が完了しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "マージ完了" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "" +"Simulated merge complete: Check if you agree with the proposed operations." +msgstr "マージ試行完了: この操作をしてもよいか確認してください。" + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "" +"エラーが発生しました。詳細情報を見るには「OK」をクリックしてください。\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "エラー: %1 の削除中にバックアップファイルを作成できませんでした。" + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "再帰的にディレクトリを削除 (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "削除 (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "エラー: ディレクトリの削除がディレクトリの読み込み中に失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "エラー: ディレクトリの削除 (%1) に失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "エラー: 削除に失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "手作業でのマージ (%1, %2, %3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid "" +" Note: After a manual merge the user should continue by pressing F7." +msgstr "【注】 手作業でのマージ後に続行するには F7 を押してください。" + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"エラー: コピー (%1 -> %2) に失敗しました。既存のコピー先を削除できませんでし" +"た。" + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "リンクをコピー (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "エラー: リンクのコピーに失敗しました。リモートリンクは未サポートです。" + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "エラー: リンクのコピーに失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "コピー (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "名前変更 (%1 -> %2) 中にエラー: 既存のコピー先を削除できません。" + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "名前変更 (%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "エラー: 名前変更に失敗しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" +"ディレクトリの作成 (%1) 中にエラーが発生しました。既存のファイルを削除できま" +"せん。" + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "ディレクトリを作成 (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "ディレクトリの作成中にエラーが発生しました。" + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "先" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "ディレクトリ" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "タイプ" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "サイズ" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "属性" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "最終更新" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "リンク先" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "ファイル" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +#| msgid "Link: " +msgid "-Link" +msgstr "リンク: " + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "利用不可" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (先): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (元): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (先): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (先): " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "先: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "ディレクトリマージの状態を保存..." + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "ディレクトリマージを開始/続行" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "現在の項目について操作を実行" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "選択ファイルを比較 " + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "現在のファイルをマージ " + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"ファイル\n" +"をマージ" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "すべてのサブディレクトリをたたむ" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "すべてのサブディレクトリを展開" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "すべての項目について A を選択" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "すべての項目について B を選択" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "すべての項目について C を選択" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "すべての項目について自動選択" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "すべての項目について操作なし" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "等しいファイルを表示" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"等しい\n" +"ファイル" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "異なるファイルを表示" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "A にのみ存在するファイルを表示" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"A にのみ存在\n" +"するファイル" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "B にのみ存在するファイルを表示" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"B にのみ存在\n" +"するファイル" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "C にのみ存在するファイルを表示" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"C にのみ存在\n" +"するファイル" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "明示的に選択したファイルを比較" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "明示的に選択したファイルをマージ" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "何もしない" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "A と B を削除" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "A と B にマージ" + +#. +> trunk5 +#: fileaccess.cpp:885 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"バックアップの作成中に古いバックアップを削除できませんでした。\n" +"ファイル名: " + +#. +> trunk5 +#: fileaccess.cpp:892 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"バックアップの作成中に名前変更に失敗しました。\n" +"ファイル名: " + +#. +> trunk5 +#: fileaccess.cpp:916 +#, kde-format +msgid "Getting file status: %1" +msgstr "ファイルの状態を取得中: %1" + +#. +> trunk5 +#: fileaccess.cpp:958 +#, kde-format +msgid "Reading file: %1" +msgstr "ファイルを読み込み中: %1" + +#. +> trunk5 +#: fileaccess.cpp:996 +#, kde-format +msgid "Writing file: %1" +msgstr "ファイルに書き込み中: %1" + +#. +> trunk5 +#: fileaccess.cpp:1029 +#, kde-format +msgid "Out of memory" +msgstr "メモリが足りません" + +#. +> trunk5 +#: fileaccess.cpp:1064 +#, kde-format +msgid "Making directory: %1" +msgstr "ディレクトリを作成中: %1" + +#. +> trunk5 +#: fileaccess.cpp:1084 +#, kde-format +msgid "Removing directory: %1" +msgstr "ディレクトリを削除中: %1" + +#. +> trunk5 +#: fileaccess.cpp:1099 +#, kde-format +msgid "Removing file: %1" +msgstr "ファイルを削除中: %1" + +#. +> trunk5 +#: fileaccess.cpp:1115 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "シンボリックリンクを作成中: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1143 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "ファイル名を変更中: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1175 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "ファイルをコピー中: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1189 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "" +"ファイルコピー中にエラー: ファイルを読み込みのために開けませんでした。ファイ" +"ル名: %1" + +#. +> trunk5 +#: fileaccess.cpp:1195 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "" +"ファイルコピー中にエラー: ファイルを書き込みのために開けませんでした。ファイ" +"ル名: %1" + +#. +> trunk5 +#: fileaccess.cpp:1207 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "ファイルコピー中にエラー: 読み込みに失敗しました。ファイル名: %1" + +#. +> trunk5 +#: fileaccess.cpp:1216 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "ファイルコピー中にエラー: 書き込みに失敗しました。ファイル名: %1" + +#. +> trunk5 +#: fileaccess.cpp:1499 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "ディレクトリを読み込み中: " + +#. +> trunk5 +#: fileaccess.cpp:1618 +#, kde-format +msgid "Listing directory: %1" +msgstr "ディレクトリの内容一覧を作成中: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "現在の設定:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "設定オプションのエラー:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "" +"オプション --auto を使用していますが、出力ファイルが指定されていません。" + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "オプション --auto はディレクトリ比較時には無視されます。" + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "保存に失敗しました。" + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 +#, kde-format +msgid "Opening of these files failed:" +msgstr "以下のファイルを開けませんでした:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "ファイルのオープンエラー" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "比較のために文書を開きます..." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "再読み込み" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "マージ結果を保存します。すべての衝突を解決しなければなりません。" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "現在の文書を別名で保存します..." + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "差異を印刷します" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "アプリケーションを終了します" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "選択範囲を切り取り、クリップボードに格納します" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "選択範囲をコピーし、クリップボードに格納します" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, fuzzy, kde-format +#| msgid "Pastes the clipboard contents to actual position" +msgid "Pastes the clipboard contents to current position" +msgstr "クリップボードの内容を現在の位置に貼り付けます" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "現在のウィンドウのすべてを選択します" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "文字列を検索します" + +# StatusTip for FindNext +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "文字列の次のマッチを検索します" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "ステータスバーの表示/非表示を切り替えます" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "KDiff3 を設定..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "現在の異なる部分に移動" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"現在の\n" +"異なる部分" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "最初の異なる部分に移動" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"最初の\n" +"異なる部分" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "最後の異なる部分に移動" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"最後の\n" +"異なる部分" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" +"(ホワイトスペースの表示が無効なときはホワイトスペースの差異をスキップする)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "" +"(Does not skip white space differences even when \"Show White Space\" is " +"disabled.)" +msgstr "" +"(ホワイトスペースの表示が無効なときもホワイトスペースの差異をスキップしない)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "前の異なる部分に移動" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"前の\n" +"異なる部分" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "次の異なる部分に移動" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"次の\n" +"異なる部分" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "前の衝突に移動" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"前の\n" +"衝突" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "次の衝突に移動" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"次の\n" +"衝突" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "前の未解決の衝突に移動" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"前の\n" +"未解決" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "次の未解決の衝突に移動" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"次の\n" +"未解決" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "A からの選択行" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"選択\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "B からの選択行" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"選択\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "C からの選択行" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"選択\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "ソース選択後に自動的に次の未解決の衝突に移動" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "自動" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters for Differences" +msgid "Show Space && Tabulator Characters" +msgstr "スペースとタブ文字を表示" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"ホワイト\n" +"スペース文字" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "ホワイトスペースを表示" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"ホワイト\n" +"スペース" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "行番号を表示" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "行番号" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "常に A を選択" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "常に B を選択" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "常に C を選択" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "未解決の衝突について常に A を選択" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "未解決の衝突について常に B を選択" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "未解決の衝突について常に C を選択" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "未解決のホワイトスペースの衝突について常に A を選択" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "未解決のホワイトスペースの衝突について常に B を選択" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "未解決のホワイトスペースの衝突について常に C を選択" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "単純な衝突を自動的に解決" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "異なる部分を衝突として設定" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "正規表現による自動マージを実行" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "履歴の衝突を自動的に解決" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "選択した差異を分離" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "選択した差異を結合" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "ウィンドウ A を表示" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "ウィンドウ B を表示" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "ウィンドウ C を表示" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "すべて比較 (標準)" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "A と B を比較" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "A と C を比較" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "B と C を比較" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Diff ウィンドウで行を折り返す" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "次のウィンドウにフォーカス" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "前のウィンドウにフォーカス" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "分割方向を切り替え" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "ディレクトリ/テキスト分割画面表示" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "ディレクトリ表示/テキスト表示を切り替え" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1928 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "マージ結果は保存されていません。" + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "保存/終了" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "保存せずに終了" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1939 +#, kde-format +msgid "Saving the merge result failed." +msgstr "マージ結果の保存に失敗しました。" + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1027 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "ディレクトリマージを実行中です。本当に中止しますか？" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "ファイルを保存中..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "名前を付けてファイルを保存中..." + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "名前を付けて保存..." + +#. +> trunk5 +#: kdiff3.cpp:815 +#, fuzzy, kde-format +#| msgid "Printing completed." +msgid "Printing not implemented." +msgstr "印刷完了。" + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "印刷中..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +#| msgid "Selection" +msgid " (Selection)" +msgstr "選択" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "印刷完了。" + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "印刷中止。" + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "終了中..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "ツールバーの表示/非表示を切り替え中..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "ステータスバーの表示/非表示を切り替え中..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "比較するファイルを見つけることができませんでした。" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "KDiff3(&K)" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "KDiff3 を設定" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:113 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, fuzzy, kde-format +#| msgid "" +#| "Could not initialize the KDiff part.\n" +#| "This usually happens due to an installation problem. Please read the " +#| "README-file in the source package for details." +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" +"KDiff part を初期化できませんでした。\n" +"普通これはインストールの問題です。詳細についてはソースパッケージの README " +"ファイルを参照してください。" + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "ファイル(&F)" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "ディレクトリ(&D)" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "現在の項目のマージ操作" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "現在の項目の同期操作" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgid "&Movement" +msgid "M&ovement" +msgstr "移動(&M)" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "Diff ビュー(&I)" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +#| msgid "Merge" +msgid "M&erge" +msgstr "マージ" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "ウィンドウ(&W)" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "メインツールバー" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "" + +#. +> trunk5 +#: main.cpp:117 +#, kde-format +msgid " (64 bit)" +msgstr "" + +#. +> trunk5 +#: main.cpp:119 +#, kde-format +msgid " (32 bit)" +msgstr "" + +#. +> trunk5 +#: main.cpp:120 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "ファイルとディレクトリを比較/マージするためのツール" + +#. +> trunk5 +#: main.cpp:121 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Merge the input." +msgstr "入力をマージ" + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "明示的にベースファイルを指定 (一部のツールとの互換性のため)" + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "出力ファイルを指定。暗示的に -m を指定。例: -o newfile.txt" + +#. +> trunk5 +#: main.cpp:143 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "出力ファイルを指定 (一部のツールとの互換性のため)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "すべての衝突を自動解決できる場合は GUI を使用しない (-o file が必要)" + +#. +> trunk5 +#: main.cpp:145 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically. (For compatibility...)" +msgid "Do not solve conflicts automatically." +msgstr "衝突を自動解決しない (互換性のため)" + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "入力ファイル 1 (ベース) の代替表示名" + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "入力ファイル 2 の代替表示名" + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "入力ファイル 3 の代替表示名" + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "代替表示名。一度設定するとすべての入力に適用されます。" + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "" +"Override a config setting. Use once for every setting. E.g.: --cs " +"\"AutoAdvance=1\"" +msgstr "" + +#. +> trunk5 +#: main.cpp:151 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "設定項目と現在の値を一覧表示" + +#. +> trunk5 +#: main.cpp:152 +#, kde-format +msgid "Use a different config file." +msgstr "使用する設定ファイルを指定" + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "開く file1 (ベース, --base が未指定の場合)" + +#. +> trunk5 +#: main.cpp:156 +#, kde-format +msgid "file2 to open" +msgstr "開く file2" + +#. +> trunk5 +#: main.cpp:157 +#, kde-format +msgid "file3 to open" +msgstr "開く file3" + +#. +> trunk5 +#: main.cpp:168 +#, kde-format +msgid "See kdiff3 --help for supported options." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "未解決の衝突の数: %1 (内 %2 はホワイトスペース)" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"出力が更新されました。\n" +"続行すると更新内容は失われます。" + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:771 +#, kde-format +msgid "All input files are binary equal." +msgstr "すべての入力ファイルはバイナリ的に同じです。" + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "すべての入力ファイルのテキストは同じです。" + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "ファイル %1 と %2 はバイナリ的に同じです。\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "ファイル %1 と %2 のテキストは同じです。\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, kde-format +msgid "Conflicts" +msgstr "衝突" + +#. +> trunk5 +#: mergeresultwindow.cpp:1840 +#, kde-format +msgid "" +msgstr "<ソース行なし>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 +#, kde-format +msgid "" +msgstr "<マージ衝突 (ホワイトスペースのみ)>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 +#, kde-format +msgid "" +msgstr "<マージ衝突>" + +#. +> trunk5 +#: mergeresultwindow.cpp:2934 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"未解決の衝突がまだ残っています。\n" +"ファイルは保存されていません。\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 +#, kde-format +msgid "Conflicts Left" +msgstr "未解決の衝突があります" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, kde-format +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"バックアップファイルの作成に失敗しました。ファイルは保存されていません。" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 +#, kde-format +msgid "File Save Error" +msgstr "ファイルの保存エラー" + +#. +> trunk5 +#: mergeresultwindow.cpp:3005 +#, kde-format +msgid "Error while writing." +msgstr "書き込み中にエラーが発生しました。" + +#. +> trunk5 +#: mergeresultwindow.cpp:3365 +#, fuzzy, kde-format +#| msgid "Output" +msgid "Output:" +msgstr "出力" + +#. +> trunk5 +#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 +#, kde-format +msgid "[Modified]" +msgstr "[更新]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3384 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "保存時のエンコーディング" + +#. +> trunk5 +#: mergeresultwindow.cpp:3484 +#, kde-format +msgid "Conflict" +msgstr "衝突" + +#. +> trunk5 +#: mergeresultwindow.cpp:3516 +#, kde-format +msgid "Codec from A: %1" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:3518 +#, kde-format +msgid "Codec from B: %1" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:3520 +#, kde-format +msgid "Codec from C: %1" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "ASCII 以外の文字が適切に表示されなければ、これを変更してください。" + +#. +> trunk5 +#: optiondialog.cpp:613 +#, kde-format +msgid "Configure" +msgstr "設定" + +#. +> trunk5 +#: optiondialog.cpp:690 +#, kde-format +msgid "Font" +msgstr "フォント" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "エディタ/Diff 出力のフォント" + +#. +> trunk5 +#: optiondialog.cpp:710 +#, kde-format +msgid "Application font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:714 +#, fuzzy, kde-format +#| msgid "File Save Error" +msgid "File view font" +msgstr "ファイルの保存エラー" + +#. +> trunk5 +#: optiondialog.cpp:732 +#, kde-format +msgid "Color" +msgstr "色" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Colors Settings" +msgstr "色の設定" + +#. +> trunk5 +#: optiondialog.cpp:750 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "エディタ/Diff ビュー:" + +#. +> trunk5 +#: optiondialog.cpp:758 +#, kde-format +msgid "Foreground color:" +msgstr "前景色:" + +#. +> trunk5 +#: optiondialog.cpp:765 +#, kde-format +msgid "Background color:" +msgstr "背景色:" + +#. +> trunk5 +#: optiondialog.cpp:774 +#, kde-format +msgid "Diff background color:" +msgstr "Diff 背景色:" + +#. +> trunk5 +#: optiondialog.cpp:782 +#, kde-format +msgid "Color A:" +msgstr "色 (A):" + +#. +> trunk5 +#: optiondialog.cpp:790 +#, kde-format +msgid "Color B:" +msgstr "色 (B):" + +#. +> trunk5 +#: optiondialog.cpp:798 +#, kde-format +msgid "Color C:" +msgstr "色 (C):" + +#. +> trunk5 +#: optiondialog.cpp:805 +#, kde-format +msgid "Conflict color:" +msgstr "色 (衝突):" + +#. +> trunk5 +#: optiondialog.cpp:813 +#, kde-format +msgid "Current range background color:" +msgstr "現在の範囲の背景色:" + +#. +> trunk5 +#: optiondialog.cpp:821 +#, kde-format +msgid "Current range diff background color:" +msgstr "現在の範囲の diff 背景色:" + +#. +> trunk5 +#: optiondialog.cpp:828 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:834 +#, kde-format +msgid "Directory Comparison View:" +msgstr "ディレクトリ比較ビュー:" + +#. +> trunk5 +#: optiondialog.cpp:840 +#, kde-format +msgid "Newest file color:" +msgstr "最も新しいファイルの色:" + +#. +> trunk5 +#: optiondialog.cpp:844 +#, kde-format +msgid "" +"Changing this color will only be effective when starting the next directory " +"comparison." +msgstr "色の変更は次回ディレクトリ比較を開始したときに有効になります。" + +#. +> trunk5 +#: optiondialog.cpp:849 +#, kde-format +msgid "Oldest file color:" +msgstr "最も古いファイルの色:" + +#. +> trunk5 +#: optiondialog.cpp:857 +#, kde-format +msgid "Middle age file color:" +msgstr "中間のファイルの色:" + +#. +> trunk5 +#: optiondialog.cpp:865 +#, kde-format +msgid "Color for missing files:" +msgstr "欠落したファイルの色:" + +#. +> trunk5 +#: optiondialog.cpp:878 +#, kde-format +msgid "Editor" +msgstr "エディタ" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor Behavior" +msgstr "エディタの挙動" + +#. +> trunk5 +#: optiondialog.cpp:892 +#, kde-format +msgid "Tab inserts spaces" +msgstr "タブでスペースを挿入する" + +#. +> trunk5 +#: optiondialog.cpp:895 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"オン: タブを押すと適切な数のスペースが挿入されます。\n" +"オフ: タブ文字が挿入されます。" + +#. +> trunk5 +#: optiondialog.cpp:900 +#, kde-format +msgid "Tab size:" +msgstr "タブサイズ:" + +#. +> trunk5 +#: optiondialog.cpp:906 +#, kde-format +msgid "Auto indentation" +msgstr "自動字下げ" + +#. +> trunk5 +#: optiondialog.cpp:909 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "オン: 新しい改行に前の行の字下げを使います。\n" + +#. +> trunk5 +#: optiondialog.cpp:912 +#, kde-format +msgid "Auto copy selection" +msgstr "選択を自動的にコピーする" + +#. +> trunk5 +#: optiondialog.cpp:915 +#, fuzzy, kde-format +#| msgid "" +#| "On: Any selection is immediately written to the clipboard.\n" +#| "Off: You must explicitely copy e.g. via Ctrl-C." +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" +"オン: すべての選択は直ちにクリップボードに格納されます。\n" +"オフ: Ctrl+C などで明示的にコピーする必要があります。" + +#. +> trunk5 +#: optiondialog.cpp:929 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"編集したファイルの保存時に使用する改行コードを設定します。\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:939 +#, kde-format +msgid "Diff" +msgstr "Diff" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff Settings" +msgstr "Diff の設定" + +# 「...を無視する」オプションの補足説明として括弧内に表示される +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:964 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore numbers (treat as white space)" +msgstr "ホワイトスペースとして扱う" + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"行マッチ時に数字の違いを無視します。(ホワイトスペースの違いを無視に類似)\n" +"数字データファイルを比較する際に有効です。" + +#. +> trunk5 +#: optiondialog.cpp:971 +#, fuzzy, kde-format +#| msgid "Treat C/C++ comments like white space." +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "C/C++ コメントをホワイトスペースとして扱います。" + +#. +> trunk5 +#: optiondialog.cpp:973 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "C/C++ コメントをホワイトスペースとして扱います。" + +# 「...を無視する」オプションの補足説明として括弧内に表示される +#. +> trunk5 +#: optiondialog.cpp:976 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore case (treat as white space)" +msgstr "ホワイトスペースとして扱う" + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" +"大文字と小文字の違いをホワイトスペースの違いと同様に扱います。('a'<=>'A')" + +#. +> trunk5 +#: optiondialog.cpp:982 +#, kde-format +msgid "Preprocessor command:" +msgstr "プリプロセッサコマンド:" + +#. +> trunk5 +#: optiondialog.cpp:986 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "ユーザ定義プリプロセッサ (詳細についてはドキュメントを参照)" + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "行マッチプリプロセッサコマンド:" + +#. +> trunk5 +#: optiondialog.cpp:993 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"このプリプロセッサは行マッチ時にだけ使われます。\n" +"(詳細についてはドキュメントを参照)" + +#. +> trunk5 +#: optiondialog.cpp:996 +#, kde-format +msgid "Try hard (slower)" +msgstr "より小さい差分を見つける (遅い)" + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"外部 diff コマンドについて --minimal オプションを有効にします。\n" +"大きなファイルでは処理速度が非常に遅くなります。" + +#. +> trunk5 +#: optiondialog.cpp:1003 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1018 +#, kde-format +msgid "Merge Settings" +msgstr "マージの設定" + +#. +> trunk5 +#: optiondialog.cpp:1032 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "自動前進の遅延 (ミリ秒):" + +#. +> trunk5 +#: optiondialog.cpp:1037 +#, kde-format +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 "" +"自動前進モードでは、指定した時間 (0-2000 ミリ秒) ごとに自動的に次の衝突に移動" +"します。" + +#. +> trunk5 +#: optiondialog.cpp:1041 +#, kde-format +msgid "Show info dialogs" +msgstr "情報ダイアログを表示" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "ホワイトスペース 2 ファイルマージのデフォルト:" + +#. +> trunk5 +#: optiondialog.cpp:1050 optiondialog.cpp:1062 +#, kde-format +msgid "Manual Choice" +msgstr "手作業で選択" + +#. +> trunk5 +#: optiondialog.cpp:1054 optiondialog.cpp:1067 +#, kde-format +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" +"差異がホワイトスペースのみの場合にマージアルゴリズムが自動的に入力を選択する" +"ようにできます。" + +#. +> trunk5 +#: optiondialog.cpp:1058 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "ホワイトスペース 3 ファイルマージのデフォルト:" + +#. +> trunk5 +#: optiondialog.cpp:1071 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "自動マージの正規表現" + +#. +> trunk5 +#: optiondialog.cpp:1079 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "自動マージの正規表現:" + +#. +> trunk5 +#: optiondialog.cpp:1083 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one " +"source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"KDiff3 に自動的にソースを選択させる行を正規表現で指定します。\n" +"正規表現にマッチした行に衝突がある場合、\n" +"C があれば C が、C がなければ B が選択されます。" + +#. +> trunk5 +#: optiondialog.cpp:1089 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "マージ開始時に正規表現による自動マージを実行する" + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "マージ開始時に正規表現による自動マージを実行します。\n" + +#. +> trunk5 +#: optiondialog.cpp:1096 +#, kde-format +msgid "Version Control History Merging" +msgstr "バージョンコントロール履歴マージ" + +#. +> trunk5 +#: optiondialog.cpp:1104 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "履歴開始の正規表現:" + +#. +> trunk5 +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"バージョンコントロール履歴エントリの開始を正規表現で指定します。\n" +"通常、開始行には \"$Log$\" キーワードが含まれています。\n" +"標準設定の値: \".*\\$Log.*\\$.*\"" + +#. +> trunk5 +#: optiondialog.cpp:1114 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "履歴エントリ開始の正規表現:" + +#. +> trunk5 +#: optiondialog.cpp:1126 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading " +"comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" +"See the documentation for details." +msgstr "" +"バージョンコントロール履歴のエントリは複数の行から成ります。\n" +"その最初の行 (先行するコメントを除く) を検出する正規表現を指定します。\n" +"ソートキーをグループ化するには括弧を使います。\n" +"このフィールドを空のままにしておくと、KDiff3 は空行をエントリの区切りと見なし" +"ます。\n" +"詳細についてはドキュメントを参照してください。" + +#. +> trunk5 +#: optiondialog.cpp:1134 +#, kde-format +msgid "History merge sorting" +msgstr "履歴マージのソート" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "Sort version control history by a key." +msgstr "バージョンコントロール履歴をキーでソートします。" + +#. +> trunk5 +#: optiondialog.cpp:1146 +#, kde-format +msgid "History entry start sort key order:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1150 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history " +"start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1161 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "マージ開始時にバージョン履歴をマージする" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "マージ開始時に自動的にバージョン履歴をマージします。" + +#. +> trunk5 +#: optiondialog.cpp:1167 +#, kde-format +msgid "Max number of history entries:" +msgstr "履歴の最大エントリ数:" + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" +"指定した数以降のエントリは削除されます。数を制限しない場合は -1 に設定してく" +"ださい。" + +#. +> trunk5 +#: optiondialog.cpp:1174 +#, kde-format +msgid "Test your regular expressions" +msgstr "正規表現をテスト" + +#. +> trunk5 +#: optiondialog.cpp:1179 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1183 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1188 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "衝突がなければマージ後に自動的に保存して終了する" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"ファイルマージのために KDiff3 がコマンドラインから起動された場合、\n" +"すべての衝突が自動解決できるときは、自動的に保存して終了します。\n" +"(コマンドラインオプションの --auto に類似)" + +#. +> trunk5 +#: optiondialog.cpp:1202 optiondialog.cpp:1203 +#, kde-format +msgid "Directory" +msgstr "ディレクトリ" + +#. +> trunk5 +#: optiondialog.cpp:1215 +#, kde-format +msgid "Recursive directories" +msgstr "ディレクトリを再帰的に解析する" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "サブディレクトリを解析するかどうかを指定します。" + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "File pattern(s):" +msgstr "ファイルパターン:" + +#. +> trunk5 +#: optiondialog.cpp:1224 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"解析するファイルのパターン。\n" +"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" +"複数のパターンを指定する場合はセミコロン (;) で区切ります。" + +#. +> trunk5 +#: optiondialog.cpp:1229 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "ファイル否定パターン:" + +#. +> trunk5 +#: optiondialog.cpp:1234 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"解析から除外するファイルのパターン。\n" +"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" +"複数のパターンを指定する場合はセミコロン (;) で区切ります。" + +#. +> trunk5 +#: optiondialog.cpp:1239 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "ディレクトリ否定パターン:" + +#. +> trunk5 +#: optiondialog.cpp:1244 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"解析から除外するディレクトリのパターン。\n" +"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" +"複数のパターンを指定する場合はセミコロン (;) で区切ります。" + +#. +> trunk5 +#: optiondialog.cpp:1249 +#, kde-format +msgid "Use .cvsignore" +msgstr ".cvsignore を使う" + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"CVS で無視されるすべてについて否定パターンを拡張します。\n" +"ローカルの ‘.cvsignore’ ファイルによってディレクトリ固有に利用できます。" + +#. +> trunk5 +#: optiondialog.cpp:1256 +#, kde-format +msgid "Find hidden files and directories" +msgstr "隠しファイル/ディレクトリを検索する" + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "隠し属性を持つファイルとディレクトリを検索します。" + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "ドット (.) で始まるファイルとディレクトリを検索します。" + +#. +> trunk5 +#: optiondialog.cpp:1265 +#, kde-format +msgid "Follow file links" +msgstr "ファイルリンクを追跡する" + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"オン: リンク先のファイルを比較します。\n" +"オフ: リンクを比較します。" + +#. +> trunk5 +#: optiondialog.cpp:1272 +#, kde-format +msgid "Follow directory links" +msgstr "ディレクトリリンクを追跡" + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"オン: リンク先のディレクトリを比較します。\n" +"オフ: リンクを比較します。" + +#. +> trunk5 +#: optiondialog.cpp:1290 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "大文字と小文字を区別してファイル名を比較する" + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names " +"match.\n" +"Set this option if the case of the names must match. (Default for Windows is " +"off, otherwise on.)" +msgstr "" +"ディレクトリ比較は名前が一致するファイルおよびディレクトリを比較します。\n" +"名前の大文字/小文字も一致しなければならない場合は、このオプションを有効にして" +"ください。\n" +"(Windows の標準はオフ、その他ではオンです)" + +#. +> trunk5 +#: optiondialog.cpp:1297 +#, fuzzy, kde-format +#| msgid "Unfold All Subdirs" +msgid "Unfold all subdirectories on load" +msgstr "すべてのサブディレクトリを展開" + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1304 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1311 +#, kde-format +msgid "File Comparison Mode" +msgstr "ファイル比較モード" + +#. +> trunk5 +#: optiondialog.cpp:1316 +#, kde-format +msgid "Binary comparison" +msgstr "バイナリ比較" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "それぞれのファイルをバイナリ比較します。(標準)" + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, kde-format +msgid "Full analysis" +msgstr "完全分析" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"完全な比較を実行し、統計情報を別のカラムに表示します。\n" +"(バイナリ比較より遅く、バイナリファイルの場合は非常に時間がかかります)" + +#. +> trunk5 +#: optiondialog.cpp:1325 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "サイズと更新日時を信用する (危険)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"ファイルのサイズと更新日時が等しければ、同一のファイルと見なします。\n" +"内容が同じで更新日時が異なるファイルは、異なるファイルとして示されます。\n" +"大きなディレクトリや遅いネットワークで有用です。" + +#. +> trunk5 +#: optiondialog.cpp:1331 +#, kde-format +msgid "" +"Trust the size and date, but use binary comparison if date does not match " +"(unsafe)" +msgstr "サイズと更新日時を信用し、日時が異なる場合はバイナリ比較する (危険)" + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"ファイルのサイズと更新日時が等しければ、同一のファイルと見なします。\n" +"サイズが同じで日時が異なる場合は、バイナリ比較を行います。\n" +"大きなディレクトリや遅いネットワークで有用です。" + +#. +> trunk5 +#: optiondialog.cpp:1337 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "サイズを信用する (危険)" + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during " +"download." +msgstr "" +"ファイルのサイズが等しければ、同一のファイルと見なします。\n" +"大きなディレクトリやダウンロード中に更新日時が変わってしまうような遅いネット" +"ワークで有用です。" + +#. +> trunk5 +#: optiondialog.cpp:1345 +#, kde-format +msgid "Synchronize directories" +msgstr "ディレクトリを同期する" + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"両方のディレクトリが同じになるようにファイルを配置します。\n" +"方向を指定せずに二つのディレクトリをマージする場合にのみ機能します。" + +#. +> trunk5 +#: optiondialog.cpp:1354 +#, kde-format +msgid "White space differences considered equal" +msgstr "ホワイトスペースの違いを無視する" + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"ファイルの差異がホワイトスペースだけの場合は等しいものと見なします。\n" +"このオプションは完全分析が選択されているときにのみアクティブになります。" + +#. +> trunk5 +#: optiondialog.cpp:1363 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "マージではなく、より新しいものをコピー (危険)" + +#. +> trunk5 +#: optiondialog.cpp:1366 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"内容を調べずに単により新しいファイルを取ります。\n" +"(何をしているのか分かっている場合にのみ使用してください)\n" +"二つのディレクトリを比較しているときのみ有効です。" + +#. +> trunk5 +#: optiondialog.cpp:1371 +#, kde-format +msgid "Backup files (.orig)" +msgstr "バックアップファイル (.orig) を残す" + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"ファイルを上書き保存する際に、‘.orig’ 拡張子を付けて元のファイルを残します。" + +#. +> trunk5 +#: optiondialog.cpp:1450 optiondialog.cpp:1451 +#, kde-format +msgid "Regional Settings" +msgstr "言語の設定" + +#. +> trunk5 +#: optiondialog.cpp:1465 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "すべてに同じエンコーディングを使う:" + +#. +> trunk5 +#: optiondialog.cpp:1468 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"このオプションを有効にすると、最初を変更するだけですべてのエンコーディングを" +"同時に変更できます。\n" +"それぞれに個別に設定する必要がある場合は、無効にしてください。" + +#. +> trunk5 +#: optiondialog.cpp:1472 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "現在のロカールエンコーディング: " + +#. +> trunk5 +#: optiondialog.cpp:1476 +#, kde-format +msgid "File Encoding for A:" +msgstr "A のファイルのエンコーディング:" + +#. +> trunk5 +#: optiondialog.cpp:1482 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as " +"fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"これを有効にすると、Unicode (UTF-16 または UTF-8) を自動検出します。\n" +"ファイルのエンコーディングが Unicode でない場合は、選択されたエンコーディング" +"を使います。\n" +"(Unicode 自動検出はファイルの最初の数バイトを調べます)" + +#. +> trunk5 +#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Unicode 自動検出" + +#. +> trunk5 +#: optiondialog.cpp:1490 +#, kde-format +msgid "File Encoding for B:" +msgstr "B のファイルのエンコーディング:" + +#. +> trunk5 +#: optiondialog.cpp:1499 +#, kde-format +msgid "File Encoding for C:" +msgstr "C のファイルのエンコーディング:" + +#. +> trunk5 +#: optiondialog.cpp:1508 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "マージ出力と保存時のエンコーディング:" + +#. +> trunk5 +#: optiondialog.cpp:1512 +#, kde-format +msgid "Auto Select" +msgstr "自動選択" + +#. +> trunk5 +#: optiondialog.cpp:1515 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for " +"saving." +msgstr "" +"これを有効にすると、入力ファイルのエンコーディングが使われます。\n" +"不確かな場合はダイアログが表示され、保存時のエンコーディングを選択するよう促" +"されます。" + +#. +> trunk5 +#: optiondialog.cpp:1518 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "プリプロセッサファイルのエンコーディング:" + +#. +> trunk5 +#: optiondialog.cpp:1529 +#, kde-format +msgid "Right To Left Language" +msgstr "右から左に読む言語" + +#. +> trunk5 +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"右から左に読む言語で有効にします。\n" +"この設定によってビューアとエディタの表示が変わります。" + +#. +> trunk5 +#: optiondialog.cpp:1542 +#, kde-format +msgid "Integration" +msgstr "統合" + +#. +> trunk5 +#: optiondialog.cpp:1543 +#, kde-format +msgid "Integration Settings" +msgstr "統合の設定" + +#. +> trunk5 +#: optiondialog.cpp:1556 +#, kde-format +msgid "Command line options to ignore:" +msgstr "無視するコマンドラインオプション:" + +#. +> trunk5 +#: optiondialog.cpp:1561 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by " +"other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"KDiff3 が他のツールによって使用されるときに無視すべきコマンドラインオプション" +"のリストです。\n" +"複数のオプションはセミコロン (;) で区切って指定してください。\n" +"これによって \"不明なオプション\" エラーを抑制できます。" + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Quit also via Escape key" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1569 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "" +"現在のトピックだけでなく、すべてのオプションを標準設定にリセットします。" + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"データ消失エラー:\n" +"再現可能であれば、プログラムの作者に連絡してください。\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "深刻な内部エラー" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "プリプロセッサコマンド: " + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "選択された以下のオプションはデータを変えてしまう可能性があります:\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"通常これはマージ中には望ましくないと考えられます。\n" +"これらのオプションを無効にしますか？それともこのままマージを続行しますか？" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "危険なマージオプション" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "このまま続行" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "危険なオプションを無効にする" + +#. +> trunk5 +#: pdiff.cpp:170 +#, kde-format +msgid "Loading A" +msgstr "A を読み込み中" + +#. +> trunk5 +#: pdiff.cpp:177 +#, kde-format +msgid "Errors occurred during pre-processing of file A." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:181 +#, kde-format +msgid "Loading B" +msgstr "B を読み込み中" + +#. +> trunk5 +#: pdiff.cpp:188 +#, kde-format +msgid "Errors occurred during pre-processing of file B." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Diff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Linediff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:223 +#, kde-format +msgid "Loading C" +msgstr "C を読み込み中" + +#. +> trunk5 +#: pdiff.cpp:230 +#, kde-format +msgid "Errors occurred during pre-processing of file C." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Diff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Diff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Linediff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Linediff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:773 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "" +"すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" + +#. +> trunk5 +#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" +"ファイル %1 と %2 のテキストは同じですが、バイナリ的に等しくありません。\n" + +#. +> trunk5 +#: pdiff.cpp:797 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"入力ファイルのいくつかはテキストファイルではないようです。\n" +"KDiff3 のマージはバイナリデータでの使用を想定していません。\n" +"自己責任で続行してください。" + +#. +> trunk5 +#: pdiff.cpp:807 +#, kde-format +msgid ", B" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:809 +#, kde-format +msgid ", C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:811 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1029 +#, kde-format +msgid "Abort" +msgstr "中止" + +#. +> trunk5 +#: pdiff.cpp:1035 pdiff.cpp:1123 +#, kde-format +msgid "Opening files..." +msgstr "ファイルを開いています..." + +#. +> trunk5 +#: pdiff.cpp:1100 pdiff.cpp:1171 +#, kde-format +msgid "File open error" +msgstr "ファイルのオープンエラー" + +#. +> trunk5 +#: pdiff.cpp:1210 +#, kde-format +msgid "Cutting selection..." +msgstr "選択範囲を切り取り..." + +#. +> trunk5 +#: pdiff.cpp:1231 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "選択範囲をクリップボードにコピー..." + +#. +> trunk5 +#: pdiff.cpp:1247 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "クリップボードの内容を挿入..." + +#. +> trunk5 +#: pdiff.cpp:1718 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1719 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1930 +#, kde-format +msgid "Save && Continue" +msgstr "保存/続行" + +#. +> trunk5 +#: pdiff.cpp:1931 +#, kde-format +msgid "Continue Without Saving" +msgstr "保存せずに続行" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search complete." +msgstr "検索が完了しました。" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search Complete" +msgstr "検索完了" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "キャンセル(&C)" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (ベース):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "ファイル..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "ディレクトリ..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (オプション):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "名前を交換/コピー..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "交換 %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "コピー %1->出力" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "交換 %1<->出力" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "出力 (オプション):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "設定..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, fuzzy, kde-format +#| msgid "Directory" +msgid "Open Directory" +msgstr "ディレクトリ" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format +msgid "Select Output File" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "検索テキスト:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "大文字と小文字を区別する" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "A を検索" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "B を検索" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "C を検索" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "出力を検索" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "検索(&S)" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "正規表現テスター" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "自動マージのテスト行:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "自動マージをテストするために、既存のファイルから 1 行コピーします。" + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "マッチ結果:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "履歴開始行の例 (先行するコメントを含めて):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "履歴の開始行を先行するコメントを含めて既存のファイルからコピーします。" + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "履歴ソートキーの順序:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "履歴エントリ開始行の例 (先行するコメントを含めずに):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"履歴エントリの開始行を先行するコメントを含めずに既存のファイルからコピーしま" +"す。" + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "ソートキーの結果:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "マッチ成功" + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "マッチ失敗" + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "正規表現中の左右の括弧が一致していません。" + +#~ msgid "&Merge" +#~ msgstr "マージ(&M)" + +#~ msgid "Line" +#~ msgstr "行" + +#~ msgid "Directory Comparison Status" +#~ msgstr "ディレクトリ比較状態" + +#~ msgid "Number of subdirectories:" +#~ msgstr "サブディレクトリ数:" + +#~ msgid "Number of equal files:" +#~ msgstr "等しいファイルの数:" + +#~ msgid "Number of different files:" +#~ msgstr "異なるファイルの数:" + +#~ msgid "Cancel" +#~ msgstr "キャンセル" + +#~ msgid "Ok" +#~ msgstr "OK" + +#~ msgid "Help" +#~ msgstr "ヘルプ" + +#~ msgid "Defaults" +#~ msgstr "標準設定" + +#~ msgid "&Edit" +#~ msgstr "編集(&E)" + +#~ msgid "&Settings" +#~ msgstr "設定(&S)" + +#~ msgid "&Help" +#~ msgstr "ヘルプ(&H)" + +#~ msgid "&About" +#~ msgstr "情報(&A)" + +#~ msgid "A&uthor" +#~ msgstr "作者(&U)" + +#~ msgid "&Thanks To" +#~ msgstr "&Thanks To" + +#~ msgid "Open" +#~ msgstr "開く" + +#~ msgid "Save" +#~ msgstr "保存" + +#~ msgid "Print..." +#~ msgstr "印刷..." + +#~ msgid "Quit" +#~ msgstr "終了" + +#~ msgid "Cut" +#~ msgstr "切り取り" + +#~ msgid "Copy" +#~ msgstr "コピー" + +#~ msgid "Paste" +#~ msgstr "貼り付け" + +#~ msgid "Select All" +#~ msgstr "すべて選択" + +#~ msgid "Show Toolbar" +#~ msgstr "ツールバーを表示" + +#~ msgid "Show &Status Bar" +#~ msgstr "ステータスバーを表示(&S)" + +#~ msgid "&Configure %1..." +#~ msgstr "%1 を設定(&C)..." + +#~ msgid "About" +#~ msgstr "情報" + +#~ msgid "Find" +#~ msgstr "検索" + +#~ msgid "Find Next" +#~ msgstr "次を検索" + +#~ msgid "Ignore" +#~ msgstr "無視" + +#~ msgid "Exit" +#~ msgstr "終了" + +#~ msgid "Continue" +#~ msgstr "続行" + +#~ msgid "Total number of conflicts: " +#~ msgstr "衝突の総計: " + +#~ msgid "" +#~ "\n" +#~ "Nr of automatically solved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "自動解決された衝突の数: " + +#~ msgid "" +#~ "\n" +#~ "Nr of unsolved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "未解決の衝突の数: " + +#~ msgid "Ignore numbers" +#~ msgstr "数字を無視する" + +#~ msgid "Ignore C/C++ comments" +#~ msgstr "C/C++ コメントを無視する" + +#~ msgid "Ignore case" +#~ msgstr "大文字と小文字の違いを無視する" + +#~ msgid "Language (restart required)" +#~ msgstr "言語 (再スタートが必要)" + +#~ msgid "" +#~ "Choose the language of the GUI strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "GUI の言語を選択するか「自動」を選択します。\n" +#~ "言語の変更を適用するには、KDiff3 を再スタートする必要があります。" + +#~ msgid "kdiff3" +#~ msgstr "kdiff3" + +#~ msgid "&OK" +#~ msgstr "&OK" + +#~ msgid "OK" +#~ msgstr "OK" + +#, fuzzy +#~| msgid "(c) 2002-2009 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "(c) 2002-2009 Joachim Eibl" + +#~ 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" +#~ "mergeResultSaved: m_pMFI=0\n" +#~ "\n" +#~ "再現可能であれば、プログラムの作者に連絡してください。" + +#~ msgid "Program Error" +#~ msgstr "プログラムエラー" + +#~ msgid "Error." +#~ msgstr "エラー" + +#~ msgid "Select Font" +#~ msgstr "フォントを選択" + +#~ 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" +#~ "\n" +#~ "このプログラムは可変幅フォントを適切に扱えないので、\n" +#~ "編集中に問題が発生する可能性があります。\n" +#~ "\n" +#~ "自己責任で続行するか、他のフォントを選択してください。" + +#~ msgid "Incompatible font." +#~ msgstr "非互換なフォント" + +#~ msgid "Continue at my own risk" +#~ msgstr "自己責任で続行" + +#~ msgid "Select another font" +#~ msgstr "他のフォントを選択" + +#~ msgid "Eike Sauer" +#~ msgstr "Eike Sauer" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "バグ修正、Debian パッケージのメンテナ" + +#~ msgid "Sebastien Fricker" +#~ msgstr "Sebastien Fricker" + +#~ msgid "Windows installer" +#~ msgstr "Windows 用インストーラ" + +#~ msgid "Stephan Binner" +#~ msgstr "Stephan Binner" + +#~ msgid "i18n-help" +#~ msgstr "ローカライゼーションに関する手助け" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "Stefan Partheymueller" + +#~ msgid "Clipboard-patch" +#~ msgstr "クリップボードのパッチ" + +#~ msgid "David Faure" +#~ msgstr "David Faure" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "Bernd Gehrmann" + +#~ msgid "Andre Woebbeking" +#~ msgstr "Andre Woebbeking" + +#~ msgid "Michael Denio" +#~ msgstr "Michael Denio" + +#~ msgid "Manfred Koehler" +#~ msgstr "Manfred Koehler" + +#~ msgid "Sergey Zorin" +#~ msgstr "Sergey Zorin" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "Tino Boellsterling, Timothy Mee" + +#~ msgid "Michael Schmidt" +#~ msgstr "Michael Schmidt" + +#~ msgid "Mac support" +#~ msgstr "Mac サポート" + +#~ msgid "Valentin Rusu" +#~ msgstr "Valentin Rusu" + +#~ msgid "KDE4 porting" +#~ msgstr "KDE4 への移植" + +#~ msgid "Albert Astals Cid" +#~ msgstr "Albert Astals Cid" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "バグやアイデアを報告してくれた方々に感謝します。" + +#~ msgid "Italic font for deltas" +#~ msgstr "異なる部分をイタリック体で表示する" + +#~ 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" +#~ "フォントにイタリック体がない場合は、通常のフォントで表示します。" + +#~ msgid "Incompatible Font" +#~ msgstr "非互換なフォント" + +#~ msgid "Continue at Own Risk" +#~ msgstr "自己責任で続行" + +#~ msgid "Select Another Font" +#~ msgstr "他のフォントを選択" + +#, fuzzy +#~| msgid "&Window" +#~ msgid "Dos/Windows" +#~ msgstr "ウィンドウ(&W)" + +#, fuzzy +#~| msgid "Auto Select" +#~ msgid "Autodetect" +#~ msgstr "自動選択" + +#~ msgid "Directory Merge" +#~ msgstr "ディレクトリマージ" Index: trunk/l10n-support/ja/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,105 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2011-05-06 23:50-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, kde-format +msgid "KDiff3..." +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, kde-format +msgid "Compare with..." +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, kde-format +msgid "About KDiff3 menu plugin..." +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, kde-format +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It " +"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " +"the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and " +"choose \"3-way merge with base\" on the other branch which will be used as " +"destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "" Index: trunk/l10n-support/ja/summit/messages/kdereview/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/ja/summit/messages/kdereview/org.kde.kdiff3.appdata.po (nonexistent) +++ trunk/l10n-support/ja/summit/messages/kdereview/org.kde.kdiff3.appdata.po (revision 1522187) @@ -0,0 +1,86 @@ +msgid "" +msgstr "" +"Project-Id-Version: org.kde.kdiff3.appdata\n" +"POT-Creation-Date: 2018-07-11 09:18+0200\n" +"PO-Revision-Date: 2018-02-15 23:14-0800\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. (itstool) path: component/name +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:6 +msgid "KDiff3" +msgstr "" + +#. (itstool) path: component/summary +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:7 +msgid "A File And Directory Comparison And Merge Tool" +msgstr "" + +#. (itstool) path: description/p +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:11 +msgid "KDiff3 is a file and directory diff and merge tool which" +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:13 +msgid "compares and merges two or three text input files or directories," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:14 +msgid "shows the differences line by line and character by character(!)," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:15 +msgid "provides an automatic merge-facility," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:16 +msgid "has an editor for comfortable solving of merge-conflicts," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:17 +msgid "provides network transparency via KIO," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:18 +msgid "has options to highlight or hide changes in white-space or comments," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:19 +msgid "supports Unicode, UTF-8 and other file encodings," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:20 +msgid "prints differences," +msgstr "" + +#. (itstool) path: ul/li +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:21 +msgid "supports version control keyword and history merging." +msgstr "" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4341 +0,0 @@ -# Translation of kdiff3 into Japanese. -# SATOH Satoru , 2004. -# Yukiko Bando , 2008. -# Fumiaki Okushi , 2010. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-07 09:31+0200\n" -"PO-Revision-Date: 2010-10-03 21:09-0700\n" -"Last-Translator: Fumiaki Okushi \n" -"Language-Team: Japanese \n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "SATOH Satoru,Yukiko Bando" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "ss@kde.gr.jp,ybando@k6.dion.ne.jp" - -#. +> trunk5 -#: diff.cpp:258 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" - -#. +> trunk5 -#: diff.cpp:262 -#, kde-format -msgid "From Clipboard" -msgstr "クリップボードから" - -#. +> trunk5 -#: diff.cpp:563 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "" - -#. +> trunk5 -#: diff.cpp:566 -#, kde-format -msgid "Not matching apostrophs." -msgstr "" - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "" - -#. +> trunk5 -#: diff.cpp:595 -#, kde-format -msgid "No program specified." -msgstr "" - -#. +> trunk5 -#: diff.cpp:710 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" - -#. +> trunk5 -#: diff.cpp:757 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" - -#. +> trunk5 -#: diff.cpp:784 -#, kde-format -msgid "File %1 too large to process. Skipping." -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line %2" -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, fuzzy, kde-format -#| msgid "Line not available" -msgid "File %1: Line not available" -msgstr "行がありません" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, kde-format -msgid "Encoding:" -msgstr "エンコーディング:" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 -#, kde-format -msgid "Line end style:" -msgstr "改行コード:" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 -#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 -#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 -#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 -#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 -#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 -#: smalldialogs.cpp:126 smalldialogs.cpp:129 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 -#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 -#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 -#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 -#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 -#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 -#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 -#: smalldialogs.cpp:127 smalldialogs.cpp:130 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 -#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 -#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 -#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 -#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 smalldialogs.cpp:124 -#: smalldialogs.cpp:125 smalldialogs.cpp:128 smalldialogs.cpp:131 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: difftextwindow.cpp:1858 -#, fuzzy, kde-format -#| msgid "A (Base):" -msgid "A (Base)" -msgstr "A (ベース):" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, fuzzy, kde-format -#| msgid "Encoding:" -msgid "Encoding: %1" -msgstr "エンコーディング:" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, fuzzy, kde-format -#| msgid "Line end style:" -msgid "Line end style: %1" -msgstr "改行コード:" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "上部行" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, kde-format -msgid "End" -msgstr "最後" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, fuzzy, kde-format -#| msgid "Opening files..." -msgid "Open File" -msgstr "ファイルを開いています..." - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 ビット" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, kde-format -msgid "Other" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "未解決" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "解決済み" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "ホワイトスペース以外" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "ホワイトスペース" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "A を B にコピー" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "B を A にコピー" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "A を削除" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "B を削除" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "A と B を削除" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "A にマージ" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "B にマージ" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "A と B にマージ" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "(存在すれば) 削除" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "マージ" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "マージ (手作業)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "エラー: ファイルタイプが衝突しています" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "エラー: 日付は同じですが、ファイルは等しくありません。" - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgid "Done." -msgid "Done" -msgstr "完了" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "エラー" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "スキップしました。" - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "未保存" - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "進行中..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, fuzzy, kde-format -msgid "To do." -msgstr "To do." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "名前" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "操作" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "状態" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "リンクと普通のファイルが混在しています。" - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "リンク: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "サイズ" - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "日付とサイズ: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "%1 の一時コピーの作成に失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "%1 を開けませんでした。" - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "ファイルを比較中..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "%1 からの読み込みエラー" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort " -"the merge and rescan the directory?" -msgstr "" -"ディレクトリマージを実行中です。本当にマージを中止し、ディレクトリを再スキャ" -"ンしますか？" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 -#, kde-format -msgid "Warning" -msgstr "警告" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "再スキャン" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1030 -#, kde-format -msgid "Continue Merging" -msgstr "マージを続行" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "ディレクトリを開けませんでした:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "ディレクトリ A ‘%1’ は存在しないか、ディレクトリではありません。\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "ディレクトリ B ‘%1’ は存在しないか、ディレクトリではありません。\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "ディレクトリ C ‘%1’ は存在しないか、ディレクトリではありません。\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "ディレクトリのオープンエラー" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three " -"directories are merged.\n" -"Check again before continuing." -msgstr "" -"3 つのディレクトリをマージする場合、マージ先ディレクトリは A や B と同じで" -"あってはいけません。\n" -"続行する前にもう一度確認してください。" - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "パラメータ警告" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "ディレクトリをスキャン中..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "ディレクトリ A を読み込み中" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "ディレクトリ B を読み込み中" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "ディレクトリ C を読み込み中" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "いくつかのサブディレクトリが読み込み不可でした" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "サブディレクトリのパーミッションを確認してください。" - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 pdiff.cpp:1226 -#: pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 -#, kde-format -msgid "Ready." -msgstr "準備完了。" - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" -msgid "Number of manual merges: %1" -msgstr "手作業でのマージ数:" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "これはすべてのマージ操作に影響します。" - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "すべてのマージ操作を更新中" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgid "Processing " -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "処理中" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "この操作は今はできません。" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "操作不可" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "コピー中にエラーが発生しました。\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "マージエラー" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "不明なマージ操作 (これは起きてはならないことです)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "不明なマージ操作です。" - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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" -"\n" -"このプログラムはまだベータ段階で何が起きても無保証だということに注意してくだ" -"さい!重要なデータはバックアップを取ってください!" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "マージ開始" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "実行" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "試行" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "" -"The highlighted item has a different type in the different directories. " -"Select what to do." -msgstr "" -"強調表示された項目はディレクトリによってタイプが違います。どうするか選択して" -"ください。" - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "" -"The modification dates of the file are equal but the files are not. Select " -"what to do." -msgstr "" -"ファイルの更新日時は同じですが、ファイルは等しくありません。どうするか選択し" -"てください。" - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "" -"The highlighted item was changed in one directory and deleted in the other. " -"Select what to do." -msgstr "" -"強調表示された項目は一方のディレクトリで変更され、他方のディレクトリで削除さ" -"れました。どうするか選択してください。" - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "" -"This operation is currently not possible because directory merge is " -"currently running." -msgstr "ディレクトリマージ中なのでこの操作を実行することはできません。" - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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" -"エラーを起した項目について続行しますか？それともスキップしますか？" - -# @title:window? -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "エラー後のマージ続行" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "最後の項目について続行" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "項目をスキップ" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "マージ操作が完了しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "マージ完了" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." -msgstr "マージ試行完了: この操作をしてもよいか確認してください。" - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "" -"エラーが発生しました。詳細情報を見るには「OK」をクリックしてください。\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "エラー: %1 の削除中にバックアップファイルを作成できませんでした。" - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "再帰的にディレクトリを削除 (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "削除 (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "エラー: ディレクトリの削除がディレクトリの読み込み中に失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "エラー: ディレクトリの削除 (%1) に失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "エラー: 削除に失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "手作業でのマージ (%1, %2, %3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid "" -" Note: After a manual merge the user should continue by pressing F7." -msgstr "【注】 手作業でのマージ後に続行するには F7 を押してください。" - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"エラー: コピー (%1 -> %2) に失敗しました。既存のコピー先を削除できませんでし" -"た。" - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "リンクをコピー (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "エラー: リンクのコピーに失敗しました。リモートリンクは未サポートです。" - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "エラー: リンクのコピーに失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "コピー (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "名前変更 (%1 -> %2) 中にエラー: 既存のコピー先を削除できません。" - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "名前変更 (%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "エラー: 名前変更に失敗しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" -"ディレクトリの作成 (%1) 中にエラーが発生しました。既存のファイルを削除できま" -"せん。" - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "ディレクトリを作成 (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "ディレクトリの作成中にエラーが発生しました。" - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "先" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "ディレクトリ" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "タイプ" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "サイズ" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "属性" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "最終更新" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "リンク先" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "ファイル" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -#| msgid "Link: " -msgid "-Link" -msgstr "リンク: " - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "利用不可" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (先): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (元): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (先): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (先): " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "先: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "ディレクトリマージの状態を保存..." - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "ディレクトリマージを開始/続行" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "現在の項目について操作を実行" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "選択ファイルを比較 " - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "現在のファイルをマージ " - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"ファイル\n" -"をマージ" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "すべてのサブディレクトリをたたむ" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "すべてのサブディレクトリを展開" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "すべての項目について A を選択" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "すべての項目について B を選択" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "すべての項目について C を選択" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "すべての項目について自動選択" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "すべての項目について操作なし" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "等しいファイルを表示" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"等しい\n" -"ファイル" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "異なるファイルを表示" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "A にのみ存在するファイルを表示" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"A にのみ存在\n" -"するファイル" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "B にのみ存在するファイルを表示" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"B にのみ存在\n" -"するファイル" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "C にのみ存在するファイルを表示" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"C にのみ存在\n" -"するファイル" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "明示的に選択したファイルを比較" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "明示的に選択したファイルをマージ" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "何もしない" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "A と B を削除" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "A と B にマージ" - -#. +> trunk5 -#: fileaccess.cpp:885 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"バックアップの作成中に古いバックアップを削除できませんでした。\n" -"ファイル名: " - -#. +> trunk5 -#: fileaccess.cpp:892 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"バックアップの作成中に名前変更に失敗しました。\n" -"ファイル名: " - -#. +> trunk5 -#: fileaccess.cpp:916 -#, kde-format -msgid "Getting file status: %1" -msgstr "ファイルの状態を取得中: %1" - -#. +> trunk5 -#: fileaccess.cpp:958 -#, kde-format -msgid "Reading file: %1" -msgstr "ファイルを読み込み中: %1" - -#. +> trunk5 -#: fileaccess.cpp:996 -#, kde-format -msgid "Writing file: %1" -msgstr "ファイルに書き込み中: %1" - -#. +> trunk5 -#: fileaccess.cpp:1029 -#, kde-format -msgid "Out of memory" -msgstr "メモリが足りません" - -#. +> trunk5 -#: fileaccess.cpp:1064 -#, kde-format -msgid "Making directory: %1" -msgstr "ディレクトリを作成中: %1" - -#. +> trunk5 -#: fileaccess.cpp:1084 -#, kde-format -msgid "Removing directory: %1" -msgstr "ディレクトリを削除中: %1" - -#. +> trunk5 -#: fileaccess.cpp:1099 -#, kde-format -msgid "Removing file: %1" -msgstr "ファイルを削除中: %1" - -#. +> trunk5 -#: fileaccess.cpp:1115 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "シンボリックリンクを作成中: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1143 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "ファイル名を変更中: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1175 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "ファイルをコピー中: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1189 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: " -"%1" -msgstr "" -"ファイルコピー中にエラー: ファイルを読み込みのために開けませんでした。ファイ" -"ル名: %1" - -#. +> trunk5 -#: fileaccess.cpp:1195 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: " -"%1" -msgstr "" -"ファイルコピー中にエラー: ファイルを書き込みのために開けませんでした。ファイ" -"ル名: %1" - -#. +> trunk5 -#: fileaccess.cpp:1207 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "ファイルコピー中にエラー: 読み込みに失敗しました。ファイル名: %1" - -#. +> trunk5 -#: fileaccess.cpp:1216 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "ファイルコピー中にエラー: 書き込みに失敗しました。ファイル名: %1" - -#. +> trunk5 -#: fileaccess.cpp:1499 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "ディレクトリを読み込み中: " - -#. +> trunk5 -#: fileaccess.cpp:1618 -#, kde-format -msgid "Listing directory: %1" -msgstr "ディレクトリの内容一覧を作成中: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "現在の設定:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "設定オプションのエラー:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "" -"オプション --auto を使用していますが、出力ファイルが指定されていません。" - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "オプション --auto はディレクトリ比較時には無視されます。" - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "保存に失敗しました。" - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 -#, kde-format -msgid "Opening of these files failed:" -msgstr "以下のファイルを開けませんでした:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "ファイルのオープンエラー" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "比較のために文書を開きます..." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "再読み込み" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "マージ結果を保存します。すべての衝突を解決しなければなりません。" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "現在の文書を別名で保存します..." - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "差異を印刷します" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "アプリケーションを終了します" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "選択範囲を切り取り、クリップボードに格納します" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "選択範囲をコピーし、クリップボードに格納します" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, fuzzy, kde-format -#| msgid "Pastes the clipboard contents to actual position" -msgid "Pastes the clipboard contents to current position" -msgstr "クリップボードの内容を現在の位置に貼り付けます" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "現在のウィンドウのすべてを選択します" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "文字列を検索します" - -# StatusTip for FindNext -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "文字列の次のマッチを検索します" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "ステータスバーの表示/非表示を切り替えます" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "KDiff3 を設定..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "現在の異なる部分に移動" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"現在の\n" -"異なる部分" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "最初の異なる部分に移動" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"最初の\n" -"異なる部分" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "最後の異なる部分に移動" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"最後の\n" -"異なる部分" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" -"(ホワイトスペースの表示が無効なときはホワイトスペースの差異をスキップする)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "" -"(Does not skip white space differences even when \"Show White Space\" is " -"disabled.)" -msgstr "" -"(ホワイトスペースの表示が無効なときもホワイトスペースの差異をスキップしない)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "前の異なる部分に移動" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"前の\n" -"異なる部分" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "次の異なる部分に移動" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"次の\n" -"異なる部分" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "前の衝突に移動" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"前の\n" -"衝突" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "次の衝突に移動" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"次の\n" -"衝突" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "前の未解決の衝突に移動" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"前の\n" -"未解決" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "次の未解決の衝突に移動" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"次の\n" -"未解決" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "A からの選択行" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"選択\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "B からの選択行" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"選択\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "C からの選択行" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"選択\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "ソース選択後に自動的に次の未解決の衝突に移動" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "自動" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "スペースとタブ文字を表示" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"ホワイト\n" -"スペース文字" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "ホワイトスペースを表示" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"ホワイト\n" -"スペース" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "行番号を表示" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "行番号" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "常に A を選択" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "常に B を選択" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "常に C を選択" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "未解決の衝突について常に A を選択" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "未解決の衝突について常に B を選択" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "未解決の衝突について常に C を選択" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "未解決のホワイトスペースの衝突について常に A を選択" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "未解決のホワイトスペースの衝突について常に B を選択" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "未解決のホワイトスペースの衝突について常に C を選択" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "単純な衝突を自動的に解決" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "異なる部分を衝突として設定" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "正規表現による自動マージを実行" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "履歴の衝突を自動的に解決" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "選択した差異を分離" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "選択した差異を結合" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "ウィンドウ A を表示" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "ウィンドウ B を表示" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "ウィンドウ C を表示" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "すべて比較 (標準)" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "A と B を比較" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "A と C を比較" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "B と C を比較" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Diff ウィンドウで行を折り返す" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "次のウィンドウにフォーカス" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "前のウィンドウにフォーカス" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "分割方向を切り替え" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "ディレクトリ/テキスト分割画面表示" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "ディレクトリ表示/テキスト表示を切り替え" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1928 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "マージ結果は保存されていません。" - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "保存/終了" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "保存せずに終了" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1939 -#, kde-format -msgid "Saving the merge result failed." -msgstr "マージ結果の保存に失敗しました。" - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1027 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "ディレクトリマージを実行中です。本当に中止しますか？" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "ファイルを保存中..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "名前を付けてファイルを保存中..." - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "名前を付けて保存..." - -#. +> trunk5 -#: kdiff3.cpp:815 -#, fuzzy, kde-format -#| msgid "Printing completed." -msgid "Printing not implemented." -msgstr "印刷完了。" - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "印刷中..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -#| msgid "Selection" -msgid " (Selection)" -msgstr "選択" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "印刷完了。" - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "印刷中止。" - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "終了中..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "ツールバーの表示/非表示を切り替え中..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "ステータスバーの表示/非表示を切り替え中..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "比較するファイルを見つけることができませんでした。" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "KDiff3(&K)" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "KDiff3 を設定" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:113 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, fuzzy, kde-format -#| msgid "" -#| "Could not initialize the KDiff part.\n" -#| "This usually happens due to an installation problem. Please read the " -#| "README-file in the source package for details." -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-" -"file in the source package for details." -msgstr "" -"KDiff part を初期化できませんでした。\n" -"普通これはインストールの問題です。詳細についてはソースパッケージの README " -"ファイルを参照してください。" - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "ファイル(&F)" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "ディレクトリ(&D)" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "現在の項目のマージ操作" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "現在の項目の同期操作" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" -msgid "M&ovement" -msgstr "移動(&M)" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "Diff ビュー(&I)" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" -msgid "M&erge" -msgstr "マージ" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "ウィンドウ(&W)" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "メインツールバー" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "" - -#. +> trunk5 -#: main.cpp:117 -#, kde-format -msgid " (64 bit)" -msgstr "" - -#. +> trunk5 -#: main.cpp:119 -#, kde-format -msgid " (32 bit)" -msgstr "" - -#. +> trunk5 -#: main.cpp:120 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "ファイルとディレクトリを比較/マージするためのツール" - -#. +> trunk5 -#: main.cpp:121 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Merge the input." -msgstr "入力をマージ" - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "明示的にベースファイルを指定 (一部のツールとの互換性のため)" - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "出力ファイルを指定。暗示的に -m を指定。例: -o newfile.txt" - -#. +> trunk5 -#: main.cpp:143 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "出力ファイルを指定 (一部のツールとの互換性のため)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "すべての衝突を自動解決できる場合は GUI を使用しない (-o file が必要)" - -#. +> trunk5 -#: main.cpp:145 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Do not solve conflicts automatically." -msgstr "衝突を自動解決しない (互換性のため)" - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "入力ファイル 1 (ベース) の代替表示名" - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "入力ファイル 2 の代替表示名" - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "入力ファイル 3 の代替表示名" - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "代替表示名。一度設定するとすべての入力に適用されます。" - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "" -"Override a config setting. Use once for every setting. E.g.: --cs " -"\"AutoAdvance=1\"" -msgstr "" - -#. +> trunk5 -#: main.cpp:151 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "設定項目と現在の値を一覧表示" - -#. +> trunk5 -#: main.cpp:152 -#, kde-format -msgid "Use a different config file." -msgstr "使用する設定ファイルを指定" - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "開く file1 (ベース, --base が未指定の場合)" - -#. +> trunk5 -#: main.cpp:156 -#, kde-format -msgid "file2 to open" -msgstr "開く file2" - -#. +> trunk5 -#: main.cpp:157 -#, kde-format -msgid "file3 to open" -msgstr "開く file3" - -#. +> trunk5 -#: main.cpp:168 -#, kde-format -msgid "See kdiff3 --help for supported options." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "未解決の衝突の数: %1 (内 %2 はホワイトスペース)" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"出力が更新されました。\n" -"続行すると更新内容は失われます。" - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:771 -#, kde-format -msgid "All input files are binary equal." -msgstr "すべての入力ファイルはバイナリ的に同じです。" - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "すべての入力ファイルのテキストは同じです。" - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "ファイル %1 と %2 はバイナリ的に同じです。\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "ファイル %1 と %2 のテキストは同じです。\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, kde-format -msgid "Conflicts" -msgstr "衝突" - -#. +> trunk5 -#: mergeresultwindow.cpp:1840 -#, kde-format -msgid "" -msgstr "<ソース行なし>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 -#, kde-format -msgid "" -msgstr "<マージ衝突 (ホワイトスペースのみ)>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 -#, kde-format -msgid "" -msgstr "<マージ衝突>" - -#. +> trunk5 -#: mergeresultwindow.cpp:2934 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"未解決の衝突がまだ残っています。\n" -"ファイルは保存されていません。\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 -#, kde-format -msgid "Conflicts Left" -msgstr "未解決の衝突があります" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, kde-format -msgid "" -"There is a line end style conflict. Please choose the line end style " -"manually.\n" -"File not saved." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"バックアップファイルの作成に失敗しました。ファイルは保存されていません。" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 -#, kde-format -msgid "File Save Error" -msgstr "ファイルの保存エラー" - -#. +> trunk5 -#: mergeresultwindow.cpp:3005 -#, kde-format -msgid "Error while writing." -msgstr "書き込み中にエラーが発生しました。" - -#. +> trunk5 -#: mergeresultwindow.cpp:3365 -#, fuzzy, kde-format -#| msgid "Output" -msgid "Output:" -msgstr "出力" - -#. +> trunk5 -#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 -#, kde-format -msgid "[Modified]" -msgstr "[更新]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3384 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "保存時のエンコーディング" - -#. +> trunk5 -#: mergeresultwindow.cpp:3484 -#, kde-format -msgid "Conflict" -msgstr "衝突" - -#. +> trunk5 -#: mergeresultwindow.cpp:3516 -#, kde-format -msgid "Codec from A: %1" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:3518 -#, kde-format -msgid "Codec from B: %1" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:3520 -#, kde-format -msgid "Codec from C: %1" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "ASCII 以外の文字が適切に表示されなければ、これを変更してください。" - -#. +> trunk5 -#: optiondialog.cpp:613 -#, kde-format -msgid "Configure" -msgstr "設定" - -#. +> trunk5 -#: optiondialog.cpp:690 -#, kde-format -msgid "Font" -msgstr "フォント" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "エディタ/Diff 出力のフォント" - -#. +> trunk5 -#: optiondialog.cpp:710 -#, kde-format -msgid "Application font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:714 -#, fuzzy, kde-format -#| msgid "File Save Error" -msgid "File view font" -msgstr "ファイルの保存エラー" - -#. +> trunk5 -#: optiondialog.cpp:732 -#, kde-format -msgid "Color" -msgstr "色" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Colors Settings" -msgstr "色の設定" - -#. +> trunk5 -#: optiondialog.cpp:750 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "エディタ/Diff ビュー:" - -#. +> trunk5 -#: optiondialog.cpp:758 -#, kde-format -msgid "Foreground color:" -msgstr "前景色:" - -#. +> trunk5 -#: optiondialog.cpp:765 -#, kde-format -msgid "Background color:" -msgstr "背景色:" - -#. +> trunk5 -#: optiondialog.cpp:774 -#, kde-format -msgid "Diff background color:" -msgstr "Diff 背景色:" - -#. +> trunk5 -#: optiondialog.cpp:782 -#, kde-format -msgid "Color A:" -msgstr "色 (A):" - -#. +> trunk5 -#: optiondialog.cpp:790 -#, kde-format -msgid "Color B:" -msgstr "色 (B):" - -#. +> trunk5 -#: optiondialog.cpp:798 -#, kde-format -msgid "Color C:" -msgstr "色 (C):" - -#. +> trunk5 -#: optiondialog.cpp:805 -#, kde-format -msgid "Conflict color:" -msgstr "色 (衝突):" - -#. +> trunk5 -#: optiondialog.cpp:813 -#, kde-format -msgid "Current range background color:" -msgstr "現在の範囲の背景色:" - -#. +> trunk5 -#: optiondialog.cpp:821 -#, kde-format -msgid "Current range diff background color:" -msgstr "現在の範囲の diff 背景色:" - -#. +> trunk5 -#: optiondialog.cpp:828 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:834 -#, kde-format -msgid "Directory Comparison View:" -msgstr "ディレクトリ比較ビュー:" - -#. +> trunk5 -#: optiondialog.cpp:840 -#, kde-format -msgid "Newest file color:" -msgstr "最も新しいファイルの色:" - -#. +> trunk5 -#: optiondialog.cpp:844 -#, kde-format -msgid "" -"Changing this color will only be effective when starting the next directory " -"comparison." -msgstr "色の変更は次回ディレクトリ比較を開始したときに有効になります。" - -#. +> trunk5 -#: optiondialog.cpp:849 -#, kde-format -msgid "Oldest file color:" -msgstr "最も古いファイルの色:" - -#. +> trunk5 -#: optiondialog.cpp:857 -#, kde-format -msgid "Middle age file color:" -msgstr "中間のファイルの色:" - -#. +> trunk5 -#: optiondialog.cpp:865 -#, kde-format -msgid "Color for missing files:" -msgstr "欠落したファイルの色:" - -#. +> trunk5 -#: optiondialog.cpp:878 -#, kde-format -msgid "Editor" -msgstr "エディタ" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor Behavior" -msgstr "エディタの挙動" - -#. +> trunk5 -#: optiondialog.cpp:892 -#, kde-format -msgid "Tab inserts spaces" -msgstr "タブでスペースを挿入する" - -#. +> trunk5 -#: optiondialog.cpp:895 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"オン: タブを押すと適切な数のスペースが挿入されます。\n" -"オフ: タブ文字が挿入されます。" - -#. +> trunk5 -#: optiondialog.cpp:900 -#, kde-format -msgid "Tab size:" -msgstr "タブサイズ:" - -#. +> trunk5 -#: optiondialog.cpp:906 -#, kde-format -msgid "Auto indentation" -msgstr "自動字下げ" - -#. +> trunk5 -#: optiondialog.cpp:909 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "オン: 新しい改行に前の行の字下げを使います。\n" - -#. +> trunk5 -#: optiondialog.cpp:912 -#, kde-format -msgid "Auto copy selection" -msgstr "選択を自動的にコピーする" - -#. +> trunk5 -#: optiondialog.cpp:915 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" -"オン: すべての選択は直ちにクリップボードに格納されます。\n" -"オフ: Ctrl+C などで明示的にコピーする必要があります。" - -#. +> trunk5 -#: optiondialog.cpp:929 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"編集したファイルの保存時に使用する改行コードを設定します。\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:939 -#, kde-format -msgid "Diff" -msgstr "Diff" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff Settings" -msgstr "Diff の設定" - -# 「...を無視する」オプションの補足説明として括弧内に表示される -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:964 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore numbers (treat as white space)" -msgstr "ホワイトスペースとして扱う" - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore " -"white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"行マッチ時に数字の違いを無視します。(ホワイトスペースの違いを無視に類似)\n" -"数字データファイルを比較する際に有効です。" - -#. +> trunk5 -#: optiondialog.cpp:971 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "C/C++ コメントをホワイトスペースとして扱います。" - -#. +> trunk5 -#: optiondialog.cpp:973 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "C/C++ コメントをホワイトスペースとして扱います。" - -# 「...を無視する」オプションの補足説明として括弧内に表示される -#. +> trunk5 -#: optiondialog.cpp:976 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore case (treat as white space)" -msgstr "ホワイトスペースとして扱う" - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" -"大文字と小文字の違いをホワイトスペースの違いと同様に扱います。('a'<=>'A')" - -#. +> trunk5 -#: optiondialog.cpp:982 -#, kde-format -msgid "Preprocessor command:" -msgstr "プリプロセッサコマンド:" - -#. +> trunk5 -#: optiondialog.cpp:986 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "ユーザ定義プリプロセッサ (詳細についてはドキュメントを参照)" - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "行マッチプリプロセッサコマンド:" - -#. +> trunk5 -#: optiondialog.cpp:993 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"このプリプロセッサは行マッチ時にだけ使われます。\n" -"(詳細についてはドキュメントを参照)" - -#. +> trunk5 -#: optiondialog.cpp:996 -#, kde-format -msgid "Try hard (slower)" -msgstr "より小さい差分を見つける (遅い)" - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"外部 diff コマンドについて --minimal オプションを有効にします。\n" -"大きなファイルでは処理速度が非常に遅くなります。" - -#. +> trunk5 -#: optiondialog.cpp:1003 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1018 -#, kde-format -msgid "Merge Settings" -msgstr "マージの設定" - -#. +> trunk5 -#: optiondialog.cpp:1032 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "自動前進の遅延 (ミリ秒):" - -#. +> trunk5 -#: optiondialog.cpp:1037 -#, kde-format -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 "" -"自動前進モードでは、指定した時間 (0-2000 ミリ秒) ごとに自動的に次の衝突に移動" -"します。" - -#. +> trunk5 -#: optiondialog.cpp:1041 -#, kde-format -msgid "Show info dialogs" -msgstr "情報ダイアログを表示" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "ホワイトスペース 2 ファイルマージのデフォルト:" - -#. +> trunk5 -#: optiondialog.cpp:1050 optiondialog.cpp:1062 -#, kde-format -msgid "Manual Choice" -msgstr "手作業で選択" - -#. +> trunk5 -#: optiondialog.cpp:1054 optiondialog.cpp:1067 -#, kde-format -msgid "" -"Allow the merge algorithm to automatically select an input for white-space-" -"only changes." -msgstr "" -"差異がホワイトスペースのみの場合にマージアルゴリズムが自動的に入力を選択する" -"ようにできます。" - -#. +> trunk5 -#: optiondialog.cpp:1058 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "ホワイトスペース 3 ファイルマージのデフォルト:" - -#. +> trunk5 -#: optiondialog.cpp:1071 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "自動マージの正規表現" - -#. +> trunk5 -#: optiondialog.cpp:1079 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "自動マージの正規表現:" - -#. +> trunk5 -#: optiondialog.cpp:1083 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one " -"source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"KDiff3 に自動的にソースを選択させる行を正規表現で指定します。\n" -"正規表現にマッチした行に衝突がある場合、\n" -"C があれば C が、C がなければ B が選択されます。" - -#. +> trunk5 -#: optiondialog.cpp:1089 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "マージ開始時に正規表現による自動マージを実行する" - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "マージ開始時に正規表現による自動マージを実行します。\n" - -#. +> trunk5 -#: optiondialog.cpp:1096 -#, kde-format -msgid "Version Control History Merging" -msgstr "バージョンコントロール履歴マージ" - -#. +> trunk5 -#: optiondialog.cpp:1104 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "履歴開始の正規表現:" - -#. +> trunk5 -#: optiondialog.cpp:1108 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"バージョンコントロール履歴エントリの開始を正規表現で指定します。\n" -"通常、開始行には \"$Log$\" キーワードが含まれています。\n" -"標準設定の値: \".*\\$Log.*\\$.*\"" - -#. +> trunk5 -#: optiondialog.cpp:1114 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "履歴エントリ開始の正規表現:" - -#. +> trunk5 -#: optiondialog.cpp:1126 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading " -"comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history " -"entries.\n" -"See the documentation for details." -msgstr "" -"バージョンコントロール履歴のエントリは複数の行から成ります。\n" -"その最初の行 (先行するコメントを除く) を検出する正規表現を指定します。\n" -"ソートキーをグループ化するには括弧を使います。\n" -"このフィールドを空のままにしておくと、KDiff3 は空行をエントリの区切りと見なし" -"ます。\n" -"詳細についてはドキュメントを参照してください。" - -#. +> trunk5 -#: optiondialog.cpp:1134 -#, kde-format -msgid "History merge sorting" -msgstr "履歴マージのソート" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "Sort version control history by a key." -msgstr "バージョンコントロール履歴をキーでソートします。" - -#. +> trunk5 -#: optiondialog.cpp:1146 -#, kde-format -msgid "History entry start sort key order:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1150 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history " -"start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1161 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "マージ開始時にバージョン履歴をマージする" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "マージ開始時に自動的にバージョン履歴をマージします。" - -#. +> trunk5 -#: optiondialog.cpp:1167 -#, kde-format -msgid "Max number of history entries:" -msgstr "履歴の最大エントリ数:" - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "" -"指定した数以降のエントリは削除されます。数を制限しない場合は -1 に設定してく" -"ださい。" - -#. +> trunk5 -#: optiondialog.cpp:1174 -#, kde-format -msgid "Test your regular expressions" -msgstr "正規表現をテスト" - -#. +> trunk5 -#: optiondialog.cpp:1179 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1183 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1188 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "衝突がなければマージ後に自動的に保存して終了する" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and " -"quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"ファイルマージのために KDiff3 がコマンドラインから起動された場合、\n" -"すべての衝突が自動解決できるときは、自動的に保存して終了します。\n" -"(コマンドラインオプションの --auto に類似)" - -#. +> trunk5 -#: optiondialog.cpp:1202 optiondialog.cpp:1203 -#, kde-format -msgid "Directory" -msgstr "ディレクトリ" - -#. +> trunk5 -#: optiondialog.cpp:1215 -#, kde-format -msgid "Recursive directories" -msgstr "ディレクトリを再帰的に解析する" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "サブディレクトリを解析するかどうかを指定します。" - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "File pattern(s):" -msgstr "ファイルパターン:" - -#. +> trunk5 -#: optiondialog.cpp:1224 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"解析するファイルのパターン。\n" -"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" -"複数のパターンを指定する場合はセミコロン (;) で区切ります。" - -#. +> trunk5 -#: optiondialog.cpp:1229 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "ファイル否定パターン:" - -#. +> trunk5 -#: optiondialog.cpp:1234 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"解析から除外するファイルのパターン。\n" -"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" -"複数のパターンを指定する場合はセミコロン (;) で区切ります。" - -#. +> trunk5 -#: optiondialog.cpp:1239 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "ディレクトリ否定パターン:" - -#. +> trunk5 -#: optiondialog.cpp:1244 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"解析から除外するディレクトリのパターン。\n" -"ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" -"複数のパターンを指定する場合はセミコロン (;) で区切ります。" - -#. +> trunk5 -#: optiondialog.cpp:1249 -#, kde-format -msgid "Use .cvsignore" -msgstr ".cvsignore を使う" - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"CVS で無視されるすべてについて否定パターンを拡張します。\n" -"ローカルの ‘.cvsignore’ ファイルによってディレクトリ固有に利用できます。" - -#. +> trunk5 -#: optiondialog.cpp:1256 -#, kde-format -msgid "Find hidden files and directories" -msgstr "隠しファイル/ディレクトリを検索する" - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "隠し属性を持つファイルとディレクトリを検索します。" - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "ドット (.) で始まるファイルとディレクトリを検索します。" - -#. +> trunk5 -#: optiondialog.cpp:1265 -#, kde-format -msgid "Follow file links" -msgstr "ファイルリンクを追跡する" - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"オン: リンク先のファイルを比較します。\n" -"オフ: リンクを比較します。" - -#. +> trunk5 -#: optiondialog.cpp:1272 -#, kde-format -msgid "Follow directory links" -msgstr "ディレクトリリンクを追跡" - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"オン: リンク先のディレクトリを比較します。\n" -"オフ: リンクを比較します。" - -#. +> trunk5 -#: optiondialog.cpp:1290 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "大文字と小文字を区別してファイル名を比較する" - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names " -"match.\n" -"Set this option if the case of the names must match. (Default for Windows is " -"off, otherwise on.)" -msgstr "" -"ディレクトリ比較は名前が一致するファイルおよびディレクトリを比較します。\n" -"名前の大文字/小文字も一致しなければならない場合は、このオプションを有効にして" -"ください。\n" -"(Windows の標準はオフ、その他ではオンです)" - -#. +> trunk5 -#: optiondialog.cpp:1297 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" -msgid "Unfold all subdirectories on load" -msgstr "すべてのサブディレクトリを展開" - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1304 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1311 -#, kde-format -msgid "File Comparison Mode" -msgstr "ファイル比較モード" - -#. +> trunk5 -#: optiondialog.cpp:1316 -#, kde-format -msgid "Binary comparison" -msgstr "バイナリ比較" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "それぞれのファイルをバイナリ比較します。(標準)" - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, kde-format -msgid "Full analysis" -msgstr "完全分析" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"完全な比較を実行し、統計情報を別のカラムに表示します。\n" -"(バイナリ比較より遅く、バイナリファイルの場合は非常に時間がかかります)" - -#. +> trunk5 -#: optiondialog.cpp:1325 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "サイズと更新日時を信用する (危険)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"Files with equal contents but different modification dates will appear as " -"different.\n" -"Useful for big directories or slow networks." -msgstr "" -"ファイルのサイズと更新日時が等しければ、同一のファイルと見なします。\n" -"内容が同じで更新日時が異なるファイルは、異なるファイルとして示されます。\n" -"大きなディレクトリや遅いネットワークで有用です。" - -#. +> trunk5 -#: optiondialog.cpp:1331 -#, kde-format -msgid "" -"Trust the size and date, but use binary comparison if date does not match " -"(unsafe)" -msgstr "サイズと更新日時を信用し、日時が異なる場合はバイナリ比較する (危険)" - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"ファイルのサイズと更新日時が等しければ、同一のファイルと見なします。\n" -"サイズが同じで日時が異なる場合は、バイナリ比較を行います。\n" -"大きなディレクトリや遅いネットワークで有用です。" - -#. +> trunk5 -#: optiondialog.cpp:1337 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "サイズを信用する (危険)" - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during " -"download." -msgstr "" -"ファイルのサイズが等しければ、同一のファイルと見なします。\n" -"大きなディレクトリやダウンロード中に更新日時が変わってしまうような遅いネット" -"ワークで有用です。" - -#. +> trunk5 -#: optiondialog.cpp:1345 -#, kde-format -msgid "Synchronize directories" -msgstr "ディレクトリを同期する" - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"両方のディレクトリが同じになるようにファイルを配置します。\n" -"方向を指定せずに二つのディレクトリをマージする場合にのみ機能します。" - -#. +> trunk5 -#: optiondialog.cpp:1354 -#, kde-format -msgid "White space differences considered equal" -msgstr "ホワイトスペースの違いを無視する" - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"ファイルの差異がホワイトスペースだけの場合は等しいものと見なします。\n" -"このオプションは完全分析が選択されているときにのみアクティブになります。" - -#. +> trunk5 -#: optiondialog.cpp:1363 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "マージではなく、より新しいものをコピー (危険)" - -#. +> trunk5 -#: optiondialog.cpp:1366 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"内容を調べずに単により新しいファイルを取ります。\n" -"(何をしているのか分かっている場合にのみ使用してください)\n" -"二つのディレクトリを比較しているときのみ有効です。" - -#. +> trunk5 -#: optiondialog.cpp:1371 -#, kde-format -msgid "Backup files (.orig)" -msgstr "バックアップファイル (.orig) を残す" - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"ファイルを上書き保存する際に、‘.orig’ 拡張子を付けて元のファイルを残します。" - -#. +> trunk5 -#: optiondialog.cpp:1450 optiondialog.cpp:1451 -#, kde-format -msgid "Regional Settings" -msgstr "言語の設定" - -#. +> trunk5 -#: optiondialog.cpp:1465 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "すべてに同じエンコーディングを使う:" - -#. +> trunk5 -#: optiondialog.cpp:1468 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"このオプションを有効にすると、最初を変更するだけですべてのエンコーディングを" -"同時に変更できます。\n" -"それぞれに個別に設定する必要がある場合は、無効にしてください。" - -#. +> trunk5 -#: optiondialog.cpp:1472 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "現在のロカールエンコーディング: " - -#. +> trunk5 -#: optiondialog.cpp:1476 -#, kde-format -msgid "File Encoding for A:" -msgstr "A のファイルのエンコーディング:" - -#. +> trunk5 -#: optiondialog.cpp:1482 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"これを有効にすると、Unicode (UTF-16 または UTF-8) を自動検出します。\n" -"ファイルのエンコーディングが Unicode でない場合は、選択されたエンコーディング" -"を使います。\n" -"(Unicode 自動検出はファイルの最初の数バイトを調べます)" - -#. +> trunk5 -#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Unicode 自動検出" - -#. +> trunk5 -#: optiondialog.cpp:1490 -#, kde-format -msgid "File Encoding for B:" -msgstr "B のファイルのエンコーディング:" - -#. +> trunk5 -#: optiondialog.cpp:1499 -#, kde-format -msgid "File Encoding for C:" -msgstr "C のファイルのエンコーディング:" - -#. +> trunk5 -#: optiondialog.cpp:1508 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "マージ出力と保存時のエンコーディング:" - -#. +> trunk5 -#: optiondialog.cpp:1512 -#, kde-format -msgid "Auto Select" -msgstr "自動選択" - -#. +> trunk5 -#: optiondialog.cpp:1515 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for " -"saving." -msgstr "" -"これを有効にすると、入力ファイルのエンコーディングが使われます。\n" -"不確かな場合はダイアログが表示され、保存時のエンコーディングを選択するよう促" -"されます。" - -#. +> trunk5 -#: optiondialog.cpp:1518 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "プリプロセッサファイルのエンコーディング:" - -#. +> trunk5 -#: optiondialog.cpp:1529 -#, kde-format -msgid "Right To Left Language" -msgstr "右から左に読む言語" - -#. +> trunk5 -#: optiondialog.cpp:1532 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"右から左に読む言語で有効にします。\n" -"この設定によってビューアとエディタの表示が変わります。" - -#. +> trunk5 -#: optiondialog.cpp:1542 -#, kde-format -msgid "Integration" -msgstr "統合" - -#. +> trunk5 -#: optiondialog.cpp:1543 -#, kde-format -msgid "Integration Settings" -msgstr "統合の設定" - -#. +> trunk5 -#: optiondialog.cpp:1556 -#, kde-format -msgid "Command line options to ignore:" -msgstr "無視するコマンドラインオプション:" - -#. +> trunk5 -#: optiondialog.cpp:1561 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by " -"other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"KDiff3 が他のツールによって使用されるときに無視すべきコマンドラインオプション" -"のリストです。\n" -"複数のオプションはセミコロン (;) で区切って指定してください。\n" -"これによって \"不明なオプション\" エラーを抑制できます。" - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Quit also via Escape key" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1569 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1653 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "" -"現在のトピックだけでなく、すべてのオプションを標準設定にリセットします。" - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"データ消失エラー:\n" -"再現可能であれば、プログラムの作者に連絡してください。\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "深刻な内部エラー" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "プリプロセッサコマンド: " - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "選択された以下のオプションはデータを変えてしまう可能性があります:\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"通常これはマージ中には望ましくないと考えられます。\n" -"これらのオプションを無効にしますか？それともこのままマージを続行しますか？" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "危険なマージオプション" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "このまま続行" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "危険なオプションを無効にする" - -#. +> trunk5 -#: pdiff.cpp:170 -#, kde-format -msgid "Loading A" -msgstr "A を読み込み中" - -#. +> trunk5 -#: pdiff.cpp:177 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:181 -#, kde-format -msgid "Loading B" -msgstr "B を読み込み中" - -#. +> trunk5 -#: pdiff.cpp:188 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Linediff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:223 -#, kde-format -msgid "Loading C" -msgstr "C を読み込み中" - -#. +> trunk5 -#: pdiff.cpp:230 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Linediff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Linediff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:773 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "" -"すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" - -#. +> trunk5 -#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"ファイル %1 と %2 のテキストは同じですが、バイナリ的に等しくありません。\n" - -#. +> trunk5 -#: pdiff.cpp:797 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"入力ファイルのいくつかはテキストファイルではないようです。\n" -"KDiff3 のマージはバイナリデータでの使用を想定していません。\n" -"自己責任で続行してください。" - -#. +> trunk5 -#: pdiff.cpp:807 -#, kde-format -msgid ", B" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:809 -#, kde-format -msgid ", C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:811 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1029 -#, kde-format -msgid "Abort" -msgstr "中止" - -#. +> trunk5 -#: pdiff.cpp:1035 pdiff.cpp:1123 -#, kde-format -msgid "Opening files..." -msgstr "ファイルを開いています..." - -#. +> trunk5 -#: pdiff.cpp:1100 pdiff.cpp:1171 -#, kde-format -msgid "File open error" -msgstr "ファイルのオープンエラー" - -#. +> trunk5 -#: pdiff.cpp:1210 -#, kde-format -msgid "Cutting selection..." -msgstr "選択範囲を切り取り..." - -#. +> trunk5 -#: pdiff.cpp:1231 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "選択範囲をクリップボードにコピー..." - -#. +> trunk5 -#: pdiff.cpp:1247 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "クリップボードの内容を挿入..." - -#. +> trunk5 -#: pdiff.cpp:1718 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1719 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1930 -#, kde-format -msgid "Save && Continue" -msgstr "保存/続行" - -#. +> trunk5 -#: pdiff.cpp:1931 -#, kde-format -msgid "Continue Without Saving" -msgstr "保存せずに続行" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search complete." -msgstr "検索が完了しました。" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search Complete" -msgstr "検索完了" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "キャンセル(&C)" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (ベース):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "ファイル..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "ディレクトリ..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (オプション):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "名前を交換/コピー..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "交換 %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "コピー %1->出力" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "交換 %1<->出力" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "出力 (オプション):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "設定..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, fuzzy, kde-format -#| msgid "Directory" -msgid "Open Directory" -msgstr "ディレクトリ" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "検索テキスト:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "大文字と小文字を区別する" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "A を検索" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "B を検索" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "C を検索" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "出力を検索" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "検索(&S)" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "正規表現テスター" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "自動マージのテスト行:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "自動マージをテストするために、既存のファイルから 1 行コピーします。" - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "マッチ結果:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "履歴開始行の例 (先行するコメントを含めて):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "履歴の開始行を先行するコメントを含めて既存のファイルからコピーします。" - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "履歴ソートキーの順序:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "履歴エントリ開始行の例 (先行するコメントを含めずに):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"履歴エントリの開始行を先行するコメントを含めずに既存のファイルからコピーしま" -"す。" - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "ソートキーの結果:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "マッチ成功" - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "マッチ失敗" - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "正規表現中の左右の括弧が一致していません。" - -#~ msgid "&Merge" -#~ msgstr "マージ(&M)" - -#~ msgid "Line" -#~ msgstr "行" - -#~ msgid "Directory Comparison Status" -#~ msgstr "ディレクトリ比較状態" - -#~ msgid "Number of subdirectories:" -#~ msgstr "サブディレクトリ数:" - -#~ msgid "Number of equal files:" -#~ msgstr "等しいファイルの数:" - -#~ msgid "Number of different files:" -#~ msgstr "異なるファイルの数:" - -#~ msgid "Cancel" -#~ msgstr "キャンセル" - -#~ msgid "Ok" -#~ msgstr "OK" - -#~ msgid "Help" -#~ msgstr "ヘルプ" - -#~ msgid "Defaults" -#~ msgstr "標準設定" - -#~ msgid "&Edit" -#~ msgstr "編集(&E)" - -#~ msgid "&Settings" -#~ msgstr "設定(&S)" - -#~ msgid "&Help" -#~ msgstr "ヘルプ(&H)" - -#~ msgid "&About" -#~ msgstr "情報(&A)" - -#~ msgid "A&uthor" -#~ msgstr "作者(&U)" - -#~ msgid "&Thanks To" -#~ msgstr "&Thanks To" - -#~ msgid "Open" -#~ msgstr "開く" - -#~ msgid "Save" -#~ msgstr "保存" - -#~ msgid "Print..." -#~ msgstr "印刷..." - -#~ msgid "Quit" -#~ msgstr "終了" - -#~ msgid "Cut" -#~ msgstr "切り取り" - -#~ msgid "Copy" -#~ msgstr "コピー" - -#~ msgid "Paste" -#~ msgstr "貼り付け" - -#~ msgid "Select All" -#~ msgstr "すべて選択" - -#~ msgid "Show Toolbar" -#~ msgstr "ツールバーを表示" - -#~ msgid "Show &Status Bar" -#~ msgstr "ステータスバーを表示(&S)" - -#~ msgid "&Configure %1..." -#~ msgstr "%1 を設定(&C)..." - -#~ msgid "About" -#~ msgstr "情報" - -#~ msgid "Find" -#~ msgstr "検索" - -#~ msgid "Find Next" -#~ msgstr "次を検索" - -#~ msgid "Ignore" -#~ msgstr "無視" - -#~ msgid "Exit" -#~ msgstr "終了" - -#~ msgid "Continue" -#~ msgstr "続行" - -#~ msgid "Total number of conflicts: " -#~ msgstr "衝突の総計: " - -#~ msgid "" -#~ "\n" -#~ "Nr of automatically solved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "自動解決された衝突の数: " - -#~ msgid "" -#~ "\n" -#~ "Nr of unsolved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "未解決の衝突の数: " - -#~ msgid "Ignore numbers" -#~ msgstr "数字を無視する" - -#~ msgid "Ignore C/C++ comments" -#~ msgstr "C/C++ コメントを無視する" - -#~ msgid "Ignore case" -#~ msgstr "大文字と小文字の違いを無視する" - -#~ msgid "Language (restart required)" -#~ msgstr "言語 (再スタートが必要)" - -#~ msgid "" -#~ "Choose the language of the GUI strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "GUI の言語を選択するか「自動」を選択します。\n" -#~ "言語の変更を適用するには、KDiff3 を再スタートする必要があります。" - -#~ msgid "kdiff3" -#~ msgstr "kdiff3" - -#~ msgid "&OK" -#~ msgstr "&OK" - -#~ msgid "OK" -#~ msgstr "OK" - -#, fuzzy -#~| msgid "(c) 2002-2009 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "(c) 2002-2009 Joachim Eibl" - -#~ 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" -#~ "mergeResultSaved: m_pMFI=0\n" -#~ "\n" -#~ "再現可能であれば、プログラムの作者に連絡してください。" - -#~ msgid "Program Error" -#~ msgstr "プログラムエラー" - -#~ msgid "Error." -#~ msgstr "エラー" - -#~ msgid "Select Font" -#~ msgstr "フォントを選択" - -#~ 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" -#~ "\n" -#~ "このプログラムは可変幅フォントを適切に扱えないので、\n" -#~ "編集中に問題が発生する可能性があります。\n" -#~ "\n" -#~ "自己責任で続行するか、他のフォントを選択してください。" - -#~ msgid "Incompatible font." -#~ msgstr "非互換なフォント" - -#~ msgid "Continue at my own risk" -#~ msgstr "自己責任で続行" - -#~ msgid "Select another font" -#~ msgstr "他のフォントを選択" - -#~ msgid "Eike Sauer" -#~ msgstr "Eike Sauer" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "バグ修正、Debian パッケージのメンテナ" - -#~ msgid "Sebastien Fricker" -#~ msgstr "Sebastien Fricker" - -#~ msgid "Windows installer" -#~ msgstr "Windows 用インストーラ" - -#~ msgid "Stephan Binner" -#~ msgstr "Stephan Binner" - -#~ msgid "i18n-help" -#~ msgstr "ローカライゼーションに関する手助け" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "Stefan Partheymueller" - -#~ msgid "Clipboard-patch" -#~ msgstr "クリップボードのパッチ" - -#~ msgid "David Faure" -#~ msgstr "David Faure" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "Bernd Gehrmann" - -#~ msgid "Andre Woebbeking" -#~ msgstr "Andre Woebbeking" - -#~ msgid "Michael Denio" -#~ msgstr "Michael Denio" - -#~ msgid "Manfred Koehler" -#~ msgstr "Manfred Koehler" - -#~ msgid "Sergey Zorin" -#~ msgstr "Sergey Zorin" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "Tino Boellsterling, Timothy Mee" - -#~ msgid "Michael Schmidt" -#~ msgstr "Michael Schmidt" - -#~ msgid "Mac support" -#~ msgstr "Mac サポート" - -#~ msgid "Valentin Rusu" -#~ msgstr "Valentin Rusu" - -#~ msgid "KDE4 porting" -#~ msgstr "KDE4 への移植" - -#~ msgid "Albert Astals Cid" -#~ msgstr "Albert Astals Cid" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "バグやアイデアを報告してくれた方々に感謝します。" - -#~ msgid "Italic font for deltas" -#~ msgstr "異なる部分をイタリック体で表示する" - -#~ 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" -#~ "フォントにイタリック体がない場合は、通常のフォントで表示します。" - -#~ msgid "Incompatible Font" -#~ msgstr "非互換なフォント" - -#~ msgid "Continue at Own Risk" -#~ msgstr "自己責任で続行" - -#~ msgid "Select Another Font" -#~ msgstr "他のフォントを選択" - -#, fuzzy -#~| msgid "&Window" -#~ msgid "Dos/Windows" -#~ msgstr "ウィンドウ(&W)" - -#, fuzzy -#~| msgid "Auto Select" -#~ msgid "Autodetect" -#~ msgstr "自動選択" - -#~ msgid "Directory Merge" -#~ msgstr "ディレクトリマージ" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,57 +0,0 @@ -# Translation of desktop_extragear-utils_kdiff3 into Japanese. -# Yukiko Bando , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2008-09-27 13:16+0900\n" -"Last-Translator: Yukiko Bando \n" -"Language-Team: Japanese \n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Diff/Patch フロントエンド" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "ファイルやディレクトリの比較/マージを行うツール" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "KDiff3 でファイルやディレクトリを比較/マージ" - -#, fuzzy -#~| msgctxt "Name" -#~| msgid "KDiff3" -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "KDiff3" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "ファイルやディレクトリを比較/マージ" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._json_.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._json_.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3._json_.po (nonexistent) @@ -1,21 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: json files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2018-02-24 15:01-0800\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,105 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2011-05-06 23:50-0700\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, kde-format -msgid "KDiff3..." -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, kde-format -msgid "Compare with..." -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, kde-format -msgid "About KDiff3 menu plugin..." -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, kde-format -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It " -"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " -"the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and " -"choose \"3-way merge with base\" on the other branch which will be used as " -"destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (nonexistent) @@ -1,86 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: org.kde.kdiff3.appdata\n" -"POT-Creation-Date: 2018-07-11 09:18+0200\n" -"PO-Revision-Date: 2018-02-15 23:14-0800\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. (itstool) path: component/name -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:6 -msgid "KDiff3" -msgstr "" - -#. (itstool) path: component/summary -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:7 -msgid "A File And Directory Comparison And Merge Tool" -msgstr "" - -#. (itstool) path: description/p -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:11 -msgid "KDiff3 is a file and directory diff and merge tool which" -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:13 -msgid "compares and merges two or three text input files or directories," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:14 -msgid "shows the differences line by line and character by character(!)," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:15 -msgid "provides an automatic merge-facility," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:16 -msgid "has an editor for comfortable solving of merge-conflicts," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:17 -msgid "provides network transparency via KIO," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:18 -msgid "has options to highlight or hide changes in white-space or comments," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:19 -msgid "supports Unicode, UTF-8 and other file encodings," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:20 -msgid "prints differences," -msgstr "" - -#. (itstool) path: ul/li -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:21 -msgid "supports version control keyword and history merging." -msgstr "" Index: trunk/l10n-support/ja/summit/messages/playground-devtools/diff_ext.po =================================================================== --- trunk/l10n-support/ja/summit/messages/playground-devtools/diff_ext.po (revision 1522186) +++ trunk/l10n-support/ja/summit/messages/playground-devtools/diff_ext.po (nonexistent) @@ -1,159 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-06 07:33+0200\n" -"PO-Revision-Date: 2018-08-07 21:05-0700\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: diff_ext.cpp:391 -#, kde-format -msgid "Compare with %1" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:392 -#, kde-format -msgid "Merge with %1" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:408 -#, kde-format -msgid "3-way merge with base" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:411 -#, kde-format -msgid "Save '%1' for later" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:426 -#, kde-format -msgid "Compare with ..." -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:429 -#, kde-format -msgid "Clear list" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:434 -#, kde-format -msgid "Compare" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:438 -#, kde-format -msgid "3 way comparison" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:444 -#, kde-format -msgid "About Diff-Ext ..." -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:515 -#, kde-format -msgid "(32 Bit)" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:518 -#, kde-format -msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:519 -#, kde-format -msgid "This software is distributable under the BSD-2-Clause license.\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:520 -#, kde-format -msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:521 -#, kde-format -msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:522 -#, kde-format -msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:523 -#, kde-format -msgid "About Diff-Ext for KDiff3 " -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:552 -#, kde-format -msgid "Compare selected files" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:558 diff_ext.cpp:578 -#, kde-format -msgid "Compare '%1' with '%2'" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:564 -#, kde-format -msgid "Save '%1' for later operation" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:620 -#, kde-format -msgid "Could not start KDiff3. Please rerun KDiff3 installation." -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:621 -#, kde-format -msgid "Command" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:622 -#, kde-format -msgid "CommandLine" -msgstr "" - -#. +> trunk5 -#: diff_ext.cpp:623 -#, kde-format -msgid "Diff-Ext For KDiff3" -msgstr "" Index: trunk/l10n-support/ko/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/ko/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/ko/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,50 @@ +# Shinjo Park , 2014. +msgid "" +msgstr "" +"Project-Id-Version: desktop files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2014-03-03 03:59+0900\n" +"Last-Translator: Shinjo Park \n" +"Language-Team: Korean \n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch 프론트엔드" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "파일과 디렉터리 비교 및 병합 도구" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다" + +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "KDiff3" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "파일과 디렉터리를 비교하거나 병합" Index: trunk/l10n-support/ko/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/ko/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/ko/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4314 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Shinjo Park , 2014, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-13 08:57+0200\n" +"PO-Revision-Date: 2015-01-18 01:02+0900\n" +"Last-Translator: Shinjo Park \n" +"Language-Team: Korean \n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 1.5\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Shinjo Park" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "kde@peremen.name" + +#. +> trunk5 +#: diff.cpp:259 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "클립보드 데이터를 임시 파일로 저장할 수 없습니다." + +#. +> trunk5 +#: diff.cpp:263 +#, kde-format +msgid "From Clipboard" +msgstr "클립보드에서" + +#. +> trunk5 +#: diff.cpp:556 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "닫는 따옴표 다음에 공백이 나올 것을 예상했습니다." + +#. +> trunk5 +#: diff.cpp:559 +#, kde-format +msgid "Not matching apostrophs." +msgstr "따옴표가 일치하지 않습니다." + +#. +> trunk5 +#: diff.cpp:581 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "인자 내에 예상하지 못한 따옴표가 있습니다." + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "No program specified." +msgstr "프로그램을 지정하지 않았습니다." + +#. +> trunk5 +#: diff.cpp:712 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"전처리가 실패한 것 같습니다. 다음 명령을 확인하십시오:\n" +"\n" +" %1\n" +"\n" +"전처리 명령을 비활성화합니다." + +#. +> trunk5 +#: diff.cpp:760 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"줄 일치 전처리가 실패한 것 같습니다. 다음 명령을 확인하십시오:\n" +"\n" +" %1\n" +"\n" +"줄 일치 전처리 명령을 비활성화합니다." + +#. +> trunk5 +#: difftextwindow.cpp:413 +#, kde-format +msgid "File %1: Line %2" +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:415 +#, fuzzy, kde-format +#| msgid "Line not available" +msgid "File %1: Line not available" +msgstr "줄을 사용할 수 없음" + +#. +> trunk5 +#: difftextwindow.cpp:1911 +#, kde-format +msgid "Encoding:" +msgstr "인코딩:" + +#. +> trunk5 +#: difftextwindow.cpp:1913 mergeresultwindow.cpp:3374 optiondialog.cpp:920 +#, kde-format +msgid "Line end style:" +msgstr "줄 끝 스타일:" + +#. +> trunk5 +#: difftextwindow.cpp:1943 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Encoding: %1" +msgstr "인코딩:" + +#. +> trunk5 +#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3419 +#, kde-format +msgid "Unix" +msgstr "유닉스" + +#. +> trunk5 +#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3420 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1944 +#, fuzzy, kde-format +#| msgid "Line end style:" +msgid "Line end style: %1" +msgstr "줄 끝 스타일:" + +#. +> trunk5 +#: difftextwindow.cpp:1966 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "맨 첫 줄" + +#. +> trunk5 +#: difftextwindow.cpp:1976 +#, kde-format +msgid "End" +msgstr "끝" + +#. +> trunk5 +#: difftextwindow.cpp:2051 smalldialogs.cpp:234 +#, fuzzy, kde-format +#| msgid "Opening files..." +msgid "Open File" +msgstr "파일 여는 중..." + +#. +> trunk5 +#: difftextwindow.cpp:2099 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "유니코드, 8비트" + +#. +> trunk5 +#: difftextwindow.cpp:2114 +#, kde-format +msgid "Other" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "해결되지 않음" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "해결됨" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "공백 아님" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "공백" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "A를 B로 복사" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "B를 A로 복사" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "A 삭제" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "B 삭제" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "A와 B 삭제" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "A로 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "B로 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "A와 B로 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "삭제(존재하는 경우)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1018 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "합치기(수동)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "오류: 일치하지 않는 파일 형식" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "오류: 변경 및 삭제됨" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "오류: 날짜가 일치하지만 파일이 일치하지 않습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgid "Done." +msgid "Done" +msgstr "완료." + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "오류" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "건너뜀." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "저장되지 않음." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "진행 중..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "할 일입니다." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "이름" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "작업" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "상태" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "링크와 일반 파일의 혼합입니다." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "링크: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "크기: " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "날짜와 크기: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "%1의 임시 복사본을 만들 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "%1을(를) 열 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "파일 비교 중..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "%1에서 읽는 중 오류 발생" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" +"디렉터리를 합치고 있습니다. 합치기 작업을 중단하고 디렉터리를 다시 탐색하시겠" +"습니까?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:342 pdiff.cpp:1033 pdiff.cpp:1924 pdiff.cpp:1934 +#, kde-format +msgid "Warning" +msgstr "경고" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "재탐색" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1035 +#, kde-format +msgid "Continue Merging" +msgstr "계속 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "디렉터리를 열 수 없음:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "디렉터리 A \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "디렉터리 B \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "디렉터리 C \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "디렉터리 열기 오류" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +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" +"계속하기 전에 확인하십시오." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "인자 경고" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "디렉터리 검사 중..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "디렉터리 A 읽는 중" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "디렉터리 B 읽는 중" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "디렉터리 C 읽는 중" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "다음의 일부 하위 디렉터리를 읽을 수 없음:" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "하위 디렉터리의 권한을 확인하십시오" + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1114 pdiff.cpp:1186 pdiff.cpp:1231 +#: pdiff.cpp:1247 pdiff.cpp:1290 pdiff.cpp:1312 +#, kde-format +msgid "Ready." +msgstr "준비." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of manual merges:" +msgid "Number of manual merges: %1" +msgstr "수동 합침 개수:" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "모든 합치기 동작에 영향을 줍니다." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "모든 합치기 동작 변경 중" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgid "Processing " +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "처리 중 " + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "이 작업을 진행할 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "작업을 진행할 수 없음" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "복사하는 중 오류가 발생했습니다.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "합치기 오류" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "알 수 없는 합치기 작업.(일어나서는 안 됨!)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "알 수 없는 합치기 작업." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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" +"이 프로그램은 베타 상태에 있으며 데이터 손실에 대하여 책임지지 않습니다! 중요" +"한 데이터는 백업 후 시작하십시오!" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "합치기 시작" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "진행" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "시뮬레이션" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" +"강조한 항목은 다른 디렉터리에서 서로 다른 형식을 가지고 있습니다. 할 일을 선" +"택하십시오." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"파일의 수정한 날짜가 일치하지만 파일이 일치하지 않습니다. 할 일을 선택하십시" +"오." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "" +"The highlighted item was changed in one directory and deleted in the other. " +"Select what to do." +msgstr "" +"강조한 항목은 한 쪽 디렉터리에서 변경되었고 다른 쪽에서 삭제되었습니다. 할 일" +"을 선택하십시오." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "" +"This operation is currently not possible because directory merge is " +"currently running." +msgstr "디렉터리 합치기 작업이 진행 중이므로 이 작업을 사용할 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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" +"오류가 발생한 항목에서 계속 진행하시겠습니까? 아니면 이 항목을 건너뛰겠습니" +"까?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "오류 발생 후 합치기 계속 진행" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "마지막 항목에서 진행" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "항목 건너뛰기" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "합치기 작업 완료." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "합치기 완료됨" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "" +"Simulated merge complete: Check if you agree with the proposed operations." +msgstr "합치기 시뮬레이션 완료됨: 제안하는 변경 사항이 올바르면 선택하십시오." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "오류가 발생했습니다. 확인을 누르면 자세한 정보를 볼 수 있습니다.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "%1 삭제 중 오류: 백업을 만들 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "디렉터리를 재귀적으로 삭제(%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "삭제(%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "오류: 디렉터리를 삭제하기 위해서 읽는 중 오류가 발생했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "오류: rmdir(%1) 작업이 실패했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "오류: 삭제 작업이 실패했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "수동 합치기(%1, %2, %3 -> %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid "" +" Note: After a manual merge the user should continue by pressing F7." +msgstr " 메모: 수동 합치기 이후 계속 진행하려면 F7 키를 누르십시오." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"오류: copy(%1 -> %2) 작업이 실패했습니다. 존재하는 대상을 삭제할 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copyLink( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "오류: copyLink 작업이 실패했습니다. 원격 링크는 지원하지 않습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "오류: copyLink 작업이 실패했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "copy( %1 -> %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" +"rename(%1 -> %2) 작업 중 오류 발생: 존재하는 대상을 삭제할 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "rename(%1 -> %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "오류: 이름 변경이 실패했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" +"makeDir %1 작업 중 오류가 발생했습니다. 존재하는 파일은 삭제할 수 없습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "makeDir(%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "디렉터리를 만드는 중 오류가 발생했습니다." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "대상" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "디렉터리" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "종류" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "크기" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "속성" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "마지막 수정" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "링크 대상" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "사용할 수 없음" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (대상): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (기반): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (대상): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (대상): " + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "대상: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "디렉터리 합치기 상태를 다른 이름으로 저장..." + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "디렉터리 합치기 시작/계속 진행" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "현재 항목의 작업 실행" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "선택한 파일 비교" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "현재 파일 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"파일\n" +"합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "모든 하위 디렉터리 접기" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "모든 하위 디렉터리 풀기" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "모든 항목에서 A 선택" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "모든 항목에서 B 선택" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "모든 항목에서 C 선택" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "모든 항목에서 작업 자동 선택" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "모든 항목에서 작업 진행하지 않음" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "같은 파일 보이기" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"같은\n" +"파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "다른 파일 보이기" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "A에만 있는 파일 보이기" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"A에만 있는\n" +"파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "B에만 있는 파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"B에만 있는\n" +"파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "C에만 있는 파일 보이기" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"C에만 있는\n" +"파일" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "명시적으로 선택한 파일만 비교" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "명시적으로 선택한 파일만 합치기" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "아무것도 하지 않음" + +#. +> trunk5 +#: directorymergewindow.cpp:3660 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: directorymergewindow.cpp:3661 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: directorymergewindow.cpp:3662 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "A와 B 삭제" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "A와 B로 합치기" + +#. +> trunk5 +#: fileaccess.cpp:948 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" +"파일 이름: " + +#. +> trunk5 +#: fileaccess.cpp:955 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" +"파일 이름: " + +#. +> trunk5 +#: fileaccess.cpp:979 +#, kde-format +msgid "Getting file status: %1" +msgstr "파일 상태 가져오는 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1021 +#, kde-format +msgid "Reading file: %1" +msgstr "파일 읽는 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1059 +#, kde-format +msgid "Writing file: %1" +msgstr "파일에 쓰는 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1087 +#, kde-format +msgid "Out of memory" +msgstr "메모리 부족" + +#. +> trunk5 +#: fileaccess.cpp:1122 +#, kde-format +msgid "Making directory: %1" +msgstr "디렉터리 만드는 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1142 +#, kde-format +msgid "Removing directory: %1" +msgstr "디렉터리 삭제 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1157 +#, kde-format +msgid "Removing file: %1" +msgstr "파일 삭제 중: %1" + +#. +> trunk5 +#: fileaccess.cpp:1173 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "심볼릭 링크 만드는 중: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1201 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "파일 이름 변경 중: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1233 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "파일 복사 중: %1 -> %2" + +#. +> trunk5 +#: fileaccess.cpp:1247 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" +msgstr "파일 복사 작업 오류: 파일을 읽기 위해 열 수 없습니다. 파일 이름: %1" + +#. +> trunk5 +#: fileaccess.cpp:1253 +#, kde-format +msgid "" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" +msgstr "파일 복사 작업 오류: 파일에 쓰기 위해 열 수 없습니다. 파일 이름: %1" + +#. +> trunk5 +#: fileaccess.cpp:1265 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "파일 복사 작업 오류: 읽기 오류. 파일 이름: %1" + +#. +> trunk5 +#: fileaccess.cpp:1274 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "파일 복사 작업 오류: 쓰기 오류. 파일 이름: %1" + +#. +> trunk5 +#: fileaccess.cpp:1557 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "디렉터리 읽는 중: " + +#. +> trunk5 +#: fileaccess.cpp:1678 +#, kde-format +msgid "Listing directory: %1" +msgstr "디렉터리 항목 가져오는 중: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "현재 설정:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "설정 옵션 오류:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "--auto 옵션을 지정했지만 출력 파일을 지정하지 않았습니다." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "디렉터리 비교 시 --auto 옵션을 무시합니다." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "저장 실패." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1096 pdiff.cpp:1167 +#, kde-format +msgid "Opening of these files failed:" +msgstr "다음 파일을 여는 데 실패했습니다:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "파일 열기 오류" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "비교할 문서 열기..." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "새로 고침" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "합친 결과를 저장합니다. 모든 충돌 사항을 해결해야 합니다!" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "현재 문서를 다른 이름으로 저장..." + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "차이점 인쇄" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "프로그램 종료" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "선택한 부분을 잘라내고 클립보드에 저장" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "선택한 부분을 클립보드에 복사" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "현재 위치에 클립보드 내용 붙여넣기" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "현재 창의 모든 내용 선택" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "문자열 찾기" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "문자열 다시 찾기" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "상태 표시줄 보이기/숨기기" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "KDiff3 설정..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "현재 차이점으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"현재\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "첫 차이점으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"첫\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "마지막 차이점으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"마지막\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(\"공백 문자 표시\" 설정을 사용하지 않으면 공백을 건너뜁니다.)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "" +"(Does not skip white space differences even when \"Show White Space\" is " +"disabled.)" +msgstr "(\"공백 문자 표시\" 설정을 사용하지 않아도 공백을 건너뛰지 않습니다.)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "이전 차이점으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"이전\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "다음 차이점으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"다음\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "이전 충돌 항목으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"이전\n" +"충돌" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "다음 충돌 항목으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"다음\n" +"충돌" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "이전 해결하지 않은 충돌 항목으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"이전\n" +"미해결" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "다음 해결하지 않은 충돌 항목으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"다음\n" +"미해결" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "A에서 줄 선택" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"A\n" +"선택" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "B에서 줄 선택" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"B\n" +"선택" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "C에서 줄 선택" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"C\n" +"선택" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "원본 선택 후 자동으로 해결되지 않은 충돌 항목으로 이동" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"자동\n" +"다음" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters for Differences" +msgid "Show Space && Tabulator Characters" +msgstr "공백 및 탭 문자 차이점 보기" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"공백\n" +"문자" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "공백 문자 표시" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"공백\n" +"차이점" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "줄 번호 표시" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"줄\n" +"번호" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "항상 A 선택" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "항상 B 선택" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "항상 C 선택" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "모든 해결하지 않은 충돌 항목에서 A 선택" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "모든 해결하지 않은 충돌 항목에서 B 선택" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "모든 해결하지 않은 충돌 항목에서 C 선택" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 A 선택" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 B 선택" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 C 선택" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "간단한 충돌 자동으로 해결" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "충돌 항목의 차이점 설정" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "정규 표현식 자동 합치기 실행" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "과거에 해결했던 충돌 자동으로 해결" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "선택 항목에서 차이점 나누기" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "선택한 변경 사항 합치기" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "창 A 표시" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "창 B 표시" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "창 C 표시" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "일반 요약 보기" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "A 대 B 요약 보기" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "A 대 C 요약 보기" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "B 대 C 요약 보기" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "차이점 창 워드랩 사용" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "수동 Diff 정렬 추가" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "모든 수동 Diff 정렬 삭제" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "다음 창에 초점 맞추기" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "이전 창에 초점 맞추기" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "나누기 방향 전환" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "디렉터리와 텍스트로 화면 나누어 보기" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "디렉터리와 텍스트 보기 간 전환" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1923 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "합친 결과를 저장하지 않았습니다." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "저장하고 끝내기" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "저장하지 않고 끝내기" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1934 +#, kde-format +msgid "Saving the merge result failed." +msgstr "합친 결과를 저장할 수 없습니다." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1032 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "디렉터리를 합치고 있습니다. 이대로 중단하시겠습니까?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "파일 저장하는 중..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "새 파일이름으로 파일 저장하는 중..." + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "다른 이름으로 저장..." + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "인쇄는 구현되지 않았습니다." + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "인쇄 중..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +#| msgid "Selection" +msgid " (Selection)" +msgstr "선택" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "인쇄가 완료되었습니다." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "인쇄가 중단되었습니다." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "종료 중..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "도구 모음 전환 중..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "상태 표시줄 전환 중..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "비교할 파일을 찾을 수 없습니다." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "KDiff3(&K)" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "KDiff3 설정" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:112 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" +"KDiff3 부분을 초기화할 수 없습니다.\n" +"설치 문제일 수도 있습니다. 원본 코드 패키지의 README 파일을 참고하십시오." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "파일(&F)" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "디렉터리(&D)" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "현재 항목 합치기 작업" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "현재 항목 동기화 작업" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, kde-format +msgid "&Movement" +msgstr "이동(&M)" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "차이 보기(&I)" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, kde-format +msgid "&Merge" +msgstr "합치기(&M)" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "창(&W)" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "주 도구 모음" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "무시함.(사용자 지정)" + +#. +> trunk5 +#: main.cpp:118 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "파일과 디렉터리를 비교하고 합치는 도구" + +#. +> trunk5 +#: main.cpp:119 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:138 +#, kde-format +msgid "Merge the input." +msgstr "입력을 합칩니다." + +#. +> trunk5 +#: main.cpp:139 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "명시적인 기반 파일. 일부 도구와 호환성을 위해 사용합니다." + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "출력 파일. -m을 암시합니다. 예: -o newfile.txt" + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "출력 파일, 또 다시.(일부 도구와 호환성을 위해 사용합니다.)" + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" +"모든 충돌 사항을 자동적으로 해결할 수 있는 경우 GUI 사용 안 함(-o file 필요)" + +#. +> trunk5 +#: main.cpp:143 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically. (For compatibility...)" +msgid "Do not solve conflicts automatically." +msgstr "충돌 사항을 자동으로 해결하지 않습니다.(호환성 옵션)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "입력 파일 1(기반)에 대한 표시 이름 대체입니다." + +#. +> trunk5 +#: main.cpp:145 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "입력 파일 2에 대한 표시 이름 대체입니다." + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "입력 파일 3에 대한 표시 이름 대체입니다." + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "대안 표시 이름 대체입니다. 입력 파일마다 하나씩 지정하십시오." + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "" +"Override a config setting. Use once for every setting. E.g.: --cs " +"\"AutoAdvance=1\"" +msgstr "" +"설정 옵션을 재정의합니다. 설정마다 하나씩 사용하십시오. 예: --cs " +"\"AutoAdvance=1\"" + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "설정 옵션과 현재 값을 표시합니다." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "Use a different config file." +msgstr "다른 설정 파일을 사용합니다." + +#. +> trunk5 +#: main.cpp:153 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "열 파일 1(--base로 지정하지 않은 경우의 기반)" + +#. +> trunk5 +#: main.cpp:154 +#, kde-format +msgid "file2 to open" +msgstr "열 파일 2" + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file3 to open" +msgstr "열 파일 3" + +#. +> trunk5 +#: mergeresultwindow.cpp:159 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "남은 해결하지 않은 충돌 항목: %1(공백 %2개 포함)" + +#. +> trunk5 +#: mergeresultwindow.cpp:340 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"출력 파일이 수정되었습니다.\n" +"계속 진행하면 변경 사항을 저장하지 않습니다." + +#. +> trunk5 +#: mergeresultwindow.cpp:904 pdiff.cpp:776 +#, kde-format +msgid "All input files are binary equal." +msgstr "모든 입력 파일의 바이너리가 같습니다." + +#. +> trunk5 +#: mergeresultwindow.cpp:906 +#, kde-format +msgid "All input files contain the same text." +msgstr "모든 입력 파일의 텍스트가 같습니다." + +#. +> trunk5 +#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 +#: mergeresultwindow.cpp:918 pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "파일 %1와(과) %2의 바이너리가 동일합니다.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 +#: mergeresultwindow.cpp:920 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "파일 %1와(과) %2의 텍스트가 동일합니다.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:926 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:932 +#, kde-format +msgid "Conflicts" +msgstr "충돌" + +#. +> trunk5 +#: mergeresultwindow.cpp:1835 +#, kde-format +msgid "" +msgstr "<원본 줄 없음>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1843 +#, kde-format +msgid "" +msgstr "<충돌 합치기(공백만>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1845 mergeresultwindow.cpp:2704 +#, kde-format +msgid "" +msgstr "<충돌 합치기>" + +#. +> trunk5 +#: mergeresultwindow.cpp:2916 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"모든 충돌 사항을 해결하지 않았습니다.\n" +"파일을 저장하지 않았습니다.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2918 mergeresultwindow.cpp:2927 +#, kde-format +msgid "Conflicts Left" +msgstr "충돌 사항 남음" + +#. +> trunk5 +#: mergeresultwindow.cpp:2925 +#, fuzzy, kde-format +#| msgid "" +#| "There is a line end style conflict. Please choose the line end style " +#| "manually.\n" +#| "File not saved.\n" +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved." +msgstr "" +"줄 끝 스타일이 충돌합니다. 줄 끝 스타일을 직접 선택하십시오.\n" +"파일을 저장하지 않았습니다.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2939 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"백업을 만들 수 없습니다. 파일을 저장하지 않았습니다." + +#. +> trunk5 +#: mergeresultwindow.cpp:2939 mergeresultwindow.cpp:2987 +#, kde-format +msgid "File Save Error" +msgstr "파일 저장 오류" + +#. +> trunk5 +#: mergeresultwindow.cpp:2987 +#, kde-format +msgid "Error while writing." +msgstr "쓰는 중 오류가 발생했습니다." + +#. +> trunk5 +#: mergeresultwindow.cpp:3347 +#, fuzzy, kde-format +#| msgid "Output" +msgid "Output:" +msgstr "출력" + +#. +> trunk5 +#: mergeresultwindow.cpp:3359 mergeresultwindow.cpp:3550 +#, kde-format +msgid "[Modified]" +msgstr "[수정됨]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3366 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "저장 인코딩" + +#. +> trunk5 +#: mergeresultwindow.cpp:3465 +#, kde-format +msgid "Conflict" +msgstr "충돌" + +#. +> trunk5 +#: mergeresultwindow.cpp:3497 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from A: %1" +msgstr "다음의 코덱" + +#. +> trunk5 +#: mergeresultwindow.cpp:3499 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from B: %1" +msgstr "다음의 코덱" + +#. +> trunk5 +#: mergeresultwindow.cpp:3501 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from C: %1" +msgstr "다음의 코덱" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format +msgid "Change Font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "유니코드" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "비 ASCII 문자가 올바르게 보이지 않으면 변경하십시오." + +#. +> trunk5 +#: optiondialog.cpp:614 +#, kde-format +msgid "Configure" +msgstr "설정" + +#. +> trunk5 +#: optiondialog.cpp:691 +#, kde-format +msgid "Font" +msgstr "글꼴" + +#. +> trunk5 +#: optiondialog.cpp:693 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "편집기와 Diff 출력 글꼴" + +#. +> trunk5 +#: optiondialog.cpp:711 +#, kde-format +msgid "Application font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:715 +#, fuzzy, kde-format +#| msgid "File Save Error" +msgid "File view font" +msgstr "파일 저장 오류" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Color" +msgstr "색" + +#. +> trunk5 +#: optiondialog.cpp:734 +#, kde-format +msgid "Colors Settings" +msgstr "색 설정" + +#. +> trunk5 +#: optiondialog.cpp:751 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "편집기와 차이점 보기:" + +#. +> trunk5 +#: optiondialog.cpp:759 +#, kde-format +msgid "Foreground color:" +msgstr "글자색:" + +#. +> trunk5 +#: optiondialog.cpp:766 +#, kde-format +msgid "Background color:" +msgstr "배경색:" + +#. +> trunk5 +#: optiondialog.cpp:775 +#, kde-format +msgid "Diff background color:" +msgstr "Diff 배경색:" + +#. +> trunk5 +#: optiondialog.cpp:783 +#, kde-format +msgid "Color A:" +msgstr "색 A:" + +#. +> trunk5 +#: optiondialog.cpp:791 +#, kde-format +msgid "Color B:" +msgstr "색 B:" + +#. +> trunk5 +#: optiondialog.cpp:799 +#, kde-format +msgid "Color C:" +msgstr "색 C:" + +#. +> trunk5 +#: optiondialog.cpp:806 +#, kde-format +msgid "Conflict color:" +msgstr "충돌 색:" + +#. +> trunk5 +#: optiondialog.cpp:814 +#, kde-format +msgid "Current range background color:" +msgstr "현재 범위 배경색:" + +#. +> trunk5 +#: optiondialog.cpp:822 +#, kde-format +msgid "Current range diff background color:" +msgstr "현재 범위 Diff 배경색:" + +#. +> trunk5 +#: optiondialog.cpp:829 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "수동으로 정렬한 차이점 범위 색:" + +#. +> trunk5 +#: optiondialog.cpp:835 +#, kde-format +msgid "Directory Comparison View:" +msgstr "디렉터리 비교 보기:" + +#. +> trunk5 +#: optiondialog.cpp:841 +#, kde-format +msgid "Newest file color:" +msgstr "가장 새로운 파일 색:" + +#. +> trunk5 +#: optiondialog.cpp:845 +#, kde-format +msgid "" +"Changing this color will only be effective when starting the next directory " +"comparison." +msgstr "이 색을 변경하면 다음 디렉터리 비교부터 적용됩니다." + +#. +> trunk5 +#: optiondialog.cpp:850 +#, kde-format +msgid "Oldest file color:" +msgstr "가장 오래된 파일 색:" + +#. +> trunk5 +#: optiondialog.cpp:858 +#, kde-format +msgid "Middle age file color:" +msgstr "보통 시기 파일 색:" + +#. +> trunk5 +#: optiondialog.cpp:866 +#, kde-format +msgid "Color for missing files:" +msgstr "없는 파일 색:" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor" +msgstr "편집기" + +#. +> trunk5 +#: optiondialog.cpp:880 +#, kde-format +msgid "Editor Behavior" +msgstr "편집기 행동" + +#. +> trunk5 +#: optiondialog.cpp:893 +#, kde-format +msgid "Tab inserts spaces" +msgstr "탭을 눌렀을 때 공백 삽입" + +#. +> trunk5 +#: optiondialog.cpp:896 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"사용: 탭을 누르면 해당하는 만큼 공백을 삽입합니다.\n" +"사용 안 함: 탭 문자를 삽입합니다." + +#. +> trunk5 +#: optiondialog.cpp:901 +#, kde-format +msgid "Tab size:" +msgstr "탭 크기:" + +#. +> trunk5 +#: optiondialog.cpp:907 +#, kde-format +msgid "Auto indentation" +msgstr "자동 들여쓰기" + +#. +> trunk5 +#: optiondialog.cpp:910 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "사용: 이전 줄의 들여쓰기를 새 줄에도 적용합니다.\n" + +#. +> trunk5 +#: optiondialog.cpp:913 +#, kde-format +msgid "Auto copy selection" +msgstr "자동 선택 복사" + +#. +> trunk5 +#: optiondialog.cpp:916 +#, kde-format +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"사용: 선택한 항목을 자동으로 클립보드에 복사합니다.\n" +"사용 안 함: Ctrl-C 키를 누르는 것과 같이 명시적으로 복사해야 합니다." + +#. +> trunk5 +#: optiondialog.cpp:930 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"편집한 파일을 저장할 때 줄 끝을 지정합니다.\n" +"DOS/Windows: CR+LF, UNIX: LF. CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff" +msgstr "Diff" + +#. +> trunk5 +#: optiondialog.cpp:941 +#, kde-format +msgid "Diff Settings" +msgstr "Diff 설정" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:965 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore numbers (treat as white space)" +msgstr "공백으로 취급합니다." + +#. +> trunk5 +#: optiondialog.cpp:968 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"줄 일치 과정에서 숫자에 해당하는 문자를 무시합니다.(공백 무시와 비슷함)\n" +"숫자 데이터가 포함된 파일을 비교할 때 사용할 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:972 +#, fuzzy, kde-format +#| msgid "Treat C/C++ comments like white space." +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "C/C++ 주석을 공백으로 취급합니다." + +#. +> trunk5 +#: optiondialog.cpp:974 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "C/C++ 주석을 공백으로 취급합니다." + +#. +> trunk5 +#: optiondialog.cpp:977 +#, fuzzy, kde-format +#| msgid "Treat as white space." +msgid "Ignore case (treat as white space)" +msgstr "공백으로 취급합니다." + +#. +> trunk5 +#: optiondialog.cpp:980 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "대소문자 차이를 공백 차이로 취급합니다.('a'<=>'A')" + +#. +> trunk5 +#: optiondialog.cpp:983 +#, kde-format +msgid "Preprocessor command:" +msgstr "전처리기 명령:" + +#. +> trunk5 +#: optiondialog.cpp:987 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "사용자 지정 전처리입니다.(자세한 사항은 문서를 참고하십시오)" + +#. +> trunk5 +#: optiondialog.cpp:990 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "줄 일치 전처리 명령:" + +#. +> trunk5 +#: optiondialog.cpp:994 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"이 전처리기는 줄 일치에만 사용합니다.\n" +"(자세한 사항은 문서를 참고하십시오.)" + +#. +> trunk5 +#: optiondialog.cpp:997 +#, kde-format +msgid "Try hard (slower)" +msgstr "더 자세히 비교(느림)" + +#. +> trunk5 +#: optiondialog.cpp:1000 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"외부 diff 실행 시 --minimal 옵션을 사용합니다.\n" +"큰 파일 비교가 느려질 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:1004 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "입력 파일이 3개일 때 B와 C 정렬" + +#. +> trunk5 +#: optiondialog.cpp:1007 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"세 개의 입력 파일을 비교하거나 합칠 때 B와 C로 정렬을 시도합니다.\n" +"합칠 때에는 더 복잡해질 수 있으므로 합칠 때에는 추천하지 않습니다.\n" +"(기본값으로 비활성화됨.)" + +#. +> trunk5 +#: optiondialog.cpp:1019 +#, kde-format +msgid "Merge Settings" +msgstr "합치기 설정" + +#. +> trunk5 +#: optiondialog.cpp:1033 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "자동 진행 지연 시간(ms):" + +#. +> trunk5 +#: optiondialog.cpp:1038 +#, kde-format +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 "" +"자동 진행 모드에서는 현재 선택 결과를 지정한 시간 동안 표시한 다음\n" +"다음 충돌 항목으로 이동합니다. 범위: 0-2000ms" + +#. +> trunk5 +#: optiondialog.cpp:1042 +#, kde-format +msgid "Show info dialogs" +msgstr "정보 대화 상자 보이기" + +#. +> trunk5 +#: optiondialog.cpp:1044 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "충돌 개수 정보 대화 상자를 표시합니다." + +#. +> trunk5 +#: optiondialog.cpp:1047 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "공백만 변경되었을 때 2개 파일 합치기 기본값:" + +#. +> trunk5 +#: optiondialog.cpp:1051 optiondialog.cpp:1063 +#, kde-format +msgid "Manual Choice" +msgstr "수동 선택" + +#. +> trunk5 +#: optiondialog.cpp:1055 optiondialog.cpp:1068 +#, kde-format +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" +"공백만 변경되었을 때 합치기 알고리즘에서 입력을 자동으로 선택하도록 허용합니" +"다." + +#. +> trunk5 +#: optiondialog.cpp:1059 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "공백만 변경되었을 때 3개 파일 합치기 기본값:" + +#. +> trunk5 +#: optiondialog.cpp:1072 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "자동 합치기 정규 표현식" + +#. +> trunk5 +#: optiondialog.cpp:1080 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "자동 합치기 정규 표현식:" + +#. +> trunk5 +#: optiondialog.cpp:1084 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one " +"source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"KDiff3에서 자동으로 하나의 원본을 선택할 때 사용할 정규 표현식입니다.\n" +"충돌이 발생한 줄이 정규 표현식과 일치하는 경우\n" +"C를 선택하고, 그렇지 않으면 B를 선택합니다." + +#. +> trunk5 +#: optiondialog.cpp:1090 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "합치기를 시작할 때 정규 표현식 실행" + +#. +> trunk5 +#: optiondialog.cpp:1092 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"합치기 작업을 시작할 때 자동 합치기\n" +"정규 표현식으로 합치기를 실행합니다.\n" + +#. +> trunk5 +#: optiondialog.cpp:1097 +#, kde-format +msgid "Version Control History Merging" +msgstr "버전 관리 역사 합치기" + +#. +> trunk5 +#: optiondialog.cpp:1105 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "역사 시작 정규 표현식:" + +#. +> trunk5 +#: optiondialog.cpp:1109 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"버전 관리 역사 항목의 시작을 나타내는 정규 표현식입니다.\n" +"대개 이 줄은 \"$Log$\" 키워드를 포함합니다.\n" +"기본값: \".*\\$Log.*\\$.*\"" + +#. +> trunk5 +#: optiondialog.cpp:1115 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "역사 항목 시작 정규 표현식:" + +#. +> trunk5 +#: optiondialog.cpp:1127 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading " +"comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" +"See the documentation for details." +msgstr "" +"버전 관리 역사 항목은 여러 줄로 이루어져 있습니다.\n" +"시작 주석이 없는 첫 번째 항목을 확인하기 위한 정규 표현식을 지정하십시오.\n" +"정렬에 사용할 키 그룹은 괄호로 지정하십시오.\n" +"비어 있으면 KDiff3은 빈 줄로 역사 항목을 구분하는 것으로 간주합니다.\n" +"자세한 사항은 문서를 참고하십시오." + +#. +> trunk5 +#: optiondialog.cpp:1135 +#, kde-format +msgid "History merge sorting" +msgstr "역사 합치기 정렬" + +#. +> trunk5 +#: optiondialog.cpp:1137 +#, kde-format +msgid "Sort version control history by a key." +msgstr "버전 관리 역사를 키를 기준으로 정렬합니다." + +#. +> trunk5 +#: optiondialog.cpp:1147 +#, kde-format +msgid "History entry start sort key order:" +msgstr "버전 관리 시작 정렬 키 순서:" + +#. +> trunk5 +#: optiondialog.cpp:1151 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history " +"start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"버전 관리 항목 시작 그룹의 각각 괄호에 둘러싸인 항목은 정렬에 사용할\n" +"키를 지정합니다.\n" +"맨 첫 번째 일치 항목을 1에서 시작하여 키 순서를 쉼표로 구분한 목록으로\n" +"입력하십시오. (예: \"4,5,6,1,2,3,7\")\n" +"비어 있으면 정렬하지 않습니다.\n" +"자세한 사항은 문서를 참고하십시오." + +#. +> trunk5 +#: optiondialog.cpp:1162 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "합치기를 시작할 때 버전 관리 역사 합치기" + +#. +> trunk5 +#: optiondialog.cpp:1164 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "합치기를 시작할 때 자동으로 버전 관리 역사를 합칩니다." + +#. +> trunk5 +#: optiondialog.cpp:1168 +#, kde-format +msgid "Max number of history entries:" +msgstr "최대 역사 항목 수:" + +#. +> trunk5 +#: optiondialog.cpp:1171 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "지정한 개수를 초과하는 항목은 잘라냅니다. -1은 제한을 두지 않습니다." + +#. +> trunk5 +#: optiondialog.cpp:1175 +#, kde-format +msgid "Test your regular expressions" +msgstr "정규 표현식을 시험해 보십시오" + +#. +> trunk5 +#: optiondialog.cpp:1180 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "관계 없는 합침 명령:" + +#. +> trunk5 +#: optiondialog.cpp:1184 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"자동 합치기가 끝난 후 합칠 항목이\n" +"더 이상 존재하지 않으면 지정한 스크립트를 실행합니다.\n" +"다음 인자로 호출합니다: filename1 filename2 filename3" + +#. +> trunk5 +#: optiondialog.cpp:1189 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "충돌하지 않고 합쳐졌을 때 자동으로 저장하고 끝내기" + +#. +> trunk5 +#: optiondialog.cpp:1192 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"KDiff3이 명령행에서 파일 합치기 작업으로 시작되었고 모든\n" +"변경 사항이 사용자 확인 없이 진행 가능하면 자동으로 저장하고 끝냅니다.\n" +"(명령행 옵션 \"--auto\"와 비슷합니다.)" + +#. +> trunk5 +#: optiondialog.cpp:1203 optiondialog.cpp:1204 +#, kde-format +msgid "Directory" +msgstr "디렉터리" + +#. +> trunk5 +#: optiondialog.cpp:1216 +#, kde-format +msgid "Recursive directories" +msgstr "재귀적 디렉터리" + +#. +> trunk5 +#: optiondialog.cpp:1218 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "하위 디렉터리를 분석할 지 여부입니다." + +#. +> trunk5 +#: optiondialog.cpp:1220 +#, kde-format +msgid "File pattern(s):" +msgstr "파일 패턴:" + +#. +> trunk5 +#: optiondialog.cpp:1225 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"분석할 파일 패턴입니다.\n" +"와일드카드: '*', '?'\n" +"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:1230 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "파일 제외 패턴:" + +#. +> trunk5 +#: optiondialog.cpp:1235 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"분석할 파일에서 제외할 패턴입니다.\n" +"와일드카드: '*', '?'\n" +"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:1240 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "디렉터리 제외 패턴:" + +#. +> trunk5 +#: optiondialog.cpp:1245 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"분석할 디렉터리에서 제외할 패턴입니다.\n" +"와일드카드: '*', '?'\n" +"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:1250 +#, kde-format +msgid "Use .cvsignore" +msgstr ".cvsisnore 사용" + +#. +> trunk5 +#: optiondialog.cpp:1253 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"CVS에서 무시하는 파일을 제외합니다.\n" +"디렉터리별로 \".cvsignore\" 파일을 다르게 지정할 수 있습니다." + +#. +> trunk5 +#: optiondialog.cpp:1257 +#, kde-format +msgid "Find hidden files and directories" +msgstr "숨은 파일과 디렉터리 찾기" + +#. +> trunk5 +#: optiondialog.cpp:1260 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "숨김 속성이 있는 파일과 디렉터리를 찾습니다." + +#. +> trunk5 +#: optiondialog.cpp:1262 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "'.'으로 시작하는 파일과 디렉터리를 찾습니다." + +#. +> trunk5 +#: optiondialog.cpp:1266 +#, kde-format +msgid "Follow file links" +msgstr "파일 링크 따라가기" + +#. +> trunk5 +#: optiondialog.cpp:1269 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"사용: 링크가 가리키는 곳의 파일을 따라갑니다.\n" +"사용 안 함: 링크 자체를 비교합니다." + +#. +> trunk5 +#: optiondialog.cpp:1273 +#, kde-format +msgid "Follow directory links" +msgstr "디렉터리 링크 따라가기" + +#. +> trunk5 +#: optiondialog.cpp:1276 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"사용: 링크가 가리키는 곳의 디렉터리를 따라갑니다.\n" +"사용 안 함: 링크 자체를 비교합니다." + +#. +> trunk5 +#: optiondialog.cpp:1291 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "파일 이름 비교 시 대소문자 구분" + +#. +> trunk5 +#: optiondialog.cpp:1294 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names " +"match.\n" +"Set this option if the case of the names must match. (Default for Windows is " +"off, otherwise on.)" +msgstr "" +"디렉터리 비교 기능은 이름이 일치하는 파일과 디렉터리를 비교합니다.\n" +"이름의 대소문자가 반드시 일치해야 하면 이 옵션을 선택하십시오. (Windows에서" +"는 꺼짐, 기타 플랫폼에서는 켜짐)" + +#. +> trunk5 +#: optiondialog.cpp:1298 +#, fuzzy, kde-format +#| msgid "Unfold All Subdirs" +msgid "Unfold all subdirectories on load" +msgstr "모든 하위 디렉터리 풀기" + +#. +> trunk5 +#: optiondialog.cpp:1301 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1305 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1308 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1312 +#, kde-format +msgid "File Comparison Mode" +msgstr "파일 비교 모드" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison" +msgstr "바이너리 비교" + +#. +> trunk5 +#: optiondialog.cpp:1318 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "각각 파일의 바이너리 비교를 수행합니다.(기본값)" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "Full analysis" +msgstr "완전 분석" + +#. +> trunk5 +#: optiondialog.cpp:1322 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"완전 분석을 수행하여 추가 열에 통계 정보를 표시합니다.\n" +"(바이너리 비교보다 느리며 바이너리 파일에서는 더 느립니다)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "크기와 수정한 날짜 무시하기(안전하지 않음)" + +#. +> trunk5 +#: optiondialog.cpp:1327 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"파일 크기와 수정한 날짜가 같으면 파일을 같은 것으로 취급합니다.\n" +"내용이 같지만 수정한 날짜가 다른 파일은 다른 파일로 나타납니다.\n" +"큰 디렉터리나 느린 네트워크에서 유용합니다." + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Trust the size and date, but use binary comparison if date does not match " +"(unsafe)" +msgstr "" +"크기와 수정한 날짜를 무시하지만 날짜가 다르면 바이너리 비교 사용(안전하지 않" +"음)" + +#. +> trunk5 +#: optiondialog.cpp:1333 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"파일 크기와 수정한 날짜가 같으면 파일을 같은 것으로 취급합니다\n" +"수정한 날짜가 다른 파일은 바이너리 비교를 수행합니다.\n" +"큰 디렉터리나 느린 네트워크에서 유용합니다." + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "크기 건너뛰기(안전하지 않음)" + +#. +> trunk5 +#: optiondialog.cpp:1339 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during " +"download." +msgstr "" +"파일 크기가 같은 파일은 같은 파일로 취급합니다.\n" +"날짜가 다운로드 중 수정된 큰 디렉터리나 느린 네트워크에서 유용합니다." + +#. +> trunk5 +#: optiondialog.cpp:1346 +#, kde-format +msgid "Synchronize directories" +msgstr "디렉터리 동기화" + +#. +> trunk5 +#: optiondialog.cpp:1349 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"양쪽 디렉터리에 모두 파일을 저장하여\n" +"작업 이후 디렉터리의 내용을 동일하게 유지합니다.\n" +"대상을 지정하지 않고 두 디렉터리를 비교할 때만 작동합니다." + +#. +> trunk5 +#: optiondialog.cpp:1355 +#, kde-format +msgid "White space differences considered equal" +msgstr "공백 문자 변경을 같은 것으로 취급" + +#. +> trunk5 +#: optiondialog.cpp:1358 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"파일이 공백 문자만 다르면 같은 것으로 취급합니다.\n" +"완전 분석을 선택했을 때만 사용합니다." + +#. +> trunk5 +#: optiondialog.cpp:1364 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "합치는 대신 새 파일 복사(안전하지 않음)" + +#. +> trunk5 +#: optiondialog.cpp:1367 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"파일의 내용을 보지 않고 새 파일을 복사합니다.\n" +"(하고 있는 일이 무엇인지 알 때만 사용하십시오!)\n" +"두 디렉터리를 비교할 때만 사용합니다." + +#. +> trunk5 +#: optiondialog.cpp:1372 +#, kde-format +msgid "Backup files (.orig)" +msgstr "파일 백업(.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1375 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"기존 파일의 내용을 변경하여 저장하는 경우, 기존 파일은\n" +"삭제되지 않고 '.orig' 확장자가 추가되어 저장됩니다." + +#. +> trunk5 +#: optiondialog.cpp:1451 optiondialog.cpp:1452 +#, kde-format +msgid "Regional Settings" +msgstr "지역 설정" + +#. +> trunk5 +#: optiondialog.cpp:1466 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "모든 것에 동일한 인코딩 사용:" + +#. +> trunk5 +#: optiondialog.cpp:1469 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"이 옵션을 사용하면 첫 인코딩을 변경했을 때 모든 인코딩을 변경합니다.\n" +"개별 설정이 필요하면 비활성화 시키십시오." + +#. +> trunk5 +#: optiondialog.cpp:1473 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "메모: 현재 로컬 인코딩: " + +#. +> trunk5 +#: optiondialog.cpp:1477 +#, kde-format +msgid "File Encoding for A:" +msgstr "파일 A 인코딩:" + +#. +> trunk5 +#: optiondialog.cpp:1483 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as " +"fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"이 옵션을 사용하면 유니코드(UTF-16, UTF-8) 인코딩을 자동으로 감지합니다.\n" +"파일이 유니코드가 아닌 경우 선택한 인코딩을 폴백으로 사용합니다.\n" +"(유니코드 감지는 파일의 첫 바이트를 봅니다.)" + +#. +> trunk5 +#: optiondialog.cpp:1486 optiondialog.cpp:1495 optiondialog.cpp:1504 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "유니코드 자동 감지" + +#. +> trunk5 +#: optiondialog.cpp:1491 +#, kde-format +msgid "File Encoding for B:" +msgstr "파일 B 인코딩:" + +#. +> trunk5 +#: optiondialog.cpp:1500 +#, kde-format +msgid "File Encoding for C:" +msgstr "파일 C 인코딩:" + +#. +> trunk5 +#: optiondialog.cpp:1509 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "합치기 출력과 저장 인코딩:" + +#. +> trunk5 +#: optiondialog.cpp:1513 +#, kde-format +msgid "Auto Select" +msgstr "자동 선택" + +#. +> trunk5 +#: optiondialog.cpp:1516 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for " +"saving." +msgstr "" +"이 옵션을 사용하면 입력 파일의 인코딩을 사용합니다.\n" +"모호한 경우 사용자에게 저장할 인코딩을 물어 보는 대화 상자를 엽니다." + +#. +> trunk5 +#: optiondialog.cpp:1519 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "전처리 파일 인코딩:" + +#. +> trunk5 +#: optiondialog.cpp:1530 +#, kde-format +msgid "Right To Left Language" +msgstr "오른쪽에서 왼쪽으로 쓰는 언어" + +#. +> trunk5 +#: optiondialog.cpp:1533 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"일부 언어는 오른쪽에서 왼쪽으로 씁니다.\n" +"이 설정은 뷰어와 편집기의 설정을 변경합니다." + +#. +> trunk5 +#: optiondialog.cpp:1552 +#, kde-format +msgid "Integration" +msgstr "통합" + +#. +> trunk5 +#: optiondialog.cpp:1553 +#, kde-format +msgid "Integration Settings" +msgstr "통합 설정" + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Command line options to ignore:" +msgstr "무시할 명령행 옵션:" + +#. +> trunk5 +#: optiondialog.cpp:1571 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by " +"other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"KDiff3을 다른 도구에서 사용할 때 무시할 명령행 옵션입니다.\n" +"여러 항목을 구분하려면 쌍반점(';')을 사용하십시오.\n" +"이 옵션은 \"알 수 없는 옵션\" 오류를 비활성화합니다." + +#. +> trunk5 +#: optiondialog.cpp:1576 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Esc 키로도 끝내기" + +#. +> trunk5 +#: optiondialog.cpp:1579 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"끝내기 위한 빠른 방법입니다.\n" +"Esc 키로 끝내기에 익숙한 사람을 위한 방법입니다." + +#. +> trunk5 +#: optiondialog.cpp:1584 +#, kde-format +msgid "Integrate with ClearCase" +msgstr "ClearCase 통합" + +#. +> trunk5 +#: optiondialog.cpp:1587 +#, kde-format +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"IBM의 Rational ClearCase와 통합합니다. ClearCase 하위 디렉터리 \"lib/mgrs" +"\"의 \"map\" 파일을 수정합니다.\n" +"(PATH에 ClearCase \"bin\" 디렉터리가 있을 때에만 사용됩니다.)" + +#. +> trunk5 +#: optiondialog.cpp:1593 +#, kde-format +msgid "Remove ClearCase Integration" +msgstr "ClearCase 통합 삭제" + +#. +> trunk5 +#: optiondialog.cpp:1596 +#, kde-format +msgid "" +"Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "ClearCase 통합 이전에 사용했던 \"map\" 파일을 복원합니다." + +#. +> trunk5 +#: optiondialog.cpp:1700 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "현재 항목 뿐만 아니라 모든 옵션을 초기화합니다." + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"데이터 손실 오류:\n" +"재현 가능한 경우 작성자에게 연락해 주십시오.\n" + +#. +> trunk5 +#: pdiff.cpp:91 pdiff.cpp:105 +#, kde-format +msgid "Severe Internal Error" +msgstr "심각한 내부 오류" + +#. +> trunk5 +#: pdiff.cpp:133 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "전처리기 명령: " + +#. +> trunk5 +#: pdiff.cpp:138 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "다음 선택한 옵션은 데이터를 변경할 수 있습니다:\n" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"합치기 과정 중 원하지 않을 수도 있습니다.\n" +"이 설정을 비활성화하거나, 활성화 후 계속 진행하시겠습니까?" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "옵션 변경이 합칠 때 안전하지 않음" + +#. +> trunk5 +#: pdiff.cpp:142 +#, kde-format +msgid "Use These Options During Merge" +msgstr "합칠 때 이 옵션 사용하기" + +#. +> trunk5 +#: pdiff.cpp:143 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "안전하지 않은 옵션 비활성화" + +#. +> trunk5 +#: pdiff.cpp:173 +#, kde-format +msgid "Loading A" +msgstr "A 불러오는 중" + +#. +> trunk5 +#: pdiff.cpp:184 +#, kde-format +msgid "Loading B" +msgstr "B 불러오는 중" + +#. +> trunk5 +#: pdiff.cpp:208 pdiff.cpp:238 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Diff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:215 pdiff.cpp:266 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "줄 Diff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:226 +#, kde-format +msgid "Loading C" +msgstr "C 불러오는 중" + +#. +> trunk5 +#: pdiff.cpp:242 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Diff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:246 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Diff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:269 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "줄 Diff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:272 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "줄 Diff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:778 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "모든 입력 파일의 텍스트가 같지만 바이너리는 같지 않습니다." + +#. +> trunk5 +#: pdiff.cpp:784 pdiff.cpp:788 pdiff.cpp:792 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "파일 %1와(과) %2의 텍스트가 같지만 바이너리는 같지 않습니다.\n" + +#. +> trunk5 +#: pdiff.cpp:802 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"일부 입력 파일은 완전한 텍스트 파일이 아는 것 같습니다.\n" +"KDiff3의 합치기 기능은 바이너리 데이터에 적합하지 않습니다.\n" +"본인 책임 하에 계속 진행하십시오." + +#. +> trunk5 +#: pdiff.cpp:816 +#, fuzzy, kde-format +#| msgid "" +#| "Some input characters could not be converted to valid unicode.\n" +#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +#| "Don't save the result if unsure. Continue at your own risk.\n" +#| "Affected input files are in %1." +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"일부 입력 문자를 올바른 유니코드로 변환할 수 없습니다.\n" +"잘못된 코덱을 사용할 수도 있습니다.(예: 비 UTF-8 파일에 UTF-8 사용)\n" +"확신하지 못하는 경우 파일을 저장하지 마십시오. 본인 책임 하에 계속 진행하십시" +"오.\n" +"영향 받는 입력 파일은 %1에 있습니다." + +#. +> trunk5 +#: pdiff.cpp:1034 +#, kde-format +msgid "Abort" +msgstr "중단" + +#. +> trunk5 +#: pdiff.cpp:1040 pdiff.cpp:1128 +#, kde-format +msgid "Opening files..." +msgstr "파일 여는 중..." + +#. +> trunk5 +#: pdiff.cpp:1105 pdiff.cpp:1176 +#, kde-format +msgid "File open error" +msgstr "파일 열기 오류" + +#. +> trunk5 +#: pdiff.cpp:1215 +#, kde-format +msgid "Cutting selection..." +msgstr "선택 영역 잘라내는 중..." + +#. +> trunk5 +#: pdiff.cpp:1236 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "선택 영역 클립보드에 복사하는 중..." + +#. +> trunk5 +#: pdiff.cpp:1252 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "클립보드 내용 삽입 중..." + +#. +> trunk5 +#: pdiff.cpp:1713 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1714 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1925 +#, kde-format +msgid "Save && Continue" +msgstr "저장하고 계속" + +#. +> trunk5 +#: pdiff.cpp:1926 +#, kde-format +msgid "Continue Without Saving" +msgstr "저장하지 않고 계속" + +#. +> trunk5 +#: pdiff.cpp:2138 +#, kde-format +msgid "Search complete." +msgstr "검색 완료." + +#. +> trunk5 +#: pdiff.cpp:2138 +#, kde-format +msgid "Search Complete" +msgstr "검색 완료" + +#. +> trunk5 +#: pdiff.cpp:2380 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Diff 입력 창에서 아무것도 선택하지 않았습니다." + +#. +> trunk5 +#: pdiff.cpp:2380 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "수동 Diff 범위 추가 중 오류 발생" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "취소(&C)" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A(기반):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "파일..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "디렉터리..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C(선택 사항):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "이름 전환/복사..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "%1<->%2 전환" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "%1->출력으로 복사" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "%1<->출력 전환" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "출력(선택 사항):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "설정..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, fuzzy, kde-format +#| msgid "Directory" +msgid "Open Directory" +msgstr "디렉터리" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format +msgid "Select Output File" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "찾을 텍스트:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "대소문자 구분" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "A 검색" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "B 검색" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "C 검색" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "출력 검색" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "찾기(&S)" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "정규 표현식 시험 도구" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "자동으로 합칠 줄 예제:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "자동 합치기를 사용하려면 파일에 있는 줄을 그대로 복사하십시오." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "일치 결과:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "예제 기록 시작 줄(도입부 주석 포함):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"도입부 주석을 포함하여\n" +"과거 기록 시작 줄을 파일에 있는 대로 복사하십시오." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "과거 기록 정렬 키 순서:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "예제 기록 항목 시작 줄(도입부 주석 포함):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"도입부 주석을 제외하여\n" +"과거 기록 항목 시작 줄을 파일에 있는 대로 복사하십시오." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "정렬 키 결과:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "일치 성공." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "일치 실패." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "정규 표현식의 열고 닫는 괄호가 일치하지 않습니다." + +#~ msgid "Line" +#~ msgstr "줄" + +#~ msgid "Directory Comparison Status" +#~ msgstr "디렉터리 비교 상태" + +#~ msgid "Number of subdirectories:" +#~ msgstr "하위 디렉터리 개수:" + +#~ msgid "Number of equal files:" +#~ msgstr "같은 파일 개수:" + +#~ msgid "Number of different files:" +#~ msgstr "다른 파일 개수:" + +#~ msgid "Cancel" +#~ msgstr "취소" + +#~ msgid "Help" +#~ msgstr "도움말" + +#~ msgid "Defaults" +#~ msgstr "기본값" + +#~ msgid "&Edit" +#~ msgstr "편집(&E)" + +#~ msgid "&Settings" +#~ msgstr "설정(&S)" + +#~ msgid "&Help" +#~ msgstr "도움말(&H)" + +#~ msgid "&About" +#~ msgstr "정보(&A)" + +#~ msgid "A&uthor" +#~ msgstr "작성자(&U)" + +#~ msgid "&Thanks To" +#~ msgstr "고마운 분(&T)" + +#~ msgid "Open" +#~ msgstr "열기" + +#~ msgid "Save" +#~ msgstr "저장" + +#~ msgid "Print..." +#~ msgstr "인쇄..." + +#~ msgid "Quit" +#~ msgstr "끝내기" + +#~ msgid "Cut" +#~ msgstr "잘라내기" + +#~ msgid "Copy" +#~ msgstr "복사" + +#~ msgid "Paste" +#~ msgstr "붙여넣기" + +#~ msgid "Select All" +#~ msgstr "모두 선택" + +#~ msgid "Show Toolbar" +#~ msgstr "도구 모음 보이기" + +#~ msgid "Show &Status Bar" +#~ msgstr "상태 표시줄 보이기(&S)" + +#~ msgid "&Configure %1..." +#~ msgstr "%1 설정(&C)..." + +#~ msgid "About" +#~ msgstr "정보" + +#~ msgid "Find" +#~ msgstr "찾기" + +#~ msgid "Find Next" +#~ msgstr "다음 찾기" + +#~ msgid "For more documentation, see the help-menu or the subdirectory doc." +#~ msgstr "" +#~ "더 많은 문서를 보려면 도움말 메뉴나 doc 하위 디렉터리를 참고하십시오." + +#~ msgid "KDiff3-Usage" +#~ msgstr "KDiff3 사용법" + +#~ msgid "Ignore" +#~ msgstr "무시" + +#~ msgid "Exit" +#~ msgstr "종료" + +#~ msgid "Continue" +#~ msgstr "계속" + +#~ msgid "kdiff3" +#~ msgstr "kdiff3" + +#, fuzzy +#~| msgid "(c) 2002-2011 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "(c) 2002-2011 Joachim Eibl" + +#~ msgid "Total number of conflicts: " +#~ msgstr "총 충돌 개수: " + +#~ msgid "" +#~ "\n" +#~ "Nr of automatically solved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "자동으로 해결된 충돌 개수: " + +#~ msgid "" +#~ "\n" +#~ "Nr of unsolved conflicts: " +#~ msgstr "" +#~ "\n" +#~ "해결되지 않은 충돌 개수: " + +#~ msgid "Ignore numbers" +#~ msgstr "숫자 무시" + +#~ msgid "Ignore C/C++ comments" +#~ msgstr "C/C++ 주석 무시하기" + +#~ msgid "Ignore case" +#~ msgstr "대소문자 무시" + +#~ msgid "Language (restart required)" +#~ msgstr "언어(다시 시작 필요)" + +#~ msgid "" +#~ "Choose the language of the GUI strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "GUI 문자열의 언어를 선택하거나 자동 선택이 가능합니다.\n" +#~ "언어 변경 사항을 적용하려면 KDiff3을 다시 시작하십시오." + +#~ msgid "&OK" +#~ msgstr "확인(&O)" + +#~ msgid "OK" +#~ msgstr "확인" + +#~ 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" +#~ "mergeResultSaved: m_pMFI=0\n" +#~ "\n" +#~ "이 과정을 재현하는 방법을 알고 있다면 프로그램 제작자에게 연락해 주십시오." + +#~ msgid "Program Error" +#~ msgstr "프로그램 오류" + +#~ msgid "Error." +#~ msgstr "오류." + +#~ msgid "Select Font" +#~ msgstr "글꼴 선택" + +#~ 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" +#~ "\n" +#~ "프로그램에서 가변폭 글꼴을 처리하는 데 문제가 있기\n" +#~ "때문에 편집 중에 문제가 발생할 수도 있습니다.\n" +#~ "\n" +#~ "계속 진행하거나 다른 글꼴을 선택할 수 있습니다." + +#~ msgid "Incompatible font." +#~ msgstr "호환되지 않는 글꼴입니다." + +#~ msgid "Continue at my own risk" +#~ msgstr "그래도 계속 진행" + +#~ msgid "Select another font" +#~ msgstr "다른 글꼴 선택" + +#~ msgid "Eike Sauer" +#~ msgstr "Eike Sauer" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "버그 수정, 데비안 패키지 관리자" + +#~ msgid "Sebastien Fricker" +#~ msgstr "Sebastien Fricker" + +#~ msgid "Windows installer" +#~ msgstr "Windows 설치 도구" + +#~ msgid "Stephan Binner" +#~ msgstr "Stephan Binner" + +#~ msgid "i18n-help" +#~ msgstr "국제화 도움" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "Stefan Partheymueller" + +#~ msgid "Clipboard-patch" +#~ msgstr "클립보드 패치" + +#~ msgid "David Faure" +#~ msgstr "David Faure" + +#~ msgid "KIO-Help" +#~ msgstr "KIO 도움" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "Bernd Gehrmann" + +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Cervisia의 클래스 CvsIgnoreList" + +#~ msgid "Andre Woebbeking" +#~ msgstr "Andre Woebbeking" + +#~ msgid "Class StringMatcher" +#~ msgstr "StringMatcher 클래스" + +#~ msgid "Michael Denio" +#~ msgstr "Michael Denio" + +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "디렉터리 동등성 색상 패치" + +#~ msgid "Manfred Koehler" +#~ msgstr "Manfred Koehler" + +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Windows의 시작 속도 개선" + +#~ msgid "Sergey Zorin" +#~ msgstr "Sergey Zorin" + +#~ msgid "Diff Ext for Windows" +#~ msgstr "Windows용 Diff 확장" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#~ msgid "GNU-Diffutils" +#~ msgstr "GNU Diffutils" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "Tino Boellsterling, Timothy Mee" + +#~ msgid "Intensive test, use and feedback" +#~ msgstr "테스트, 사용 피드백" + +#~ msgid "Michael Schmidt" +#~ msgstr "Michael Schmidt" + +#~ msgid "Mac support" +#~ msgstr "Mac 지원" + +#~ msgid "Valentin Rusu" +#~ msgstr "Valentin Rusu" + +#~ msgid "KDE4 porting" +#~ msgstr "KDE4 포팅" + +#~ msgid "Albert Astals Cid" +#~ msgstr "Albert Astals Cid" + +#~ msgid "Silvan Scherrer" +#~ msgstr "Silvan Scherrer" + +#~ msgid "OS2 port" +#~ msgstr "OS/2 포팅" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "+ 버그를 보고하고 아이디어를 기여한 분들께 감사합니다!" + +#~ msgid "Italic font for deltas" +#~ msgstr "차이점에 이탤릭 글꼴 사용" + +#~ 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" +#~ "글꼴에서 이탤릭을 지원하지 않으면 변화가 없습니다." + +#~ msgid "Incompatible Font" +#~ msgstr "호환되지 않는 글꼴" + +#~ msgid "Continue at Own Risk" +#~ msgstr "그래도 계속 진행" + +#~ msgid "Select Another Font" +#~ msgstr "다른 글꼴 선택" Index: trunk/l10n-support/ko/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/ko/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/ko/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,131 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Shinjo Park , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2014-03-03 04:04+0900\n" +"Last-Translator: Shinjo Park \n" +"Language-Team: Korean \n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, fuzzy, kde-format +#| msgid "KDiff3 ..." +msgid "KDiff3..." +msgstr "KDiff3 ..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "%1과(와) 비교하기" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "%1과(와) 합치기" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "나중을 위하여 '%1' 저장" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "기반이 있는 3중 결합" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, fuzzy, kde-format +#| msgid "Compare with ..." +msgid "Compare with..." +msgstr "다음과 비교..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "목록 비우기" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "비교" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "3중 비교" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, fuzzy, kde-format +#| msgid "About KDiff3 menu plugin ..." +msgid "About KDiff3 menu plugin..." +msgstr "KDiff3 메뉴 플러그인 정보..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"KDiff3 파일 항목 동작 플러그인: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 홈페이지: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, fuzzy, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It " +#| "will appear in the \"Compare With ...\" submenu. Then use \"Compare With" +#| "\" on second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge " +#| "and choose \"3-way merge with base\" on the other branch which will be " +#| "used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It " +"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " +"the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and " +"choose \"3-way merge with base\" on the other branch which will be used as " +"destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"컨텍스트 메뉴 확장 기능 사용 방법:\n" +"두 선택된 파일을 단순히 비교하려면 \"비교\"를 누르십시오.\n" +"다른 파일이 다른 곳에 있으면 \"저장\"을 눌러서 파일을 기억해 두십시오. \"다음" +"과 비교...\" 하위 메뉴에 나타납니다. 그 다음 \"다음과 비교\"를 두 번째 파일에" +"서 누르십시오.\n" +"3중 결합을 사용하려면 기반 파일을 \"저장\"한 다음 합칠 브랜치를 저장하고 대" +"상 브랜치로 사용할 곳에서 \"기반이 있는 3중 결합\"을 선택하십시오.\n" +"디렉터리 비교와 결합에서도 같은 방법을 사용합니다." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "KDiff3 파일 항목 동작 플러그인 정보" Index: trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,131 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Shinjo Park , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2014-03-03 04:04+0900\n" -"Last-Translator: Shinjo Park \n" -"Language-Team: Korean \n" -"Language: ko\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." -msgid "KDiff3..." -msgstr "KDiff3 ..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "%1과(와) 비교하기" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "%1과(와) 합치기" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "나중을 위하여 '%1' 저장" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "기반이 있는 3중 결합" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." -msgid "Compare with..." -msgstr "다음과 비교..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "목록 비우기" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "비교" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "3중 비교" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." -msgid "About KDiff3 menu plugin..." -msgstr "KDiff3 메뉴 플러그인 정보..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"KDiff3 파일 항목 동작 플러그인: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 홈페이지: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It " -#| "will appear in the \"Compare With ...\" submenu. Then use \"Compare With" -#| "\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge " -#| "and choose \"3-way merge with base\" on the other branch which will be " -#| "used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It " -"will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on " -"the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and " -"choose \"3-way merge with base\" on the other branch which will be used as " -"destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"컨텍스트 메뉴 확장 기능 사용 방법:\n" -"두 선택된 파일을 단순히 비교하려면 \"비교\"를 누르십시오.\n" -"다른 파일이 다른 곳에 있으면 \"저장\"을 눌러서 파일을 기억해 두십시오. \"다음" -"과 비교...\" 하위 메뉴에 나타납니다. 그 다음 \"다음과 비교\"를 두 번째 파일에" -"서 누르십시오.\n" -"3중 결합을 사용하려면 기반 파일을 \"저장\"한 다음 합칠 브랜치를 저장하고 대" -"상 브랜치로 사용할 곳에서 \"기반이 있는 3중 결합\"을 선택하십시오.\n" -"디렉터리 비교와 결합에서도 같은 방법을 사용합니다." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "KDiff3 파일 항목 동작 플러그인 정보" Index: trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,50 +0,0 @@ -# Shinjo Park , 2014. -msgid "" -msgstr "" -"Project-Id-Version: desktop files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2014-03-03 03:59+0900\n" -"Last-Translator: Shinjo Park \n" -"Language-Team: Korean \n" -"Language: ko\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Diff/Patch 프론트엔드" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "파일과 디렉터리 비교 및 병합 도구" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "KDiff3으로 파일과 디렉터리를 비교하거나 병합합니다" - -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "KDiff3" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "파일과 디렉터리를 비교하거나 병합" Index: trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/ko/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4314 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Shinjo Park , 2014, 2015. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-13 08:57+0200\n" -"PO-Revision-Date: 2015-01-18 01:02+0900\n" -"Last-Translator: Shinjo Park \n" -"Language-Team: Korean \n" -"Language: ko\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Shinjo Park" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "kde@peremen.name" - -#. +> trunk5 -#: diff.cpp:259 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "클립보드 데이터를 임시 파일로 저장할 수 없습니다." - -#. +> trunk5 -#: diff.cpp:263 -#, kde-format -msgid "From Clipboard" -msgstr "클립보드에서" - -#. +> trunk5 -#: diff.cpp:556 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "닫는 따옴표 다음에 공백이 나올 것을 예상했습니다." - -#. +> trunk5 -#: diff.cpp:559 -#, kde-format -msgid "Not matching apostrophs." -msgstr "따옴표가 일치하지 않습니다." - -#. +> trunk5 -#: diff.cpp:581 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "인자 내에 예상하지 못한 따옴표가 있습니다." - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "No program specified." -msgstr "프로그램을 지정하지 않았습니다." - -#. +> trunk5 -#: diff.cpp:712 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"전처리가 실패한 것 같습니다. 다음 명령을 확인하십시오:\n" -"\n" -" %1\n" -"\n" -"전처리 명령을 비활성화합니다." - -#. +> trunk5 -#: diff.cpp:760 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"줄 일치 전처리가 실패한 것 같습니다. 다음 명령을 확인하십시오:\n" -"\n" -" %1\n" -"\n" -"줄 일치 전처리 명령을 비활성화합니다." - -#. +> trunk5 -#: difftextwindow.cpp:413 -#, kde-format -msgid "File %1: Line %2" -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:415 -#, fuzzy, kde-format -#| msgid "Line not available" -msgid "File %1: Line not available" -msgstr "줄을 사용할 수 없음" - -#. +> trunk5 -#: difftextwindow.cpp:1911 -#, kde-format -msgid "Encoding:" -msgstr "인코딩:" - -#. +> trunk5 -#: difftextwindow.cpp:1913 mergeresultwindow.cpp:3374 optiondialog.cpp:920 -#, kde-format -msgid "Line end style:" -msgstr "줄 끝 스타일:" - -#. +> trunk5 -#: difftextwindow.cpp:1943 -#, fuzzy, kde-format -#| msgid "Encoding:" -msgid "Encoding: %1" -msgstr "인코딩:" - -#. +> trunk5 -#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3419 -#, kde-format -msgid "Unix" -msgstr "유닉스" - -#. +> trunk5 -#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3420 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1944 -#, fuzzy, kde-format -#| msgid "Line end style:" -msgid "Line end style: %1" -msgstr "줄 끝 스타일:" - -#. +> trunk5 -#: difftextwindow.cpp:1966 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "맨 첫 줄" - -#. +> trunk5 -#: difftextwindow.cpp:1976 -#, kde-format -msgid "End" -msgstr "끝" - -#. +> trunk5 -#: difftextwindow.cpp:2051 smalldialogs.cpp:234 -#, fuzzy, kde-format -#| msgid "Opening files..." -msgid "Open File" -msgstr "파일 여는 중..." - -#. +> trunk5 -#: difftextwindow.cpp:2099 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "유니코드, 8비트" - -#. +> trunk5 -#: difftextwindow.cpp:2114 -#, kde-format -msgid "Other" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "해결되지 않음" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "해결됨" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "공백 아님" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "공백" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "A를 B로 복사" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "B를 A로 복사" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "A 삭제" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "B 삭제" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "A와 B 삭제" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "A로 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "B로 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "A와 B로 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "삭제(존재하는 경우)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1018 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "합치기(수동)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "오류: 일치하지 않는 파일 형식" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "오류: 변경 및 삭제됨" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "오류: 날짜가 일치하지만 파일이 일치하지 않습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgid "Done." -msgid "Done" -msgstr "완료." - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "오류" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "건너뜀." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "저장되지 않음." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "진행 중..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "할 일입니다." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "이름" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "작업" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "상태" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "링크와 일반 파일의 혼합입니다." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "링크: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "크기: " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "날짜와 크기: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "%1의 임시 복사본을 만들 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "%1을(를) 열 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "파일 비교 중..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "%1에서 읽는 중 오류 발생" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort " -"the merge and rescan the directory?" -msgstr "" -"디렉터리를 합치고 있습니다. 합치기 작업을 중단하고 디렉터리를 다시 탐색하시겠" -"습니까?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:342 pdiff.cpp:1033 pdiff.cpp:1924 pdiff.cpp:1934 -#, kde-format -msgid "Warning" -msgstr "경고" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "재탐색" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1035 -#, kde-format -msgid "Continue Merging" -msgstr "계속 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "디렉터리를 열 수 없음:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 A \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 B \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 C \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "디렉터리 열기 오류" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -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" -"계속하기 전에 확인하십시오." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "인자 경고" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "디렉터리 검사 중..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "디렉터리 A 읽는 중" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "디렉터리 B 읽는 중" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "디렉터리 C 읽는 중" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "다음의 일부 하위 디렉터리를 읽을 수 없음:" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "하위 디렉터리의 권한을 확인하십시오" - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1114 pdiff.cpp:1186 pdiff.cpp:1231 -#: pdiff.cpp:1247 pdiff.cpp:1290 pdiff.cpp:1312 -#, kde-format -msgid "Ready." -msgstr "준비." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" -msgid "Number of manual merges: %1" -msgstr "수동 합침 개수:" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "모든 합치기 동작에 영향을 줍니다." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "모든 합치기 동작 변경 중" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgid "Processing " -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "처리 중 " - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "이 작업을 진행할 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "작업을 진행할 수 없음" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "복사하는 중 오류가 발생했습니다.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "합치기 오류" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "알 수 없는 합치기 작업.(일어나서는 안 됨!)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "알 수 없는 합치기 작업." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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" -"이 프로그램은 베타 상태에 있으며 데이터 손실에 대하여 책임지지 않습니다! 중요" -"한 데이터는 백업 후 시작하십시오!" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "합치기 시작" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "진행" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "시뮬레이션" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "" -"The highlighted item has a different type in the different directories. " -"Select what to do." -msgstr "" -"강조한 항목은 다른 디렉터리에서 서로 다른 형식을 가지고 있습니다. 할 일을 선" -"택하십시오." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "" -"The modification dates of the file are equal but the files are not. Select " -"what to do." -msgstr "" -"파일의 수정한 날짜가 일치하지만 파일이 일치하지 않습니다. 할 일을 선택하십시" -"오." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "" -"The highlighted item was changed in one directory and deleted in the other. " -"Select what to do." -msgstr "" -"강조한 항목은 한 쪽 디렉터리에서 변경되었고 다른 쪽에서 삭제되었습니다. 할 일" -"을 선택하십시오." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "" -"This operation is currently not possible because directory merge is " -"currently running." -msgstr "디렉터리 합치기 작업이 진행 중이므로 이 작업을 사용할 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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" -"오류가 발생한 항목에서 계속 진행하시겠습니까? 아니면 이 항목을 건너뛰겠습니" -"까?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "오류 발생 후 합치기 계속 진행" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "마지막 항목에서 진행" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "항목 건너뛰기" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "합치기 작업 완료." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "합치기 완료됨" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." -msgstr "합치기 시뮬레이션 완료됨: 제안하는 변경 사항이 올바르면 선택하십시오." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "오류가 발생했습니다. 확인을 누르면 자세한 정보를 볼 수 있습니다.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "%1 삭제 중 오류: 백업을 만들 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "디렉터리를 재귀적으로 삭제(%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "삭제(%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "오류: 디렉터리를 삭제하기 위해서 읽는 중 오류가 발생했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "오류: rmdir(%1) 작업이 실패했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "오류: 삭제 작업이 실패했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "수동 합치기(%1, %2, %3 -> %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid "" -" Note: After a manual merge the user should continue by pressing F7." -msgstr " 메모: 수동 합치기 이후 계속 진행하려면 F7 키를 누르십시오." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"오류: copy(%1 -> %2) 작업이 실패했습니다. 존재하는 대상을 삭제할 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "copyLink( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "오류: copyLink 작업이 실패했습니다. 원격 링크는 지원하지 않습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "오류: copyLink 작업이 실패했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "copy( %1 -> %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" -"rename(%1 -> %2) 작업 중 오류 발생: 존재하는 대상을 삭제할 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "rename(%1 -> %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "오류: 이름 변경이 실패했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" -"makeDir %1 작업 중 오류가 발생했습니다. 존재하는 파일은 삭제할 수 없습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "makeDir(%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "디렉터리를 만드는 중 오류가 발생했습니다." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "대상" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "디렉터리" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "종류" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "크기" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "속성" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "마지막 수정" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "링크 대상" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "사용할 수 없음" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (대상): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (기반): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (대상): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (대상): " - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "대상: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "디렉터리 합치기 상태를 다른 이름으로 저장..." - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "디렉터리 합치기 시작/계속 진행" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "현재 항목의 작업 실행" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "선택한 파일 비교" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "현재 파일 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"파일\n" -"합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "모든 하위 디렉터리 접기" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "모든 하위 디렉터리 풀기" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "모든 항목에서 A 선택" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "모든 항목에서 B 선택" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "모든 항목에서 C 선택" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "모든 항목에서 작업 자동 선택" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "모든 항목에서 작업 진행하지 않음" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "같은 파일 보이기" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"같은\n" -"파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "다른 파일 보이기" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "A에만 있는 파일 보이기" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"A에만 있는\n" -"파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "B에만 있는 파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"B에만 있는\n" -"파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "C에만 있는 파일 보이기" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"C에만 있는\n" -"파일" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "명시적으로 선택한 파일만 비교" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "명시적으로 선택한 파일만 합치기" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "아무것도 하지 않음" - -#. +> trunk5 -#: directorymergewindow.cpp:3660 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: directorymergewindow.cpp:3661 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: directorymergewindow.cpp:3662 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "A와 B 삭제" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "A와 B로 합치기" - -#. +> trunk5 -#: fileaccess.cpp:948 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" -"파일 이름: " - -#. +> trunk5 -#: fileaccess.cpp:955 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" -"파일 이름: " - -#. +> trunk5 -#: fileaccess.cpp:979 -#, kde-format -msgid "Getting file status: %1" -msgstr "파일 상태 가져오는 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1021 -#, kde-format -msgid "Reading file: %1" -msgstr "파일 읽는 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1059 -#, kde-format -msgid "Writing file: %1" -msgstr "파일에 쓰는 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1087 -#, kde-format -msgid "Out of memory" -msgstr "메모리 부족" - -#. +> trunk5 -#: fileaccess.cpp:1122 -#, kde-format -msgid "Making directory: %1" -msgstr "디렉터리 만드는 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1142 -#, kde-format -msgid "Removing directory: %1" -msgstr "디렉터리 삭제 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1157 -#, kde-format -msgid "Removing file: %1" -msgstr "파일 삭제 중: %1" - -#. +> trunk5 -#: fileaccess.cpp:1173 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "심볼릭 링크 만드는 중: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1201 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "파일 이름 변경 중: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1233 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "파일 복사 중: %1 -> %2" - -#. +> trunk5 -#: fileaccess.cpp:1247 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: " -"%1" -msgstr "파일 복사 작업 오류: 파일을 읽기 위해 열 수 없습니다. 파일 이름: %1" - -#. +> trunk5 -#: fileaccess.cpp:1253 -#, kde-format -msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: " -"%1" -msgstr "파일 복사 작업 오류: 파일에 쓰기 위해 열 수 없습니다. 파일 이름: %1" - -#. +> trunk5 -#: fileaccess.cpp:1265 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "파일 복사 작업 오류: 읽기 오류. 파일 이름: %1" - -#. +> trunk5 -#: fileaccess.cpp:1274 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "파일 복사 작업 오류: 쓰기 오류. 파일 이름: %1" - -#. +> trunk5 -#: fileaccess.cpp:1557 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "디렉터리 읽는 중: " - -#. +> trunk5 -#: fileaccess.cpp:1678 -#, kde-format -msgid "Listing directory: %1" -msgstr "디렉터리 항목 가져오는 중: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "현재 설정:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "설정 옵션 오류:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "--auto 옵션을 지정했지만 출력 파일을 지정하지 않았습니다." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "디렉터리 비교 시 --auto 옵션을 무시합니다." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "저장 실패." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1096 pdiff.cpp:1167 -#, kde-format -msgid "Opening of these files failed:" -msgstr "다음 파일을 여는 데 실패했습니다:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "파일 열기 오류" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "비교할 문서 열기..." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "새로 고침" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "합친 결과를 저장합니다. 모든 충돌 사항을 해결해야 합니다!" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "현재 문서를 다른 이름으로 저장..." - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "차이점 인쇄" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "프로그램 종료" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "선택한 부분을 잘라내고 클립보드에 저장" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "선택한 부분을 클립보드에 복사" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "현재 위치에 클립보드 내용 붙여넣기" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "현재 창의 모든 내용 선택" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "문자열 찾기" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "문자열 다시 찾기" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "상태 표시줄 보이기/숨기기" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "KDiff3 설정..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "현재 차이점으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"현재\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "첫 차이점으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"첫\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "마지막 차이점으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"마지막\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(\"공백 문자 표시\" 설정을 사용하지 않으면 공백을 건너뜁니다.)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "" -"(Does not skip white space differences even when \"Show White Space\" is " -"disabled.)" -msgstr "(\"공백 문자 표시\" 설정을 사용하지 않아도 공백을 건너뛰지 않습니다.)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "이전 차이점으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"이전\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "다음 차이점으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"다음\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "이전 충돌 항목으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"이전\n" -"충돌" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "다음 충돌 항목으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"다음\n" -"충돌" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "이전 해결하지 않은 충돌 항목으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"이전\n" -"미해결" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "다음 해결하지 않은 충돌 항목으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"다음\n" -"미해결" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "A에서 줄 선택" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"A\n" -"선택" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "B에서 줄 선택" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"B\n" -"선택" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "C에서 줄 선택" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"C\n" -"선택" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "원본 선택 후 자동으로 해결되지 않은 충돌 항목으로 이동" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"자동\n" -"다음" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "공백 및 탭 문자 차이점 보기" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"공백\n" -"문자" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "공백 문자 표시" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"공백\n" -"차이점" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "줄 번호 표시" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"줄\n" -"번호" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "항상 A 선택" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "항상 B 선택" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "항상 C 선택" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "모든 해결하지 않은 충돌 항목에서 A 선택" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "모든 해결하지 않은 충돌 항목에서 B 선택" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "모든 해결하지 않은 충돌 항목에서 C 선택" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 A 선택" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 B 선택" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 C 선택" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "간단한 충돌 자동으로 해결" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "충돌 항목의 차이점 설정" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "정규 표현식 자동 합치기 실행" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "과거에 해결했던 충돌 자동으로 해결" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "선택 항목에서 차이점 나누기" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "선택한 변경 사항 합치기" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "창 A 표시" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "창 B 표시" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "창 C 표시" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "일반 요약 보기" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "A 대 B 요약 보기" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "A 대 C 요약 보기" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "B 대 C 요약 보기" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "차이점 창 워드랩 사용" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "수동 Diff 정렬 추가" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "모든 수동 Diff 정렬 삭제" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "다음 창에 초점 맞추기" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "이전 창에 초점 맞추기" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "나누기 방향 전환" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "디렉터리와 텍스트로 화면 나누어 보기" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "디렉터리와 텍스트 보기 간 전환" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1923 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "합친 결과를 저장하지 않았습니다." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "저장하고 끝내기" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "저장하지 않고 끝내기" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1934 -#, kde-format -msgid "Saving the merge result failed." -msgstr "합친 결과를 저장할 수 없습니다." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1032 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "디렉터리를 합치고 있습니다. 이대로 중단하시겠습니까?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "파일 저장하는 중..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "새 파일이름으로 파일 저장하는 중..." - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "다른 이름으로 저장..." - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "인쇄는 구현되지 않았습니다." - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "인쇄 중..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -#| msgid "Selection" -msgid " (Selection)" -msgstr "선택" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "인쇄가 완료되었습니다." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "인쇄가 중단되었습니다." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "종료 중..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "도구 모음 전환 중..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "상태 표시줄 전환 중..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "비교할 파일을 찾을 수 없습니다." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "KDiff3(&K)" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "KDiff3 설정" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:112 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-" -"file in the source package for details." -msgstr "" -"KDiff3 부분을 초기화할 수 없습니다.\n" -"설치 문제일 수도 있습니다. 원본 코드 패키지의 README 파일을 참고하십시오." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "파일(&F)" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "디렉터리(&D)" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "현재 항목 합치기 작업" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "현재 항목 동기화 작업" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, kde-format -msgid "&Movement" -msgstr "이동(&M)" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "차이 보기(&I)" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, kde-format -msgid "&Merge" -msgstr "합치기(&M)" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "창(&W)" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "주 도구 모음" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "무시함.(사용자 지정)" - -#. +> trunk5 -#: main.cpp:118 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "파일과 디렉터리를 비교하고 합치는 도구" - -#. +> trunk5 -#: main.cpp:119 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:138 -#, kde-format -msgid "Merge the input." -msgstr "입력을 합칩니다." - -#. +> trunk5 -#: main.cpp:139 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "명시적인 기반 파일. 일부 도구와 호환성을 위해 사용합니다." - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "출력 파일. -m을 암시합니다. 예: -o newfile.txt" - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "출력 파일, 또 다시.(일부 도구와 호환성을 위해 사용합니다.)" - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" -"모든 충돌 사항을 자동적으로 해결할 수 있는 경우 GUI 사용 안 함(-o file 필요)" - -#. +> trunk5 -#: main.cpp:143 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Do not solve conflicts automatically." -msgstr "충돌 사항을 자동으로 해결하지 않습니다.(호환성 옵션)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "입력 파일 1(기반)에 대한 표시 이름 대체입니다." - -#. +> trunk5 -#: main.cpp:145 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "입력 파일 2에 대한 표시 이름 대체입니다." - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "입력 파일 3에 대한 표시 이름 대체입니다." - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "대안 표시 이름 대체입니다. 입력 파일마다 하나씩 지정하십시오." - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "" -"Override a config setting. Use once for every setting. E.g.: --cs " -"\"AutoAdvance=1\"" -msgstr "" -"설정 옵션을 재정의합니다. 설정마다 하나씩 사용하십시오. 예: --cs " -"\"AutoAdvance=1\"" - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "설정 옵션과 현재 값을 표시합니다." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "Use a different config file." -msgstr "다른 설정 파일을 사용합니다." - -#. +> trunk5 -#: main.cpp:153 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "열 파일 1(--base로 지정하지 않은 경우의 기반)" - -#. +> trunk5 -#: main.cpp:154 -#, kde-format -msgid "file2 to open" -msgstr "열 파일 2" - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file3 to open" -msgstr "열 파일 3" - -#. +> trunk5 -#: mergeresultwindow.cpp:159 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "남은 해결하지 않은 충돌 항목: %1(공백 %2개 포함)" - -#. +> trunk5 -#: mergeresultwindow.cpp:340 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"출력 파일이 수정되었습니다.\n" -"계속 진행하면 변경 사항을 저장하지 않습니다." - -#. +> trunk5 -#: mergeresultwindow.cpp:904 pdiff.cpp:776 -#, kde-format -msgid "All input files are binary equal." -msgstr "모든 입력 파일의 바이너리가 같습니다." - -#. +> trunk5 -#: mergeresultwindow.cpp:906 -#, kde-format -msgid "All input files contain the same text." -msgstr "모든 입력 파일의 텍스트가 같습니다." - -#. +> trunk5 -#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 -#: mergeresultwindow.cpp:918 pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "파일 %1와(과) %2의 바이너리가 동일합니다.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 -#: mergeresultwindow.cpp:920 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "파일 %1와(과) %2의 텍스트가 동일합니다.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:926 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:932 -#, kde-format -msgid "Conflicts" -msgstr "충돌" - -#. +> trunk5 -#: mergeresultwindow.cpp:1835 -#, kde-format -msgid "" -msgstr "<원본 줄 없음>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1843 -#, kde-format -msgid "" -msgstr "<충돌 합치기(공백만>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1845 mergeresultwindow.cpp:2704 -#, kde-format -msgid "" -msgstr "<충돌 합치기>" - -#. +> trunk5 -#: mergeresultwindow.cpp:2916 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"모든 충돌 사항을 해결하지 않았습니다.\n" -"파일을 저장하지 않았습니다.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2918 mergeresultwindow.cpp:2927 -#, kde-format -msgid "Conflicts Left" -msgstr "충돌 사항 남음" - -#. +> trunk5 -#: mergeresultwindow.cpp:2925 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style " -#| "manually.\n" -#| "File not saved.\n" -msgid "" -"There is a line end style conflict. Please choose the line end style " -"manually.\n" -"File not saved." -msgstr "" -"줄 끝 스타일이 충돌합니다. 줄 끝 스타일을 직접 선택하십시오.\n" -"파일을 저장하지 않았습니다.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2939 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"백업을 만들 수 없습니다. 파일을 저장하지 않았습니다." - -#. +> trunk5 -#: mergeresultwindow.cpp:2939 mergeresultwindow.cpp:2987 -#, kde-format -msgid "File Save Error" -msgstr "파일 저장 오류" - -#. +> trunk5 -#: mergeresultwindow.cpp:2987 -#, kde-format -msgid "Error while writing." -msgstr "쓰는 중 오류가 발생했습니다." - -#. +> trunk5 -#: mergeresultwindow.cpp:3347 -#, fuzzy, kde-format -#| msgid "Output" -msgid "Output:" -msgstr "출력" - -#. +> trunk5 -#: mergeresultwindow.cpp:3359 mergeresultwindow.cpp:3550 -#, kde-format -msgid "[Modified]" -msgstr "[수정됨]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3366 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "저장 인코딩" - -#. +> trunk5 -#: mergeresultwindow.cpp:3465 -#, kde-format -msgid "Conflict" -msgstr "충돌" - -#. +> trunk5 -#: mergeresultwindow.cpp:3497 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from A: %1" -msgstr "다음의 코덱" - -#. +> trunk5 -#: mergeresultwindow.cpp:3499 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from B: %1" -msgstr "다음의 코덱" - -#. +> trunk5 -#: mergeresultwindow.cpp:3501 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from C: %1" -msgstr "다음의 코덱" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "유니코드" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "비 ASCII 문자가 올바르게 보이지 않으면 변경하십시오." - -#. +> trunk5 -#: optiondialog.cpp:614 -#, kde-format -msgid "Configure" -msgstr "설정" - -#. +> trunk5 -#: optiondialog.cpp:691 -#, kde-format -msgid "Font" -msgstr "글꼴" - -#. +> trunk5 -#: optiondialog.cpp:693 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "편집기와 Diff 출력 글꼴" - -#. +> trunk5 -#: optiondialog.cpp:711 -#, kde-format -msgid "Application font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:715 -#, fuzzy, kde-format -#| msgid "File Save Error" -msgid "File view font" -msgstr "파일 저장 오류" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Color" -msgstr "색" - -#. +> trunk5 -#: optiondialog.cpp:734 -#, kde-format -msgid "Colors Settings" -msgstr "색 설정" - -#. +> trunk5 -#: optiondialog.cpp:751 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "편집기와 차이점 보기:" - -#. +> trunk5 -#: optiondialog.cpp:759 -#, kde-format -msgid "Foreground color:" -msgstr "글자색:" - -#. +> trunk5 -#: optiondialog.cpp:766 -#, kde-format -msgid "Background color:" -msgstr "배경색:" - -#. +> trunk5 -#: optiondialog.cpp:775 -#, kde-format -msgid "Diff background color:" -msgstr "Diff 배경색:" - -#. +> trunk5 -#: optiondialog.cpp:783 -#, kde-format -msgid "Color A:" -msgstr "색 A:" - -#. +> trunk5 -#: optiondialog.cpp:791 -#, kde-format -msgid "Color B:" -msgstr "색 B:" - -#. +> trunk5 -#: optiondialog.cpp:799 -#, kde-format -msgid "Color C:" -msgstr "색 C:" - -#. +> trunk5 -#: optiondialog.cpp:806 -#, kde-format -msgid "Conflict color:" -msgstr "충돌 색:" - -#. +> trunk5 -#: optiondialog.cpp:814 -#, kde-format -msgid "Current range background color:" -msgstr "현재 범위 배경색:" - -#. +> trunk5 -#: optiondialog.cpp:822 -#, kde-format -msgid "Current range diff background color:" -msgstr "현재 범위 Diff 배경색:" - -#. +> trunk5 -#: optiondialog.cpp:829 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "수동으로 정렬한 차이점 범위 색:" - -#. +> trunk5 -#: optiondialog.cpp:835 -#, kde-format -msgid "Directory Comparison View:" -msgstr "디렉터리 비교 보기:" - -#. +> trunk5 -#: optiondialog.cpp:841 -#, kde-format -msgid "Newest file color:" -msgstr "가장 새로운 파일 색:" - -#. +> trunk5 -#: optiondialog.cpp:845 -#, kde-format -msgid "" -"Changing this color will only be effective when starting the next directory " -"comparison." -msgstr "이 색을 변경하면 다음 디렉터리 비교부터 적용됩니다." - -#. +> trunk5 -#: optiondialog.cpp:850 -#, kde-format -msgid "Oldest file color:" -msgstr "가장 오래된 파일 색:" - -#. +> trunk5 -#: optiondialog.cpp:858 -#, kde-format -msgid "Middle age file color:" -msgstr "보통 시기 파일 색:" - -#. +> trunk5 -#: optiondialog.cpp:866 -#, kde-format -msgid "Color for missing files:" -msgstr "없는 파일 색:" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor" -msgstr "편집기" - -#. +> trunk5 -#: optiondialog.cpp:880 -#, kde-format -msgid "Editor Behavior" -msgstr "편집기 행동" - -#. +> trunk5 -#: optiondialog.cpp:893 -#, kde-format -msgid "Tab inserts spaces" -msgstr "탭을 눌렀을 때 공백 삽입" - -#. +> trunk5 -#: optiondialog.cpp:896 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"사용: 탭을 누르면 해당하는 만큼 공백을 삽입합니다.\n" -"사용 안 함: 탭 문자를 삽입합니다." - -#. +> trunk5 -#: optiondialog.cpp:901 -#, kde-format -msgid "Tab size:" -msgstr "탭 크기:" - -#. +> trunk5 -#: optiondialog.cpp:907 -#, kde-format -msgid "Auto indentation" -msgstr "자동 들여쓰기" - -#. +> trunk5 -#: optiondialog.cpp:910 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "사용: 이전 줄의 들여쓰기를 새 줄에도 적용합니다.\n" - -#. +> trunk5 -#: optiondialog.cpp:913 -#, kde-format -msgid "Auto copy selection" -msgstr "자동 선택 복사" - -#. +> trunk5 -#: optiondialog.cpp:916 -#, kde-format -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"사용: 선택한 항목을 자동으로 클립보드에 복사합니다.\n" -"사용 안 함: Ctrl-C 키를 누르는 것과 같이 명시적으로 복사해야 합니다." - -#. +> trunk5 -#: optiondialog.cpp:930 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"편집한 파일을 저장할 때 줄 끝을 지정합니다.\n" -"DOS/Windows: CR+LF, UNIX: LF. CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff" -msgstr "Diff" - -#. +> trunk5 -#: optiondialog.cpp:941 -#, kde-format -msgid "Diff Settings" -msgstr "Diff 설정" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:965 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore numbers (treat as white space)" -msgstr "공백으로 취급합니다." - -#. +> trunk5 -#: optiondialog.cpp:968 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore " -"white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"줄 일치 과정에서 숫자에 해당하는 문자를 무시합니다.(공백 무시와 비슷함)\n" -"숫자 데이터가 포함된 파일을 비교할 때 사용할 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:972 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "C/C++ 주석을 공백으로 취급합니다." - -#. +> trunk5 -#: optiondialog.cpp:974 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "C/C++ 주석을 공백으로 취급합니다." - -#. +> trunk5 -#: optiondialog.cpp:977 -#, fuzzy, kde-format -#| msgid "Treat as white space." -msgid "Ignore case (treat as white space)" -msgstr "공백으로 취급합니다." - -#. +> trunk5 -#: optiondialog.cpp:980 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "대소문자 차이를 공백 차이로 취급합니다.('a'<=>'A')" - -#. +> trunk5 -#: optiondialog.cpp:983 -#, kde-format -msgid "Preprocessor command:" -msgstr "전처리기 명령:" - -#. +> trunk5 -#: optiondialog.cpp:987 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "사용자 지정 전처리입니다.(자세한 사항은 문서를 참고하십시오)" - -#. +> trunk5 -#: optiondialog.cpp:990 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "줄 일치 전처리 명령:" - -#. +> trunk5 -#: optiondialog.cpp:994 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"이 전처리기는 줄 일치에만 사용합니다.\n" -"(자세한 사항은 문서를 참고하십시오.)" - -#. +> trunk5 -#: optiondialog.cpp:997 -#, kde-format -msgid "Try hard (slower)" -msgstr "더 자세히 비교(느림)" - -#. +> trunk5 -#: optiondialog.cpp:1000 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"외부 diff 실행 시 --minimal 옵션을 사용합니다.\n" -"큰 파일 비교가 느려질 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:1004 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "입력 파일이 3개일 때 B와 C 정렬" - -#. +> trunk5 -#: optiondialog.cpp:1007 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"세 개의 입력 파일을 비교하거나 합칠 때 B와 C로 정렬을 시도합니다.\n" -"합칠 때에는 더 복잡해질 수 있으므로 합칠 때에는 추천하지 않습니다.\n" -"(기본값으로 비활성화됨.)" - -#. +> trunk5 -#: optiondialog.cpp:1019 -#, kde-format -msgid "Merge Settings" -msgstr "합치기 설정" - -#. +> trunk5 -#: optiondialog.cpp:1033 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "자동 진행 지연 시간(ms):" - -#. +> trunk5 -#: optiondialog.cpp:1038 -#, kde-format -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 "" -"자동 진행 모드에서는 현재 선택 결과를 지정한 시간 동안 표시한 다음\n" -"다음 충돌 항목으로 이동합니다. 범위: 0-2000ms" - -#. +> trunk5 -#: optiondialog.cpp:1042 -#, kde-format -msgid "Show info dialogs" -msgstr "정보 대화 상자 보이기" - -#. +> trunk5 -#: optiondialog.cpp:1044 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "충돌 개수 정보 대화 상자를 표시합니다." - -#. +> trunk5 -#: optiondialog.cpp:1047 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "공백만 변경되었을 때 2개 파일 합치기 기본값:" - -#. +> trunk5 -#: optiondialog.cpp:1051 optiondialog.cpp:1063 -#, kde-format -msgid "Manual Choice" -msgstr "수동 선택" - -#. +> trunk5 -#: optiondialog.cpp:1055 optiondialog.cpp:1068 -#, kde-format -msgid "" -"Allow the merge algorithm to automatically select an input for white-space-" -"only changes." -msgstr "" -"공백만 변경되었을 때 합치기 알고리즘에서 입력을 자동으로 선택하도록 허용합니" -"다." - -#. +> trunk5 -#: optiondialog.cpp:1059 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "공백만 변경되었을 때 3개 파일 합치기 기본값:" - -#. +> trunk5 -#: optiondialog.cpp:1072 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "자동 합치기 정규 표현식" - -#. +> trunk5 -#: optiondialog.cpp:1080 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "자동 합치기 정규 표현식:" - -#. +> trunk5 -#: optiondialog.cpp:1084 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one " -"source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"KDiff3에서 자동으로 하나의 원본을 선택할 때 사용할 정규 표현식입니다.\n" -"충돌이 발생한 줄이 정규 표현식과 일치하는 경우\n" -"C를 선택하고, 그렇지 않으면 B를 선택합니다." - -#. +> trunk5 -#: optiondialog.cpp:1090 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "합치기를 시작할 때 정규 표현식 실행" - -#. +> trunk5 -#: optiondialog.cpp:1092 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"합치기 작업을 시작할 때 자동 합치기\n" -"정규 표현식으로 합치기를 실행합니다.\n" - -#. +> trunk5 -#: optiondialog.cpp:1097 -#, kde-format -msgid "Version Control History Merging" -msgstr "버전 관리 역사 합치기" - -#. +> trunk5 -#: optiondialog.cpp:1105 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "역사 시작 정규 표현식:" - -#. +> trunk5 -#: optiondialog.cpp:1109 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"버전 관리 역사 항목의 시작을 나타내는 정규 표현식입니다.\n" -"대개 이 줄은 \"$Log$\" 키워드를 포함합니다.\n" -"기본값: \".*\\$Log.*\\$.*\"" - -#. +> trunk5 -#: optiondialog.cpp:1115 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "역사 항목 시작 정규 표현식:" - -#. +> trunk5 -#: optiondialog.cpp:1127 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading " -"comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history " -"entries.\n" -"See the documentation for details." -msgstr "" -"버전 관리 역사 항목은 여러 줄로 이루어져 있습니다.\n" -"시작 주석이 없는 첫 번째 항목을 확인하기 위한 정규 표현식을 지정하십시오.\n" -"정렬에 사용할 키 그룹은 괄호로 지정하십시오.\n" -"비어 있으면 KDiff3은 빈 줄로 역사 항목을 구분하는 것으로 간주합니다.\n" -"자세한 사항은 문서를 참고하십시오." - -#. +> trunk5 -#: optiondialog.cpp:1135 -#, kde-format -msgid "History merge sorting" -msgstr "역사 합치기 정렬" - -#. +> trunk5 -#: optiondialog.cpp:1137 -#, kde-format -msgid "Sort version control history by a key." -msgstr "버전 관리 역사를 키를 기준으로 정렬합니다." - -#. +> trunk5 -#: optiondialog.cpp:1147 -#, kde-format -msgid "History entry start sort key order:" -msgstr "버전 관리 시작 정렬 키 순서:" - -#. +> trunk5 -#: optiondialog.cpp:1151 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history " -"start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"버전 관리 항목 시작 그룹의 각각 괄호에 둘러싸인 항목은 정렬에 사용할\n" -"키를 지정합니다.\n" -"맨 첫 번째 일치 항목을 1에서 시작하여 키 순서를 쉼표로 구분한 목록으로\n" -"입력하십시오. (예: \"4,5,6,1,2,3,7\")\n" -"비어 있으면 정렬하지 않습니다.\n" -"자세한 사항은 문서를 참고하십시오." - -#. +> trunk5 -#: optiondialog.cpp:1162 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "합치기를 시작할 때 버전 관리 역사 합치기" - -#. +> trunk5 -#: optiondialog.cpp:1164 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "합치기를 시작할 때 자동으로 버전 관리 역사를 합칩니다." - -#. +> trunk5 -#: optiondialog.cpp:1168 -#, kde-format -msgid "Max number of history entries:" -msgstr "최대 역사 항목 수:" - -#. +> trunk5 -#: optiondialog.cpp:1171 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "지정한 개수를 초과하는 항목은 잘라냅니다. -1은 제한을 두지 않습니다." - -#. +> trunk5 -#: optiondialog.cpp:1175 -#, kde-format -msgid "Test your regular expressions" -msgstr "정규 표현식을 시험해 보십시오" - -#. +> trunk5 -#: optiondialog.cpp:1180 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "관계 없는 합침 명령:" - -#. +> trunk5 -#: optiondialog.cpp:1184 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"자동 합치기가 끝난 후 합칠 항목이\n" -"더 이상 존재하지 않으면 지정한 스크립트를 실행합니다.\n" -"다음 인자로 호출합니다: filename1 filename2 filename3" - -#. +> trunk5 -#: optiondialog.cpp:1189 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "충돌하지 않고 합쳐졌을 때 자동으로 저장하고 끝내기" - -#. +> trunk5 -#: optiondialog.cpp:1192 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and " -"quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"KDiff3이 명령행에서 파일 합치기 작업으로 시작되었고 모든\n" -"변경 사항이 사용자 확인 없이 진행 가능하면 자동으로 저장하고 끝냅니다.\n" -"(명령행 옵션 \"--auto\"와 비슷합니다.)" - -#. +> trunk5 -#: optiondialog.cpp:1203 optiondialog.cpp:1204 -#, kde-format -msgid "Directory" -msgstr "디렉터리" - -#. +> trunk5 -#: optiondialog.cpp:1216 -#, kde-format -msgid "Recursive directories" -msgstr "재귀적 디렉터리" - -#. +> trunk5 -#: optiondialog.cpp:1218 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "하위 디렉터리를 분석할 지 여부입니다." - -#. +> trunk5 -#: optiondialog.cpp:1220 -#, kde-format -msgid "File pattern(s):" -msgstr "파일 패턴:" - -#. +> trunk5 -#: optiondialog.cpp:1225 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"분석할 파일 패턴입니다.\n" -"와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:1230 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "파일 제외 패턴:" - -#. +> trunk5 -#: optiondialog.cpp:1235 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"분석할 파일에서 제외할 패턴입니다.\n" -"와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:1240 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "디렉터리 제외 패턴:" - -#. +> trunk5 -#: optiondialog.cpp:1245 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"분석할 디렉터리에서 제외할 패턴입니다.\n" -"와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:1250 -#, kde-format -msgid "Use .cvsignore" -msgstr ".cvsisnore 사용" - -#. +> trunk5 -#: optiondialog.cpp:1253 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"CVS에서 무시하는 파일을 제외합니다.\n" -"디렉터리별로 \".cvsignore\" 파일을 다르게 지정할 수 있습니다." - -#. +> trunk5 -#: optiondialog.cpp:1257 -#, kde-format -msgid "Find hidden files and directories" -msgstr "숨은 파일과 디렉터리 찾기" - -#. +> trunk5 -#: optiondialog.cpp:1260 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "숨김 속성이 있는 파일과 디렉터리를 찾습니다." - -#. +> trunk5 -#: optiondialog.cpp:1262 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "'.'으로 시작하는 파일과 디렉터리를 찾습니다." - -#. +> trunk5 -#: optiondialog.cpp:1266 -#, kde-format -msgid "Follow file links" -msgstr "파일 링크 따라가기" - -#. +> trunk5 -#: optiondialog.cpp:1269 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"사용: 링크가 가리키는 곳의 파일을 따라갑니다.\n" -"사용 안 함: 링크 자체를 비교합니다." - -#. +> trunk5 -#: optiondialog.cpp:1273 -#, kde-format -msgid "Follow directory links" -msgstr "디렉터리 링크 따라가기" - -#. +> trunk5 -#: optiondialog.cpp:1276 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"사용: 링크가 가리키는 곳의 디렉터리를 따라갑니다.\n" -"사용 안 함: 링크 자체를 비교합니다." - -#. +> trunk5 -#: optiondialog.cpp:1291 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "파일 이름 비교 시 대소문자 구분" - -#. +> trunk5 -#: optiondialog.cpp:1294 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names " -"match.\n" -"Set this option if the case of the names must match. (Default for Windows is " -"off, otherwise on.)" -msgstr "" -"디렉터리 비교 기능은 이름이 일치하는 파일과 디렉터리를 비교합니다.\n" -"이름의 대소문자가 반드시 일치해야 하면 이 옵션을 선택하십시오. (Windows에서" -"는 꺼짐, 기타 플랫폼에서는 켜짐)" - -#. +> trunk5 -#: optiondialog.cpp:1298 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" -msgid "Unfold all subdirectories on load" -msgstr "모든 하위 디렉터리 풀기" - -#. +> trunk5 -#: optiondialog.cpp:1301 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1305 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1308 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1312 -#, kde-format -msgid "File Comparison Mode" -msgstr "파일 비교 모드" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison" -msgstr "바이너리 비교" - -#. +> trunk5 -#: optiondialog.cpp:1318 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "각각 파일의 바이너리 비교를 수행합니다.(기본값)" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "Full analysis" -msgstr "완전 분석" - -#. +> trunk5 -#: optiondialog.cpp:1322 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"완전 분석을 수행하여 추가 열에 통계 정보를 표시합니다.\n" -"(바이너리 비교보다 느리며 바이너리 파일에서는 더 느립니다)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "크기와 수정한 날짜 무시하기(안전하지 않음)" - -#. +> trunk5 -#: optiondialog.cpp:1327 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"Files with equal contents but different modification dates will appear as " -"different.\n" -"Useful for big directories or slow networks." -msgstr "" -"파일 크기와 수정한 날짜가 같으면 파일을 같은 것으로 취급합니다.\n" -"내용이 같지만 수정한 날짜가 다른 파일은 다른 파일로 나타납니다.\n" -"큰 디렉터리나 느린 네트워크에서 유용합니다." - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Trust the size and date, but use binary comparison if date does not match " -"(unsafe)" -msgstr "" -"크기와 수정한 날짜를 무시하지만 날짜가 다르면 바이너리 비교 사용(안전하지 않" -"음)" - -#. +> trunk5 -#: optiondialog.cpp:1333 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"파일 크기와 수정한 날짜가 같으면 파일을 같은 것으로 취급합니다\n" -"수정한 날짜가 다른 파일은 바이너리 비교를 수행합니다.\n" -"큰 디렉터리나 느린 네트워크에서 유용합니다." - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "크기 건너뛰기(안전하지 않음)" - -#. +> trunk5 -#: optiondialog.cpp:1339 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during " -"download." -msgstr "" -"파일 크기가 같은 파일은 같은 파일로 취급합니다.\n" -"날짜가 다운로드 중 수정된 큰 디렉터리나 느린 네트워크에서 유용합니다." - -#. +> trunk5 -#: optiondialog.cpp:1346 -#, kde-format -msgid "Synchronize directories" -msgstr "디렉터리 동기화" - -#. +> trunk5 -#: optiondialog.cpp:1349 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"양쪽 디렉터리에 모두 파일을 저장하여\n" -"작업 이후 디렉터리의 내용을 동일하게 유지합니다.\n" -"대상을 지정하지 않고 두 디렉터리를 비교할 때만 작동합니다." - -#. +> trunk5 -#: optiondialog.cpp:1355 -#, kde-format -msgid "White space differences considered equal" -msgstr "공백 문자 변경을 같은 것으로 취급" - -#. +> trunk5 -#: optiondialog.cpp:1358 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"파일이 공백 문자만 다르면 같은 것으로 취급합니다.\n" -"완전 분석을 선택했을 때만 사용합니다." - -#. +> trunk5 -#: optiondialog.cpp:1364 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "합치는 대신 새 파일 복사(안전하지 않음)" - -#. +> trunk5 -#: optiondialog.cpp:1367 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"파일의 내용을 보지 않고 새 파일을 복사합니다.\n" -"(하고 있는 일이 무엇인지 알 때만 사용하십시오!)\n" -"두 디렉터리를 비교할 때만 사용합니다." - -#. +> trunk5 -#: optiondialog.cpp:1372 -#, kde-format -msgid "Backup files (.orig)" -msgstr "파일 백업(.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1375 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"기존 파일의 내용을 변경하여 저장하는 경우, 기존 파일은\n" -"삭제되지 않고 '.orig' 확장자가 추가되어 저장됩니다." - -#. +> trunk5 -#: optiondialog.cpp:1451 optiondialog.cpp:1452 -#, kde-format -msgid "Regional Settings" -msgstr "지역 설정" - -#. +> trunk5 -#: optiondialog.cpp:1466 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "모든 것에 동일한 인코딩 사용:" - -#. +> trunk5 -#: optiondialog.cpp:1469 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"이 옵션을 사용하면 첫 인코딩을 변경했을 때 모든 인코딩을 변경합니다.\n" -"개별 설정이 필요하면 비활성화 시키십시오." - -#. +> trunk5 -#: optiondialog.cpp:1473 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "메모: 현재 로컬 인코딩: " - -#. +> trunk5 -#: optiondialog.cpp:1477 -#, kde-format -msgid "File Encoding for A:" -msgstr "파일 A 인코딩:" - -#. +> trunk5 -#: optiondialog.cpp:1483 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"이 옵션을 사용하면 유니코드(UTF-16, UTF-8) 인코딩을 자동으로 감지합니다.\n" -"파일이 유니코드가 아닌 경우 선택한 인코딩을 폴백으로 사용합니다.\n" -"(유니코드 감지는 파일의 첫 바이트를 봅니다.)" - -#. +> trunk5 -#: optiondialog.cpp:1486 optiondialog.cpp:1495 optiondialog.cpp:1504 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "유니코드 자동 감지" - -#. +> trunk5 -#: optiondialog.cpp:1491 -#, kde-format -msgid "File Encoding for B:" -msgstr "파일 B 인코딩:" - -#. +> trunk5 -#: optiondialog.cpp:1500 -#, kde-format -msgid "File Encoding for C:" -msgstr "파일 C 인코딩:" - -#. +> trunk5 -#: optiondialog.cpp:1509 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "합치기 출력과 저장 인코딩:" - -#. +> trunk5 -#: optiondialog.cpp:1513 -#, kde-format -msgid "Auto Select" -msgstr "자동 선택" - -#. +> trunk5 -#: optiondialog.cpp:1516 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for " -"saving." -msgstr "" -"이 옵션을 사용하면 입력 파일의 인코딩을 사용합니다.\n" -"모호한 경우 사용자에게 저장할 인코딩을 물어 보는 대화 상자를 엽니다." - -#. +> trunk5 -#: optiondialog.cpp:1519 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "전처리 파일 인코딩:" - -#. +> trunk5 -#: optiondialog.cpp:1530 -#, kde-format -msgid "Right To Left Language" -msgstr "오른쪽에서 왼쪽으로 쓰는 언어" - -#. +> trunk5 -#: optiondialog.cpp:1533 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"일부 언어는 오른쪽에서 왼쪽으로 씁니다.\n" -"이 설정은 뷰어와 편집기의 설정을 변경합니다." - -#. +> trunk5 -#: optiondialog.cpp:1552 -#, kde-format -msgid "Integration" -msgstr "통합" - -#. +> trunk5 -#: optiondialog.cpp:1553 -#, kde-format -msgid "Integration Settings" -msgstr "통합 설정" - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Command line options to ignore:" -msgstr "무시할 명령행 옵션:" - -#. +> trunk5 -#: optiondialog.cpp:1571 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by " -"other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"KDiff3을 다른 도구에서 사용할 때 무시할 명령행 옵션입니다.\n" -"여러 항목을 구분하려면 쌍반점(';')을 사용하십시오.\n" -"이 옵션은 \"알 수 없는 옵션\" 오류를 비활성화합니다." - -#. +> trunk5 -#: optiondialog.cpp:1576 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Esc 키로도 끝내기" - -#. +> trunk5 -#: optiondialog.cpp:1579 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"끝내기 위한 빠른 방법입니다.\n" -"Esc 키로 끝내기에 익숙한 사람을 위한 방법입니다." - -#. +> trunk5 -#: optiondialog.cpp:1584 -#, kde-format -msgid "Integrate with ClearCase" -msgstr "ClearCase 통합" - -#. +> trunk5 -#: optiondialog.cpp:1587 -#, kde-format -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"IBM의 Rational ClearCase와 통합합니다. ClearCase 하위 디렉터리 \"lib/mgrs" -"\"의 \"map\" 파일을 수정합니다.\n" -"(PATH에 ClearCase \"bin\" 디렉터리가 있을 때에만 사용됩니다.)" - -#. +> trunk5 -#: optiondialog.cpp:1593 -#, kde-format -msgid "Remove ClearCase Integration" -msgstr "ClearCase 통합 삭제" - -#. +> trunk5 -#: optiondialog.cpp:1596 -#, kde-format -msgid "" -"Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "ClearCase 통합 이전에 사용했던 \"map\" 파일을 복원합니다." - -#. +> trunk5 -#: optiondialog.cpp:1700 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "현재 항목 뿐만 아니라 모든 옵션을 초기화합니다." - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"데이터 손실 오류:\n" -"재현 가능한 경우 작성자에게 연락해 주십시오.\n" - -#. +> trunk5 -#: pdiff.cpp:91 pdiff.cpp:105 -#, kde-format -msgid "Severe Internal Error" -msgstr "심각한 내부 오류" - -#. +> trunk5 -#: pdiff.cpp:133 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "전처리기 명령: " - -#. +> trunk5 -#: pdiff.cpp:138 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "다음 선택한 옵션은 데이터를 변경할 수 있습니다:\n" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"합치기 과정 중 원하지 않을 수도 있습니다.\n" -"이 설정을 비활성화하거나, 활성화 후 계속 진행하시겠습니까?" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "옵션 변경이 합칠 때 안전하지 않음" - -#. +> trunk5 -#: pdiff.cpp:142 -#, kde-format -msgid "Use These Options During Merge" -msgstr "합칠 때 이 옵션 사용하기" - -#. +> trunk5 -#: pdiff.cpp:143 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "안전하지 않은 옵션 비활성화" - -#. +> trunk5 -#: pdiff.cpp:173 -#, kde-format -msgid "Loading A" -msgstr "A 불러오는 중" - -#. +> trunk5 -#: pdiff.cpp:184 -#, kde-format -msgid "Loading B" -msgstr "B 불러오는 중" - -#. +> trunk5 -#: pdiff.cpp:208 pdiff.cpp:238 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:215 pdiff.cpp:266 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "줄 Diff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:226 -#, kde-format -msgid "Loading C" -msgstr "C 불러오는 중" - -#. +> trunk5 -#: pdiff.cpp:242 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:246 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:269 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "줄 Diff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:272 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "줄 Diff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:778 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "모든 입력 파일의 텍스트가 같지만 바이너리는 같지 않습니다." - -#. +> trunk5 -#: pdiff.cpp:784 pdiff.cpp:788 pdiff.cpp:792 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "파일 %1와(과) %2의 텍스트가 같지만 바이너리는 같지 않습니다.\n" - -#. +> trunk5 -#: pdiff.cpp:802 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"일부 입력 파일은 완전한 텍스트 파일이 아는 것 같습니다.\n" -"KDiff3의 합치기 기능은 바이너리 데이터에 적합하지 않습니다.\n" -"본인 책임 하에 계속 진행하십시오." - -#. +> trunk5 -#: pdiff.cpp:816 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"일부 입력 문자를 올바른 유니코드로 변환할 수 없습니다.\n" -"잘못된 코덱을 사용할 수도 있습니다.(예: 비 UTF-8 파일에 UTF-8 사용)\n" -"확신하지 못하는 경우 파일을 저장하지 마십시오. 본인 책임 하에 계속 진행하십시" -"오.\n" -"영향 받는 입력 파일은 %1에 있습니다." - -#. +> trunk5 -#: pdiff.cpp:1034 -#, kde-format -msgid "Abort" -msgstr "중단" - -#. +> trunk5 -#: pdiff.cpp:1040 pdiff.cpp:1128 -#, kde-format -msgid "Opening files..." -msgstr "파일 여는 중..." - -#. +> trunk5 -#: pdiff.cpp:1105 pdiff.cpp:1176 -#, kde-format -msgid "File open error" -msgstr "파일 열기 오류" - -#. +> trunk5 -#: pdiff.cpp:1215 -#, kde-format -msgid "Cutting selection..." -msgstr "선택 영역 잘라내는 중..." - -#. +> trunk5 -#: pdiff.cpp:1236 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "선택 영역 클립보드에 복사하는 중..." - -#. +> trunk5 -#: pdiff.cpp:1252 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "클립보드 내용 삽입 중..." - -#. +> trunk5 -#: pdiff.cpp:1713 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1714 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1925 -#, kde-format -msgid "Save && Continue" -msgstr "저장하고 계속" - -#. +> trunk5 -#: pdiff.cpp:1926 -#, kde-format -msgid "Continue Without Saving" -msgstr "저장하지 않고 계속" - -#. +> trunk5 -#: pdiff.cpp:2138 -#, kde-format -msgid "Search complete." -msgstr "검색 완료." - -#. +> trunk5 -#: pdiff.cpp:2138 -#, kde-format -msgid "Search Complete" -msgstr "검색 완료" - -#. +> trunk5 -#: pdiff.cpp:2380 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Diff 입력 창에서 아무것도 선택하지 않았습니다." - -#. +> trunk5 -#: pdiff.cpp:2380 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "수동 Diff 범위 추가 중 오류 발생" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "취소(&C)" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A(기반):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "파일..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "디렉터리..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C(선택 사항):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "이름 전환/복사..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "%1<->%2 전환" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "%1->출력으로 복사" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "%1<->출력 전환" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "출력(선택 사항):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "설정..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, fuzzy, kde-format -#| msgid "Directory" -msgid "Open Directory" -msgstr "디렉터리" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "찾을 텍스트:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "대소문자 구분" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "A 검색" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "B 검색" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "C 검색" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "출력 검색" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "찾기(&S)" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "정규 표현식 시험 도구" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "자동으로 합칠 줄 예제:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "자동 합치기를 사용하려면 파일에 있는 줄을 그대로 복사하십시오." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "일치 결과:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "예제 기록 시작 줄(도입부 주석 포함):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"도입부 주석을 포함하여\n" -"과거 기록 시작 줄을 파일에 있는 대로 복사하십시오." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "과거 기록 정렬 키 순서:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "예제 기록 항목 시작 줄(도입부 주석 포함):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"도입부 주석을 제외하여\n" -"과거 기록 항목 시작 줄을 파일에 있는 대로 복사하십시오." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "정렬 키 결과:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "일치 성공." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "일치 실패." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "정규 표현식의 열고 닫는 괄호가 일치하지 않습니다." - -#~ msgid "Line" -#~ msgstr "줄" - -#~ msgid "Directory Comparison Status" -#~ msgstr "디렉터리 비교 상태" - -#~ msgid "Number of subdirectories:" -#~ msgstr "하위 디렉터리 개수:" - -#~ msgid "Number of equal files:" -#~ msgstr "같은 파일 개수:" - -#~ msgid "Number of different files:" -#~ msgstr "다른 파일 개수:" - -#~ msgid "Cancel" -#~ msgstr "취소" - -#~ msgid "Help" -#~ msgstr "도움말" - -#~ msgid "Defaults" -#~ msgstr "기본값" - -#~ msgid "&Edit" -#~ msgstr "편집(&E)" - -#~ msgid "&Settings" -#~ msgstr "설정(&S)" - -#~ msgid "&Help" -#~ msgstr "도움말(&H)" - -#~ msgid "&About" -#~ msgstr "정보(&A)" - -#~ msgid "A&uthor" -#~ msgstr "작성자(&U)" - -#~ msgid "&Thanks To" -#~ msgstr "고마운 분(&T)" - -#~ msgid "Open" -#~ msgstr "열기" - -#~ msgid "Save" -#~ msgstr "저장" - -#~ msgid "Print..." -#~ msgstr "인쇄..." - -#~ msgid "Quit" -#~ msgstr "끝내기" - -#~ msgid "Cut" -#~ msgstr "잘라내기" - -#~ msgid "Copy" -#~ msgstr "복사" - -#~ msgid "Paste" -#~ msgstr "붙여넣기" - -#~ msgid "Select All" -#~ msgstr "모두 선택" - -#~ msgid "Show Toolbar" -#~ msgstr "도구 모음 보이기" - -#~ msgid "Show &Status Bar" -#~ msgstr "상태 표시줄 보이기(&S)" - -#~ msgid "&Configure %1..." -#~ msgstr "%1 설정(&C)..." - -#~ msgid "About" -#~ msgstr "정보" - -#~ msgid "Find" -#~ msgstr "찾기" - -#~ msgid "Find Next" -#~ msgstr "다음 찾기" - -#~ msgid "For more documentation, see the help-menu or the subdirectory doc." -#~ msgstr "" -#~ "더 많은 문서를 보려면 도움말 메뉴나 doc 하위 디렉터리를 참고하십시오." - -#~ msgid "KDiff3-Usage" -#~ msgstr "KDiff3 사용법" - -#~ msgid "Ignore" -#~ msgstr "무시" - -#~ msgid "Exit" -#~ msgstr "종료" - -#~ msgid "Continue" -#~ msgstr "계속" - -#~ msgid "kdiff3" -#~ msgstr "kdiff3" - -#, fuzzy -#~| msgid "(c) 2002-2011 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "(c) 2002-2011 Joachim Eibl" - -#~ msgid "Total number of conflicts: " -#~ msgstr "총 충돌 개수: " - -#~ msgid "" -#~ "\n" -#~ "Nr of automatically solved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "자동으로 해결된 충돌 개수: " - -#~ msgid "" -#~ "\n" -#~ "Nr of unsolved conflicts: " -#~ msgstr "" -#~ "\n" -#~ "해결되지 않은 충돌 개수: " - -#~ msgid "Ignore numbers" -#~ msgstr "숫자 무시" - -#~ msgid "Ignore C/C++ comments" -#~ msgstr "C/C++ 주석 무시하기" - -#~ msgid "Ignore case" -#~ msgstr "대소문자 무시" - -#~ msgid "Language (restart required)" -#~ msgstr "언어(다시 시작 필요)" - -#~ msgid "" -#~ "Choose the language of the GUI strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "GUI 문자열의 언어를 선택하거나 자동 선택이 가능합니다.\n" -#~ "언어 변경 사항을 적용하려면 KDiff3을 다시 시작하십시오." - -#~ msgid "&OK" -#~ msgstr "확인(&O)" - -#~ msgid "OK" -#~ msgstr "확인" - -#~ 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" -#~ "mergeResultSaved: m_pMFI=0\n" -#~ "\n" -#~ "이 과정을 재현하는 방법을 알고 있다면 프로그램 제작자에게 연락해 주십시오." - -#~ msgid "Program Error" -#~ msgstr "프로그램 오류" - -#~ msgid "Error." -#~ msgstr "오류." - -#~ msgid "Select Font" -#~ msgstr "글꼴 선택" - -#~ 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" -#~ "\n" -#~ "프로그램에서 가변폭 글꼴을 처리하는 데 문제가 있기\n" -#~ "때문에 편집 중에 문제가 발생할 수도 있습니다.\n" -#~ "\n" -#~ "계속 진행하거나 다른 글꼴을 선택할 수 있습니다." - -#~ msgid "Incompatible font." -#~ msgstr "호환되지 않는 글꼴입니다." - -#~ msgid "Continue at my own risk" -#~ msgstr "그래도 계속 진행" - -#~ msgid "Select another font" -#~ msgstr "다른 글꼴 선택" - -#~ msgid "Eike Sauer" -#~ msgstr "Eike Sauer" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "버그 수정, 데비안 패키지 관리자" - -#~ msgid "Sebastien Fricker" -#~ msgstr "Sebastien Fricker" - -#~ msgid "Windows installer" -#~ msgstr "Windows 설치 도구" - -#~ msgid "Stephan Binner" -#~ msgstr "Stephan Binner" - -#~ msgid "i18n-help" -#~ msgstr "국제화 도움" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "Stefan Partheymueller" - -#~ msgid "Clipboard-patch" -#~ msgstr "클립보드 패치" - -#~ msgid "David Faure" -#~ msgstr "David Faure" - -#~ msgid "KIO-Help" -#~ msgstr "KIO 도움" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "Bernd Gehrmann" - -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Cervisia의 클래스 CvsIgnoreList" - -#~ msgid "Andre Woebbeking" -#~ msgstr "Andre Woebbeking" - -#~ msgid "Class StringMatcher" -#~ msgstr "StringMatcher 클래스" - -#~ msgid "Michael Denio" -#~ msgstr "Michael Denio" - -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "디렉터리 동등성 색상 패치" - -#~ msgid "Manfred Koehler" -#~ msgstr "Manfred Koehler" - -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Windows의 시작 속도 개선" - -#~ msgid "Sergey Zorin" -#~ msgstr "Sergey Zorin" - -#~ msgid "Diff Ext for Windows" -#~ msgstr "Windows용 Diff 확장" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#~ msgid "GNU-Diffutils" -#~ msgstr "GNU Diffutils" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "Tino Boellsterling, Timothy Mee" - -#~ msgid "Intensive test, use and feedback" -#~ msgstr "테스트, 사용 피드백" - -#~ msgid "Michael Schmidt" -#~ msgstr "Michael Schmidt" - -#~ msgid "Mac support" -#~ msgstr "Mac 지원" - -#~ msgid "Valentin Rusu" -#~ msgstr "Valentin Rusu" - -#~ msgid "KDE4 porting" -#~ msgstr "KDE4 포팅" - -#~ msgid "Albert Astals Cid" -#~ msgstr "Albert Astals Cid" - -#~ msgid "Silvan Scherrer" -#~ msgstr "Silvan Scherrer" - -#~ msgid "OS2 port" -#~ msgstr "OS/2 포팅" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "+ 버그를 보고하고 아이디어를 기여한 분들께 감사합니다!" - -#~ msgid "Italic font for deltas" -#~ msgstr "차이점에 이탤릭 글꼴 사용" - -#~ 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" -#~ "글꼴에서 이탤릭을 지원하지 않으면 변화가 없습니다." - -#~ msgid "Incompatible Font" -#~ msgstr "호환되지 않는 글꼴" - -#~ msgid "Continue at Own Risk" -#~ msgstr "그래도 계속 진행" - -#~ msgid "Select Another Font" -#~ msgstr "다른 글꼴 선택" Index: trunk/l10n-support/nb/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nb/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/nb/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,44 @@ +# Translation of kdiff3._desktop_ to Norwegian Bokmål +# +# Bjørn Steensrud , 2009, 2011. +msgid "" +msgstr "" +"Project-Id-Version: desktop files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2011-05-15 15:52+0200\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian Bokmål \n" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Diff-/Patch-grensesnitt" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Et verktøy for å sammelnlikne og flette filer og mapper" Index: trunk/l10n-support/nb/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/nb/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/nb/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,3942 @@ +# Translation of kdiff3 to Norwegian Bokmål +# +# Knut Yrvin , 2003. +# Bjørn Steensrud , 2006, 2008, 2009, 2010, 2011. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-07-24 09:36+0200\n" +"PO-Revision-Date: 2011-09-04 22:27+0200\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian Bokmål \n" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Klaus Ade Johnstad" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "klaus@skolelinux.no" + +#. +> trunk5 +#: diff.cpp:259 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." + +#. +> trunk5 +#: diff.cpp:263 +#, kde-format +msgid "From Clipboard" +msgstr "Fra utklippstavla" + +#. +> trunk5 +#: diff.cpp:564 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Forventer mellomrom etter avsluttende apostrof." + +#. +> trunk5 +#: diff.cpp:567 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Apostrofer stemmer ikke overens." + +#. +> trunk5 +#: diff.cpp:589 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Uventet apostrof inne i argument." + +#. +> trunk5 +#: diff.cpp:596 +#, kde-format +msgid "No program specified." +msgstr "Ikke noe program oppgitt." + +#. +> trunk5 +#: diff.cpp:720 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Forarbeidet muligens mislykket. Se denne kommandoen:\n" +"\n" +" %1\n" +"\n" +"Kommandoen for forarbeide blir nå slått av." + +#. +> trunk5 +#: diff.cpp:768 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Forarbeidet med å samordne linjer muligens mislykket. Se denne kommandoen:\n" +"\n" +" %1\n" +"\n" +"Forarbeide-kommandoen for linjesamordning blir nå slått av." + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, fuzzy, kde-format +#| msgid "File: %1 Line: %2 Col: %3" +msgid "File %1: Line %2" +msgstr "Fil: %1 linje: %2 kolonne: %3" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, fuzzy, kde-format +#| msgid "Line not available" +msgid "File %1: Line not available" +msgstr "Linje ikke tilgjengelig" + +#. +> trunk5 +#: difftextwindow.cpp:1834 +#, kde-format +msgid "Encoding:" +msgstr "Tegnkoding:" + +#. +> trunk5 +#: difftextwindow.cpp:1836 mergeresultwindow.cpp:3378 optiondialog.cpp:920 +#, kde-format +msgid "Line end style:" +msgstr "Linjeavslutning:" + +#. +> trunk5 +#: difftextwindow.cpp:1866 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Encoding: %1" +msgstr "Tegnkoding:" + +#. +> trunk5 +#: difftextwindow.cpp:1867 mergeresultwindow.cpp:3423 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1867 mergeresultwindow.cpp:3424 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1867 +#, fuzzy, kde-format +#| msgid "Line end style:" +msgid "Line end style: %1" +msgstr "Linjeavslutning:" + +#. +> trunk5 +#: difftextwindow.cpp:1889 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "Øverste linje" + +#. +> trunk5 +#: difftextwindow.cpp:1899 +#, kde-format +msgid "End" +msgstr "Slutt" + +#. +> trunk5 +#: difftextwindow.cpp:1974 smalldialogs.cpp:234 +#, fuzzy, kde-format +#| msgctxt "@title:window" +#| msgid "Open File" +msgid "Open File" +msgstr "Åpne fil" + +#. +> trunk5 +#: difftextwindow.cpp:2022 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#. +> trunk5 +#: difftextwindow.cpp:2037 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Other" +msgid "Other" +msgstr "Andre" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "Uløst" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "Løst" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "Ikkehvitt" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "Hvitt" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy A to B" +msgstr "Kopier A til B" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, kde-format +msgid "Copy B to A" +msgstr "Kopier B til A" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete A" +msgstr "Slett A" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete B" +msgstr "Slett B" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Slett A & B" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to A" +msgstr "Flett til A" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to B" +msgstr "Flett til B" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Flett til A & B" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, kde-format +msgid "Delete (if exists)" +msgstr "Slett (hvis det finnes)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1018 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Flett sammen" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Flett (manuelt)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Feil: Konflikt mellom filtyper" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Feil: Endret og slettet" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Feil: Datoene er like, men ikke filene." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgctxt "@title:window" +#| msgid "Done" +msgid "Done" +msgstr "Ferdig" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, kde-format +msgid "Error" +msgstr "Feil" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Hoppet over." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Ikke lagret." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "Pågår …" + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "Gjenstår." + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "Navn" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "Handling" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "Status" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Blanding av lenker og normale filer." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Lenke: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Størrelse: " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Dato og størrelse: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Klarte ikke opprette midlertidig kopi av %1." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Klarte ikke åpne %1." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Sammenlikner fil …" + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Feil ved lesing fra %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen og lese gjennom mappa på nytt?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:342 pdiff.cpp:1031 pdiff.cpp:1923 pdiff.cpp:1933 +#, kde-format +msgid "Warning" +msgstr "Advarsel" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, kde-format +msgid "Rescan" +msgstr "Les på nytt" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1033 +#, kde-format +msgid "Continue Merging" +msgstr "Fortsett fletting" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Klarte ikke åpne mapper:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Feil ved åpning av mappe" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"Målmappa må være en annen enn A eller B når tre mapper flettes.\n" +"Kontroller igjen før du fortsetter." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Parameter-advarsel" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Leser mapper …" + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Leser mappe A" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Leser mappe B" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Leser mappe C" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Noen undermapper var ikke lesbare i" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Kontroller rettigheter på undermappene." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1112 pdiff.cpp:1184 +#: pdiff.cpp:1229 pdiff.cpp:1245 pdiff.cpp:1288 pdiff.cpp:1311 +#, kde-format +msgid "Ready." +msgstr "Klar." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of manual merges:" +msgid "Number of manual merges: %1" +msgstr "Antall manuelle flettinger:" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "Dette påvirker alle flettehandlinger." + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Endre alle flette-handlinger" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgid "Processing %1" +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "Behandler %1" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Denne handlinga er ikke mulig nå." + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, kde-format +msgid "Operation Not Possible" +msgstr "Handling ikke mulig" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while copying.\n" +msgid "An error occurred while copying." +msgstr "Det oppsto en feil under kopiering.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "Flettefeil" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Ukjent flettehandling. (Dette må aldri skje!)" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, kde-format +msgid "Unknown merge operation." +msgstr "Ukjent flettehandling." + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" +"Flettingen skal til å starte.\n" +"\n" +"Velg «Gjør det» hvis du har lest instruksjonene og vet hva du gjør.\n" +"Velg «Simuler det» for å se hva som vil skje.\n" +"\n" +"Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET INGEN GARANTI! Ta sikkerhetskopi av vitale data!" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "Starter fletting" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Do It" +msgstr "Gjør det" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, kde-format +msgid "Simulate It" +msgstr "Simuler det" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "Det markerte elementet har forskjellig type i de forskjellige mappene. Velg hva som skal gjøres." + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "Filene er ulike men har samme dato for siste endring. Velg hva som skal gjøres." + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "Det markerte elementet ble endret i en mappe og slettet i en annen. Velg hva som skal gjøres." + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "Denne handlinga er ikke mulig nå fordi en mappefletting pågår." + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" +"Det var en feil i siste steg.\n" +"Vil du fortsette med elementet som ga feil, eller hoppe over det?" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue merge after an error" +msgstr "Fortsett fletting etter feil" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Continue With Last Item" +msgstr "Fortsett med siste element" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Skip Item" +msgstr "Hopp over element" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, kde-format +msgid "Merge operation complete." +msgstr "Flettehandling fullført." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, kde-format +msgid "Merge Complete" +msgstr "Fletting fullført" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Simulert fletting fullført. Se etter om du er enig i de foreslåtte handlingene." + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, fuzzy, kde-format +#| msgid "An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information." +msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "slett mappe rekursivt( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "slett ( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Feil: rmdir( %1 ) mislyktes." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Feil: sletting mislyktes." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "manuell fletting( %1, %2, %3 → %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Feil: kopiering (%1 → %2) mislyktes. Eksisterende mål kunne ikke slettes." + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copyLink( %1 → %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Feil: copyLink mislyktes." + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "kopier(%1 → %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Feil under navneendring( %1 → %2 ): Kan ikke slette eksisterende mål." + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "endre navn ( %1 → %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "Feil: navneendring mislyktes." + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "Lag mappe( %1 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "Feil under oppretting av mappe." + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "Mål" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, kde-format +msgid "Dir" +msgstr "Mappe" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Type" +msgstr "Type" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Size" +msgstr "Størrelse" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Attr" +msgstr "Attr" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Last Modification" +msgstr "Siste endring" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, kde-format +msgid "Link-Destination" +msgstr "Lenkemål" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, kde-format +msgid "File" +msgstr "Fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, kde-format +msgid "not available" +msgstr "ikke tilgjengelig" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "A (mål): " + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "A (basis): " + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "B (mål): " + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "C (mål) :" + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "Mål: " + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Lagre status for mappefletting som …" + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Start/fortsett mappefletting" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Kjør handling for gjeldende element" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Compare Selected File" +msgstr "Sammenlikne valgt fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Merge Current File" +msgstr "Flett gjeldende fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Flett\n" +"Fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Brett sammen alle undermapper" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Fold ut alle undermapper" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose A for All Items" +msgstr "Velg A for alle elementer" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose B for All Items" +msgstr "Velg B for alle elementer" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Choose C for All Items" +msgstr "Velg C for alle elementer" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Auto-velg handling for alle elementer" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, kde-format +msgid "No Operation for All Items" +msgstr "Ingen handling for alle elementer" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Identical Files" +msgstr "Vis identiske filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"Identiske\n" +"filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Different Files" +msgstr "Vis forskjellige filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "Vis filer bare i A" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"Filer \n" +"bare i A" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "Vis filer bare i B" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"Filer \n" +"bare i B" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "Vis filer bare i C" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"Filer \n" +"bare i C" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Sammenlikne uttrykkelig valgte filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Flett uttrykkelig valgte filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, kde-format +msgid "Do Nothing" +msgstr "Ikke gjør noe" + +#. +> trunk5 +#: directorymergewindow.cpp:3660 +#, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: directorymergewindow.cpp:3661 +#, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: directorymergewindow.cpp:3662 +#, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, kde-format +msgid "Delete A && B" +msgstr "Slett A && B" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "Flett til A && B" + +#. +> trunk5 +#: fileaccess.cpp:943 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, deleting an older backup failed. \n" +#| "Filename: " +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" +"Under forsøk på å lage sikkerhetskopi lyktes det ikke å slette \n" +"en tidligere kopi. Filnavn: " + +#. +> trunk5 +#: fileaccess.cpp:950 +#, fuzzy, kde-format +#| msgid "" +#| "While trying to make a backup, renaming failed. \n" +#| "Filenames: " +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" +"Under forsøk på å lage sikkerhetskopi lyktes det ikke å endre navn.\n" +"Filnavn: " + +#. +> trunk5 +#: fileaccess.cpp:974 +#, kde-format +msgid "Getting file status: %1" +msgstr "Henter filstatus: %1" + +#. +> trunk5 +#: fileaccess.cpp:1016 +#, kde-format +msgid "Reading file: %1" +msgstr "Leser fil: %1" + +#. +> trunk5 +#: fileaccess.cpp:1054 +#, kde-format +msgid "Writing file: %1" +msgstr "Skriver fil: %1" + +#. +> trunk5 +#: fileaccess.cpp:1087 +#, kde-format +msgid "Out of memory" +msgstr "Slapp opp for minne" + +#. +> trunk5 +#: fileaccess.cpp:1122 +#, kde-format +msgid "Making directory: %1" +msgstr "Lager mappe: %1" + +#. +> trunk5 +#: fileaccess.cpp:1142 +#, kde-format +msgid "Removing directory: %1" +msgstr "Fjerner mappe: %1" + +#. +> trunk5 +#: fileaccess.cpp:1157 +#, kde-format +msgid "Removing file: %1" +msgstr "Fjerner fil: %1" + +#. +> trunk5 +#: fileaccess.cpp:1173 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Oppretter symbolsk lenke: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1201 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Endrer navn på fil: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1233 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Kopierer fil: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1247 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Feil under filkopiering: Klarte ikke åpne fil for lesing. Filnavn: %1" + +#. +> trunk5 +#: fileaccess.cpp:1253 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Feil under filkopiering: Klarte ikke åpne fil for skriving. Filnavn: %1" + +#. +> trunk5 +#: fileaccess.cpp:1265 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Feil under filkopiering: Lesing mislyktes. Filnavn: %1" + +#. +> trunk5 +#: fileaccess.cpp:1274 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Feil under filkopiering: Skriving mislyktes. Filnavn: %1" + +#. +> trunk5 +#: fileaccess.cpp:1557 +#, fuzzy, kde-format +#| msgid "Reading directory: " +msgid "Reading directory: %1" +msgstr "Leser mappe: " + +#. +> trunk5 +#: fileaccess.cpp:1678 +#, kde-format +msgid "Listing directory: %1" +msgstr "Lister mappe: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "Gjeldende oppsett:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "Feil i oppsett:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "--auto brukt, men ingen utdatafil er oppgitt." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "--auto ignorert for mappesammelikning." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "Lagring mislyktes." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1094 pdiff.cpp:1165 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Klarte ikke åpne disse filene:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "Feil ved åpning av fil" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Åpner dokumentere for sammenlikning …" + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "Last på nytt" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "Lagrer gjeldende dokument som …" + +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "Skriv ut forskjellene" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "Avslutter programmet" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Klipper ut det markerte og legger det på utklippstavla" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Kopierer det markerte til utklippstavla" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Limer inn innhold fra utklippstavla til gjeldende posisjon" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "Velg alt i gjeldende vindu" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "Søk etter en streng" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "Søk igjen etter strengen" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Slår statuslinja av/på" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "Sett opp KDiff3 …" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "Gå til gjeldende Delta" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Gjeldende\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "Gå til første Delta" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"Første\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "Gå til siste Delta" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Siste\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Hopper over forskjeller i tomrom når «Vis tomrom» er slått av.)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Gå til forrige Delta" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Forrige\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "Gå til neste Delta" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Neste\n" +"Delta" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Gå til forrige konflikt" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Forrige\n" +"lonflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Gå til neste konflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Neste\n" +"konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Gå til forrige uløste konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Forrige\n" +"uløste" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Gå til neste uløste konflikt" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Neste\n" +"uløste" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Velg linje(r) fra A" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Velg\n" +"A" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Velg linje(r) fra B" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Velg\n" +"B" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Velg linje(r) fra C" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Velg\n" +"C" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Gå automatisk til neste uløste konflikt etter at kildene er valgt" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Auto\n" +"neste" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters for Differences" +msgid "Show Space && Tabulator Characters" +msgstr "Vis mellomrom og tabulatortegn for forskjeller" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"Tomroms\n" +"tegn" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "Vis tomrom" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"Tomroms\n" +"deltaer" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "Vis linjenumre" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Linje\n" +"numre" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Velg A overalt" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Velg B overalt" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Velg C overalt" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Velg A for alle uløste konflikter" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Velg B for alle uløste konflikter" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Velg C for alle uløste konflikter" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Velg A for alle uløste tomromkonflikter" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Velg B for alle uløste tomromkonflikter" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Velg C for alle uløste tomromkonflikter" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Løs enkle konflikter automatisk" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Sett deltaer til konflikter" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Kjør autofletting med regulære uttrykk" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Løs opp historiekonflikter automatisk" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Splitt differansen ved utvalget" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Slå sammen valgte differ" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "Vis vindu A" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "Vis vindu B" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "Vis vindu C" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "Normal oversikt" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "Oversikt A mot B" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "Oversikt A mot C" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "Oversikt B mot C" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Ordbryt i diff-vinduer" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Legg til manuell diff-innretting" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Tilbakestill all manuell diff-innretting" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "Fokus på neste vindu" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "Fokus på forrige vindu" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Bytt om splitt-orientering" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Mappe og tekst delt visning" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Bytt mellom mappe- og tekstvisning" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1922 +#, fuzzy, kde-format +#| msgid "The merge result hasn't been saved." +msgid "The merge result has not been saved." +msgstr "Fletteresultatet er ikke lagret." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "Lagre og avslutt" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "Avslutt uten lagring" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1933 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Fletteresultatet kunne ikke lagres." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1030 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "Lagrer fil …" + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Lagrer fil med nytt filnavn …" + +#. +> trunk5 +#: kdiff3.cpp:756 +#, kde-format +msgid "Save As..." +msgstr "Lagre som …" + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "Utskrift er ikke implementert." + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "Skriver ut …" + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +#| msgctxt "As in 'A selection of [a generated context description]'" +#| msgid " (Selection)" +msgid " (Selection)" +msgstr "(Utvalg)" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "Utskrift fullført." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "Utskrift avbrutt." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "Avslutter …" + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "Slår verktøylinje av/på …" + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "Slå statuslinje av/på …" + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "En KPart som viser SVG-bilder" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "Copyright 2007, Aurélien Gâteau " + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, fuzzy, kde-format +#| msgid "Couldn't find files for comparison." +msgid "Could not find files for comparison." +msgstr "Klarte ikke finne filer for sammenlikning." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "Sett opp KDiff3" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:112 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"Klarte ikke klargjøre KDiff3-part.\n" +"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i README-fila i kildekoden." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "&Fil" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "M&appe" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Flettehandling på gjeldende element" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Synk-handling på gjeldende element" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgid "&Movement" +msgid "M&ovement" +msgstr "F&lytting" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "D&iffvisning" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +#| msgid "Merge" +msgid "M&erge" +msgstr "Flett sammen" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "&Vindu" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Hovedverktøylinje" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Ignorert. (Selvvalgt.)" + +#. +> trunk5 +#: main.cpp:118 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Verktøy for sammenlikning og fletting av filer og mapper" + +#. +> trunk5 +#: main.cpp:119 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:138 +#, kde-format +msgid "Merge the input." +msgstr "Flett inn-data." + +#. +> trunk5 +#: main.cpp:139 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Uttrykkelig angitt basefil. For kompatibilitet med visse verktøy." + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Utdata-fil. Impliserer -m. F.eks: -o nyfil.txt" + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Utdata-fil, igjen. (For kompatibilitet med visse verktøy)." + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "Ingen GUI hvis alle konflikter kan auto-løses. (Trenger -o fil)" + +#. +> trunk5 +#: main.cpp:143 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically. (For compatibility...)" +msgid "Do not solve conflicts automatically." +msgstr "Ikke løs konflikter automatisk. (For kompatibilitet …)" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "Synlig navnerstatning for inn-fil 1 (basis)." + +#. +> trunk5 +#: main.cpp:145 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "Synlig navnerstatning for inn-fil 2." + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "Synlig navnerstatning for inn-fil 3." + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Alternativ synlig navnerstatning. Angi en gang for hver inngang." + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Overstyr en innstilling. Bruk en gang for hver innstilling. F.eks.: --cs \"AutoAdvance=1\"" + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "Vis liste over oppsettsinnstillinger og gjeldende verdier." + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "Use a different config file." +msgstr "Bruk en annen oppsettsfil." + +#. +> trunk5 +#: main.cpp:153 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "fil 1 som skal åpnes (basis, hvis ikke oppgitt via --base)" + +#. +> trunk5 +#: main.cpp:154 +#, kde-format +msgid "file2 to open" +msgstr "fil 2 som skal åpnes" + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file3 to open" +msgstr "fil 3 som skal åpnes" + +#. +> trunk5 +#: mergeresultwindow.cpp:159 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Antall uløste konflikter som gjenstår: %1 ( herav %2 tomrom )" + +#. +> trunk5 +#: mergeresultwindow.cpp:340 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Utdata er blitt endret.\n" +"Hvis du fortsetter mister du endringene dine." + +#. +> trunk5 +#: mergeresultwindow.cpp:904 pdiff.cpp:774 +#, kde-format +msgid "All input files are binary equal." +msgstr "Alle inn-filer er binært like." + +#. +> trunk5 +#: mergeresultwindow.cpp:906 +#, kde-format +msgid "All input files contain the same text." +msgstr "Alle inn-filer inneholder samme tekst." + +#. +> trunk5 +#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 +#: mergeresultwindow.cpp:918 pdiff.cpp:780 pdiff.cpp:784 pdiff.cpp:788 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Filene %1 og %2 er binært like.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 +#: mergeresultwindow.cpp:920 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Filer %1 og %2 har lik tekst. \n" + +#. +> trunk5 +#: mergeresultwindow.cpp:926 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:932 +#, kde-format +msgid "Conflicts" +msgstr "Konflikter" + +#. +> trunk5 +#: mergeresultwindow.cpp:1839 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1847 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1849 mergeresultwindow.cpp:2708 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2920 +#, fuzzy, kde-format +#| msgid "" +#| "Not all conflicts are solved yet.\n" +#| "File not saved.\n" +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" +"Ikke alle konflikter er løst ennå.\n" +"Fila er ikke lagret.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2922 mergeresultwindow.cpp:2931 +#, kde-format +msgid "Conflicts Left" +msgstr "Gjenstående konflikter" + +#. +> trunk5 +#: mergeresultwindow.cpp:2929 +#, fuzzy, kde-format +#| msgid "" +#| "There is a line end style conflict. Please choose the line end style manually.\n" +#| "File not saved.\n" +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved." +msgstr "" +"Det er en konflikt mellom stilene for linjeslutt. Velg manuelt stil for linjeslutt.\n" +"Fila er ikke lagret.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 mergeresultwindow.cpp:2991 +#, kde-format +msgid "File Save Error" +msgstr "Feil ved fillagring" + +#. +> trunk5 +#: mergeresultwindow.cpp:2991 +#, kde-format +msgid "Error while writing." +msgstr "Feil ved skriving." + +#. +> trunk5 +#: mergeresultwindow.cpp:3351 +#, kde-format +msgid "Output:" +msgstr "Utdata:" + +#. +> trunk5 +#: mergeresultwindow.cpp:3363 mergeresultwindow.cpp:3554 +#, kde-format +msgid "[Modified]" +msgstr "[Endret]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3370 +#, fuzzy, kde-format +#| msgid "Encoding for saving" +msgid "Encoding for saving:" +msgstr "Koding for lagring" + +#. +> trunk5 +#: mergeresultwindow.cpp:3469 +#, kde-format +msgid "Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: mergeresultwindow.cpp:3501 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from A: %1" +msgstr "Kodek fra" + +#. +> trunk5 +#: mergeresultwindow.cpp:3503 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from B: %1" +msgstr "Kodek fra" + +#. +> trunk5 +#: mergeresultwindow.cpp:3505 +#, fuzzy, kde-format +#| msgid "Codec from" +msgid "Codec from C: %1" +msgstr "Kodek fra" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, fuzzy, kde-format +#| msgctxt "(qtundo-format)" +#| msgid "Change Font" +msgid "Change Font" +msgstr "Endre skrift" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig." + +#. +> trunk5 +#: optiondialog.cpp:614 +#, kde-format +msgid "Configure" +msgstr "Sett opp" + +#. +> trunk5 +#: optiondialog.cpp:691 +#, kde-format +msgid "Font" +msgstr "Skrift" + +#. +> trunk5 +#: optiondialog.cpp:693 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Skrift for redigering og utdata" + +#. +> trunk5 +#: optiondialog.cpp:711 +#, fuzzy, kde-format +#| msgctxt "QShortcut" +#| msgid "Application Left" +msgid "Application font" +msgstr "Program venstre" + +#. +> trunk5 +#: optiondialog.cpp:715 +#, kde-format +msgid "File view font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Color" +msgstr "Farge" + +#. +> trunk5 +#: optiondialog.cpp:734 +#, kde-format +msgid "Colors Settings" +msgstr "Fargeinnstillinger" + +#. +> trunk5 +#: optiondialog.cpp:751 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Redigering og forskjellsvisning:" + +#. +> trunk5 +#: optiondialog.cpp:759 +#, kde-format +msgid "Foreground color:" +msgstr "Forgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:766 +#, kde-format +msgid "Background color:" +msgstr "Bakgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:775 +#, kde-format +msgid "Diff background color:" +msgstr "Bakgrunnsfarge for forskjell:" + +#. +> trunk5 +#: optiondialog.cpp:783 +#, kde-format +msgid "Color A:" +msgstr "Farge A:" + +#. +> trunk5 +#: optiondialog.cpp:791 +#, kde-format +msgid "Color B:" +msgstr "Farge B:" + +#. +> trunk5 +#: optiondialog.cpp:799 +#, kde-format +msgid "Color C:" +msgstr "Farge C:" + +#. +> trunk5 +#: optiondialog.cpp:806 +#, kde-format +msgid "Conflict color:" +msgstr "Konfliktfarge:" + +#. +> trunk5 +#: optiondialog.cpp:814 +#, kde-format +msgid "Current range background color:" +msgstr "Bakgrunnsfarge for gjeldende område:" + +#. +> trunk5 +#: optiondialog.cpp:822 +#, kde-format +msgid "Current range diff background color:" +msgstr "Bakgrunnsfarge for gjeldende forskjellsområde:" + +#. +> trunk5 +#: optiondialog.cpp:829 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Farge for manuelt innrettede forskjellsområder:" + +#. +> trunk5 +#: optiondialog.cpp:835 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Mappesammenlikning:" + +#. +> trunk5 +#: optiondialog.cpp:841 +#, kde-format +msgid "Newest file color:" +msgstr "Farge for nyeste fil:" + +#. +> trunk5 +#: optiondialog.cpp:845 +#, kde-format +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Endring av denne fargen får bare virkning når neste mappe-sammenlikning utføres." + +#. +> trunk5 +#: optiondialog.cpp:850 +#, kde-format +msgid "Oldest file color:" +msgstr "Farge for eldste fil:" + +#. +> trunk5 +#: optiondialog.cpp:858 +#, kde-format +msgid "Middle age file color:" +msgstr "Farge for filer med midlere alder:" + +#. +> trunk5 +#: optiondialog.cpp:866 +#, kde-format +msgid "Color for missing files:" +msgstr "Farge for manglende filer:" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor" +msgstr "Redigerer" + +#. +> trunk5 +#: optiondialog.cpp:880 +#, kde-format +msgid "Editor Behavior" +msgstr "Redigeringsoppsett" + +#. +> trunk5 +#: optiondialog.cpp:893 +#, kde-format +msgid "Tab inserts spaces" +msgstr "TAB setter inn mellomrom" + +#. +> trunk5 +#: optiondialog.cpp:896 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"På: tab-tasten setter inn passende antall mellomrom.\n" +"Av: Et tab-tegn settes inn." + +#. +> trunk5 +#: optiondialog.cpp:901 +#, kde-format +msgid "Tab size:" +msgstr "TAB-størrelse:" + +#. +> trunk5 +#: optiondialog.cpp:907 +#, kde-format +msgid "Auto indentation" +msgstr "Automatisk innrykk" + +#. +> trunk5 +#: optiondialog.cpp:910 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "På: Innrykket for forrige linje brukes for en ny linje.\n" + +#. +> trunk5 +#: optiondialog.cpp:913 +#, kde-format +msgid "Auto copy selection" +msgstr "Autokopier utvalg" + +#. +> trunk5 +#: optiondialog.cpp:916 +#, kde-format +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"På: Alt som markeres skrives straks til utklippstavla.\n" +"Av: Du må uttrykkelig kopiere, f.eks. med Ctrl-C." + +#. +> trunk5 +#: optiondialog.cpp:930 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Bestemmer tegn for slutt på linja når en fil lagres.\n" +"DOS/Windows: CR+LF; UNIX: LF; med CR=0D, LF=0A" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff" +msgstr "Diff" + +#. +> trunk5 +#: optiondialog.cpp:941 +#, kde-format +msgid "Diff Settings" +msgstr "Innstillinger for Diff" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:965 +#, kde-format +msgid "Ignore numbers (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:968 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Ignorer sifre når linjene søkes opp. (Likner Ignorer tomrom)\n" +"Kan hjelpe til å sammenlikne filer med numeriske data." + +#. +> trunk5 +#: optiondialog.cpp:972 +#, kde-format +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:974 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Behandle kommentarer i C/C++ som tomrom." + +#. +> trunk5 +#: optiondialog.cpp:977 +#, kde-format +msgid "Ignore case (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:980 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Behandle endringer små/store som endring i tomrom («a»<=>«A»)" + +#. +> trunk5 +#: optiondialog.cpp:983 +#, kde-format +msgid "Preprocessor command:" +msgstr "Forarbeide-kommando:" + +#. +> trunk5 +#: optiondialog.cpp:987 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Selvvalgt forarbeide. (Detaljer finnes i dokumentasjonen)" + +#. +> trunk5 +#: optiondialog.cpp:990 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "Linjesøkende forarbeide, kommando:" + +#. +> trunk5 +#: optiondialog.cpp:994 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Denne forbehandleren brukes bare når linjer søkes.\n" +"(Detaljer i dokumentasjonen)." + +#. +> trunk5 +#: optiondialog.cpp:997 +#, kde-format +msgid "Try hard (slower)" +msgstr "Grundig (langsommere)" + +#. +> trunk5 +#: optiondialog.cpp:1000 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Slår på --minimal for det eksterne diff-programmet.\n" +"Analyse av store filer blir mye langsommere." + +#. +> trunk5 +#: optiondialog.cpp:1004 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Innrett B og C for 3 inn-filer" + +#. +> trunk5 +#: optiondialog.cpp:1007 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Forsøk å rette inn B og C når tre inn-filer sammenliknes eller flettes.\n" +"Ikke anbefalt for fletting fordi fletting kan bli mer komplisert.\\ (Standard er av.)" + +#. +> trunk5 +#: optiondialog.cpp:1019 +#, kde-format +msgid "Merge Settings" +msgstr "Innstillinger for fletting" + +#. +> trunk5 +#: optiondialog.cpp:1033 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Forsinkelse for auto-avansering (ms):" + +#. +> trunk5 +#: optiondialog.cpp:1038 +#, kde-format +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 "" +"Når det brukes auto-avansering vises resultatet av gjeldende utvalg \n" +"i oppgitt tid, før det hoppes til neste konflikt. Verdiområde fra 0-2000 ms" + +#. +> trunk5 +#: optiondialog.cpp:1042 +#, kde-format +msgid "Show info dialogs" +msgstr "Vis informasjonsdialoger" + +#. +> trunk5 +#: optiondialog.cpp:1044 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Vis en dialog med informasjon om antall konflikter." + +#. +> trunk5 +#: optiondialog.cpp:1047 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "Standard for 2-fils tomromsfletting:" + +#. +> trunk5 +#: optiondialog.cpp:1051 optiondialog.cpp:1063 +#, kde-format +msgid "Manual Choice" +msgstr "Manuelt valg" + +#. +> trunk5 +#: optiondialog.cpp:1055 optiondialog.cpp:1068 +#, kde-format +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "Tillat flettealgoritmen å velge inn-data automatisk for endringer som bare gjelder tomrom." + +#. +> trunk5 +#: optiondialog.cpp:1059 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "Standard for 3-fils tomromsfletting:" + +#. +> trunk5 +#: optiondialog.cpp:1072 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "Automatisk fletting med regulært uttrykk" + +#. +> trunk5 +#: optiondialog.cpp:1080 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "Regulært uttrykk for automatisk fletting:" + +#. +> trunk5 +#: optiondialog.cpp:1084 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Regulært uttrykk for linjer der KDiff3 skal velge én kilde automatisk.\n" +"Når en linje med konflikt stemmer med det regulære uttrykket, så \n" +"velges C hvis tilgjengelig, ellers B." + +#. +> trunk5 +#: optiondialog.cpp:1090 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "Kjør autofletting med regulære uttrykk ved flettestart" + +#. +> trunk5 +#: optiondialog.cpp:1092 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Kjør autoflettingen med regulære uttrykk med en\n" +"gang når en fletting begynner.\n" + +#. +> trunk5 +#: optiondialog.cpp:1097 +#, kde-format +msgid "Version Control History Merging" +msgstr "Fletting av historien fra versjonskontroll" + +#. +> trunk5 +#: optiondialog.cpp:1105 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "Regulært uttrykk for start på historien:" + +#. +> trunk5 +#: optiondialog.cpp:1109 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Regulært uttrykk for start på oppføringa i versjonskontroll-historien.\n" +"Denne linja inneholder som regel nøkkelordet \"$Log$\".\n" +"Standard: \".*\\$Log.*\\$.*\"" + +#. +> trunk5 +#: optiondialog.cpp:1115 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "Regulært uttrykk for start på historieoppføring:" + +#. +> trunk5 +#: optiondialog.cpp:1127 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"En historieoppføring består av flere linjer.\n" +"Oppgi et regulært uttrykk som finner første linje (uten kommentaren foran).\n" +"Bruk parenteser for å binde sammen nøkler du vil bruke til sortering.\n" +"Hvis det står tomt regner KDiff3 med at det er blanke linjer mellom historieoppføringene.\n" +"Se i dokumentasjonen etter detaljer." + +#. +> trunk5 +#: optiondialog.cpp:1135 +#, kde-format +msgid "History merge sorting" +msgstr "Flettesortering av historien" + +#. +> trunk5 +#: optiondialog.cpp:1137 +#, kde-format +msgid "Sort version control history by a key." +msgstr "Sorter versjonskontroll-historien etter en nøkkel." + +#. +> trunk5 +#: optiondialog.cpp:1147 +#, kde-format +msgid "History entry start sort key order:" +msgstr "Nøkkelrekkefølge for sortering av historiestart:" + +#. +> trunk5 +#: optiondialog.cpp:1151 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Hvert parentespar brukt i det regulære uttrykket for start på historieoppføringa\n" +"angir en nøkkel som kan brukes til sortering.\n" +"Oppgi en liste over nøkler (nummerert i den rekkefølge de opptrer\n" +"med start på 1), med «,» som skilletegn (f.eks. \"4,5,6,1,2,3,7\").\n" +"Står dette tomt blir det ikke sortert.\n" +"Detaljer finnes i dokumentasjonen." + +#. +> trunk5 +#: optiondialog.cpp:1162 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "Flett versjonshistorien når flettingen begynner" + +#. +> trunk5 +#: optiondialog.cpp:1164 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "Kjør autofletting på versjonshistorien når fletting begynner." + +#. +> trunk5 +#: optiondialog.cpp:1168 +#, kde-format +msgid "Max number of history entries:" +msgstr "Maks antall oppføringer i historien:" + +#. +> trunk5 +#: optiondialog.cpp:1171 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Stopp etter det oppgitte antallet. Bruk -1 for ubegrenset antall oppføringer." + +#. +> trunk5 +#: optiondialog.cpp:1175 +#, kde-format +msgid "Test your regular expressions" +msgstr "Test de regulære uttrykkene" + +#. +> trunk5 +#: optiondialog.cpp:1180 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "Irrelevant flettekommando:" + +#. +> trunk5 +#: optiondialog.cpp:1184 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Hvis det er oppgitt, kjøres dette skriptet etter\n" +"autofletting når ingen andre relevante endringer \n" +"ble funnet. Kalles med parametre filnavn1 filnavn2 filnavn3" + +#. +> trunk5 +#: optiondialog.cpp:1189 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "Automatisk lagring og avslutting etter fletting uten konflikter" + +#. +> trunk5 +#: optiondialog.cpp:1192 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Hvis KDiff3 ble startet for filfletting fra kommandolinja og alle konflikter\n" +"kan løses uten å spørre brukeren, så lagre og avslutt automatisk.\n" +"(Likner kommandolinjevalget «--auto»." + +#. +> trunk5 +#: optiondialog.cpp:1203 optiondialog.cpp:1204 +#, kde-format +msgid "Directory" +msgstr "Mappe" + +#. +> trunk5 +#: optiondialog.cpp:1216 +#, kde-format +msgid "Recursive directories" +msgstr "Rekursive mapper" + +#. +> trunk5 +#: optiondialog.cpp:1218 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Om undermapper skal analyseres eller ikke." + +#. +> trunk5 +#: optiondialog.cpp:1220 +#, kde-format +msgid "File pattern(s):" +msgstr "Filmønster(e):" + +#. +> trunk5 +#: optiondialog.cpp:1225 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Mønster(e) for filnavn som skal analyseres.\n" +"Jokertegn: «*» og «?»\n" +"Flere mønstre kan oppgis med «;» som skilletegn" + +#. +> trunk5 +#: optiondialog.cpp:1230 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "Fil-antimønster(e):" + +#. +> trunk5 +#: optiondialog.cpp:1235 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Mønster(e) for filer som ikke skal analyseres. \n" +"Jokertegn: «*» og «?»\n" +"Flere mønstre kan oppgis med «;» som skilletegn" + +#. +> trunk5 +#: optiondialog.cpp:1240 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "Mappe-antimønster(e) :" + +#. +> trunk5 +#: optiondialog.cpp:1245 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Mønster(e) for mapper som ikke skal analyseres. \n" +"Jokertegn: «*» og «?»\n" +"Flere mønstre kan oppgis med «;» som skilletegn" + +#. +> trunk5 +#: optiondialog.cpp:1250 +#, kde-format +msgid "Use .cvsignore" +msgstr "Bruk .cvsignore" + +#. +> trunk5 +#: optiondialog.cpp:1253 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Utvider antimønsteret til alt som CVS ville ignorere.\n" +"Dette kan gjøres pr. mappe med lokale «.cvsignore»-filer." + +#. +> trunk5 +#: optiondialog.cpp:1257 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Finn skjulte filer og mapper" + +#. +> trunk5 +#: optiondialog.cpp:1260 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Finner filer og mapper som har attributtet «skjult." + +#. +> trunk5 +#: optiondialog.cpp:1262 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Finner filer og mapper med navn som begynner med «.»." + +#. +> trunk5 +#: optiondialog.cpp:1266 +#, kde-format +msgid "Follow file links" +msgstr "Følg fil-lenker" + +#. +> trunk5 +#: optiondialog.cpp:1269 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"På: Sammenlikne filer som lenkene peker på.\n" +"Av: Sammenlikne lenkene." + +#. +> trunk5 +#: optiondialog.cpp:1273 +#, kde-format +msgid "Follow directory links" +msgstr "Følg mappelenker" + +#. +> trunk5 +#: optiondialog.cpp:1276 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"På: Sammenlikne mapper lenkene peker på.\n" +"Av: Sammenlikne lenkene." + +#. +> trunk5 +#: optiondialog.cpp:1291 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Store/små bokstaver i filnavn" + +#. +> trunk5 +#: optiondialog.cpp:1294 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" +"Mappesammenlikningen behandler filer og mapper når navnene er like.\n" +"Slå på dette hvis navnene er versalvâre – dvs store/små bokstaver må være like. (Standard for Windows er av, ellers på.)v" + +#. +> trunk5 +#: optiondialog.cpp:1298 +#, kde-format +msgid "Unfold all subdirectories on load" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1301 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1305 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1308 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1312 +#, kde-format +msgid "File Comparison Mode" +msgstr "Hvordan filer sammenliknes" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison" +msgstr "Binær sammenlikning" + +#. +> trunk5 +#: optiondialog.cpp:1318 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Binær sammenlikning av hver fil. (Standard)" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "Full analysis" +msgstr "Full analyse" + +#. +> trunk5 +#: optiondialog.cpp:1322 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Gjør en full analyse og vis statistikk i ekstra kolonner.\n" +"(Langsommere enn binær sammenlikning, mye langsommere for binære filer.)" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Stol på størrelsen og endringsdatoen (utrygt)" + +#. +> trunk5 +#: optiondialog.cpp:1327 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" +"Filer med samme innhold men forskjellig endringsdato blir vist som forskjellige.\n" +"Nyttig for store mapper eller langsomme nett." + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Stol på størrelse og dato, men bruk binær sammenlikning hvis datoen ikke stemmer (utrygt)" + +#. +> trunk5 +#: optiondialog.cpp:1333 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" +"Hvis datoene ikke er like, men størrelsene er like, så bruk binær sammenlikning.Nyttig for store mapper eller langsomme nett." + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Stol på størrelsen (utrygt)" + +#. +> trunk5 +#: optiondialog.cpp:1339 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" +"Anta at filer er like hvis størrelsene er like.\n" +"Nyttig for store mapper eller langsomme nett når datoen endres under nedlasting." + +#. +> trunk5 +#: optiondialog.cpp:1346 +#, kde-format +msgid "Synchronize directories" +msgstr "Synkroniser mapper" + +#. +> trunk5 +#: optiondialog.cpp:1349 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Kan lagre filer i begge mapper slik at begge\n" +"mappene er like etterpå. Dette virker bare hvis\n" +"to mapper sammenliknes uten å oppgi et mål." + +#. +> trunk5 +#: optiondialog.cpp:1355 +#, kde-format +msgid "White space differences considered equal" +msgstr "Tomromsforskjeller betraktes som like" + +#. +> trunk5 +#: optiondialog.cpp:1358 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Hvis filer er forskjellige bare i tomrom, betrakt dem som\n" +"like. Dette er bare aktivt når det kjøres full analyse." + +#. +> trunk5 +#: optiondialog.cpp:1364 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Kopier den nyeste i stedet for å flette (utrygt)" + +#. +> trunk5 +#: optiondialog.cpp:1367 +#, fuzzy, kde-format +#| msgid "" +#| "Don't look inside, just take the newer file.\n" +#| "(Use this only if you know what you are doing!)\n" +#| "Only effective when comparing two directories." +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"Ikke se inni filene, bare bruk den nyeste fila.\n" +"(Bruk dette bare når du vet hva du gjør!)\n" +"Bare virksomt når to mapper sammenliknes." + +#. +> trunk5 +#: optiondialog.cpp:1372 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Ta sikkerhetskopi av filer (.orig)" + +#. +> trunk5 +#: optiondialog.cpp:1375 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Hvis en ny fil ville bli lagret oppå en gammel, så får den gamle\n" +"fila nytt navn med «.orig» til slutt i stedet for å bli slettet." + +#. +> trunk5 +#: optiondialog.cpp:1451 optiondialog.cpp:1452 +#, kde-format +msgid "Regional Settings" +msgstr "Regionale innstillinger" + +#. +> trunk5 +#: optiondialog.cpp:1466 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Bruk samme koding for alt:" + +#. +> trunk5 +#: optiondialog.cpp:1469 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Hvis dette er slått på kan alle kodinger endres ved bare å endre den første.\n" +"Slå av hvis det trengs separate innstillinger." + +#. +> trunk5 +#: optiondialog.cpp:1473 +#, fuzzy, kde-format +#| msgid "Note: Local Encoding is " +msgid "Note: Local Encoding is \"%1\"" +msgstr "Merk: Lokal koding er " + +#. +> trunk5 +#: optiondialog.cpp:1477 +#, kde-format +msgid "File Encoding for A:" +msgstr "Filkoding for A :" + +#. +> trunk5 +#: optiondialog.cpp:1483 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Hvis dette er slått på blir Unicode oppdaget (UTF-16 eller UTF-8).\n" +"Hvis fila ikke er i Unicode, så blir den valgte kodingen brukt som reserve.\n" +"(Unicode oppdages avhengig av de første tegnene i en fil.)" + +#. +> trunk5 +#: optiondialog.cpp:1486 optiondialog.cpp:1495 optiondialog.cpp:1504 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Auto-oppdag Unicode" + +#. +> trunk5 +#: optiondialog.cpp:1491 +#, kde-format +msgid "File Encoding for B:" +msgstr "Filkoding for B :" + +#. +> trunk5 +#: optiondialog.cpp:1500 +#, kde-format +msgid "File Encoding for C:" +msgstr "Filkoding for C :" + +#. +> trunk5 +#: optiondialog.cpp:1509 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Filkoding for flettet resultat og lagring:" + +#. +> trunk5 +#: optiondialog.cpp:1513 +#, kde-format +msgid "Auto Select" +msgstr "Autovalg" + +#. +> trunk5 +#: optiondialog.cpp:1516 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Hvis dette er slått på, så brukes kodingen fra inndata-filene.\n" +"Hvis en entydig koding ikke kan bestemmes, vil et dialogvindu be brukeren velge en koding for lagring." + +#. +> trunk5 +#: optiondialog.cpp:1519 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Filkoding for forbehandlingsfiler:" + +#. +> trunk5 +#: optiondialog.cpp:1530 +#, kde-format +msgid "Right To Left Language" +msgstr "Høyre mot venstre-språk" + +#. +> trunk5 +#: optiondialog.cpp:1533 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Noen språk leses fra høyre mot venstre.\n" +"Denne innstillinga endrer visning og redigering tilsvarende." + +#. +> trunk5 +#: optiondialog.cpp:1552 +#, kde-format +msgid "Integration" +msgstr "Integrasjon" + +#. +> trunk5 +#: optiondialog.cpp:1553 +#, kde-format +msgid "Integration Settings" +msgstr "Integrasjonsinnstillinger" + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Kommandolinjeparametre som skal ignoreres:" + +#. +> trunk5 +#: optiondialog.cpp:1571 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Liste over kommandolinje-parametre som skal hoppes over når KDiff3 brukes av andre verktøy.\n" +"Flere verdier kan oppgis atskilt med «;»\n" +"Da forsvinner feilmeldinga «Ukjent parameter»." + +#. +> trunk5 +#: optiondialog.cpp:1576 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Avslutt også med Escape-tasten" + +#. +> trunk5 +#: optiondialog.cpp:1579 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Rask måte å avslutte på.\n" +"For de som er vant til å bruke Escape-tasten." + +#. +> trunk5 +#: optiondialog.cpp:1584 +#, kde-format +msgid "Integrate with ClearCase" +msgstr "Integrer med ClearCase" + +#. +> trunk5 +#: optiondialog.cpp:1587 +#, kde-format +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"Integrer med Rational ClearCase fra IBM.\n" +"Dette endrer «map»-fila i ClearCases undermappe «lib/mgrs»\n" +"(Virker bare hvis ClearCases «bin»-mappe ligger i søkestien.)" + +#. +> trunk5 +#: optiondialog.cpp:1593 +#, kde-format +msgid "Remove ClearCase Integration" +msgstr "Fjern ClearCase-integrering" + +#. +> trunk5 +#: optiondialog.cpp:1596 +#, kde-format +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "Legg tilbake den gamle «map»-fila som ble brukt før ClearCase-integrering." + +#. +> trunk5 +#: optiondialog.cpp:1700 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "Dette tilbakestiller alle valg, ikke bare dem i dette emnet." + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Datatap-feil:\n" +"Hvis det kan gjenskapes, vennligst kontakt forfatteren.\n" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "Severe Internal Error" +msgstr "Alvorlig intern feil" + +#. +> trunk5 +#: pdiff.cpp:131 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Forbehandlingskommando :" + +#. +> trunk5 +#: pdiff.cpp:136 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "Følgende innstillinger som er valgt kan endre data:\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Ved fletting er nok ikke dette ønsket.\n" +"Vil du slå av disse innstillingene eller fortsette med dem slått på?" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Utrygg innstilling for fletting" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Bruk disse innstillingene under fletting" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Slå av utrygge innstillinger" + +#. +> trunk5 +#: pdiff.cpp:171 +#, kde-format +msgid "Loading A" +msgstr "Laster A" + +#. +> trunk5 +#: pdiff.cpp:182 +#, kde-format +msgid "Loading B" +msgstr "Laster B" + +#. +> trunk5 +#: pdiff.cpp:206 pdiff.cpp:236 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Diff: A <-> B" + +#. +> trunk5 +#: pdiff.cpp:213 pdiff.cpp:264 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Linjediff A <-> B" + +#. +> trunk5 +#: pdiff.cpp:224 +#, kde-format +msgid "Loading C" +msgstr "Laster C" + +#. +> trunk5 +#: pdiff.cpp:240 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Diff: B <-> C" + +#. +> trunk5 +#: pdiff.cpp:244 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Diff: A <-> C" + +#. +> trunk5 +#: pdiff.cpp:267 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Linjediff B <-> C" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Linjediff A <-> C" + +#. +> trunk5 +#: pdiff.cpp:776 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "Alle inn-filene inneholder samme tekst, men er ikke binært like." + +#. +> trunk5 +#: pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Filene %1 og %2 har lik tekst, men er ikke binært like. \n" + +#. +> trunk5 +#: pdiff.cpp:800 +#, fuzzy, kde-format +#| 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." +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" +"Det ser ut til at noen av inndata-filene ikke er rene tekstfiler.\n" +"Merk at KDiff3-fletting ikke er beregnet for binære data.\n" +"Fortsett på egen risiko." + +#. +> trunk5 +#: pdiff.cpp:814 +#, fuzzy, kde-format +#| msgid "" +#| "Some input characters could not be converted to valid unicode.\n" +#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +#| "Don't save the result if unsure. Continue at your own risk.\n" +#| "Affected input files are in %1." +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Noen tegn i inndata kunne ikke gjøres om til gyldig unicode.\n" +"Kanskje du bruker feil kodek (f.eks. UTF-8 for filer som ikke er i UTF-8).\n" +"Er du usikker, så ikke lagre resultatet. Fortsett på egen risiko.\n" +"Inndata-filer som er påvirket er i %1. " + +#. +> trunk5 +#: pdiff.cpp:1032 +#, kde-format +msgid "Abort" +msgstr "Avbryt" + +#. +> trunk5 +#: pdiff.cpp:1038 pdiff.cpp:1126 +#, kde-format +msgid "Opening files..." +msgstr "Åpner filer …" + +#. +> trunk5 +#: pdiff.cpp:1103 pdiff.cpp:1174 +#, kde-format +msgid "File open error" +msgstr "Feil ved filåpning" + +#. +> trunk5 +#: pdiff.cpp:1213 +#, kde-format +msgid "Cutting selection..." +msgstr "Klipper ut utvalget …" + +#. +> trunk5 +#: pdiff.cpp:1234 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Kopierer utvalg til utklippstavla …" + +#. +> trunk5 +#: pdiff.cpp:1250 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Setter inn fra utklippstavla …" + +#. +> trunk5 +#: pdiff.cpp:1712 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1713 +#, fuzzy, kde-format +#| msgid "Show the horizontal scrollbar" +msgid "Calculating max width for horizontal scrollbar" +msgstr "Vis vannrett rullefelt" + +#. +> trunk5 +#: pdiff.cpp:1924 +#, kde-format +msgid "Save && Continue" +msgstr "Lagre og fortsett" + +#. +> trunk5 +#: pdiff.cpp:1925 +#, kde-format +msgid "Continue Without Saving" +msgstr "Fortsett uten lagring" + +#. +> trunk5 +#: pdiff.cpp:2137 +#, kde-format +msgid "Search complete." +msgstr "Søk fullført." + +#. +> trunk5 +#: pdiff.cpp:2137 +#, kde-format +msgid "Search Complete" +msgstr "Søk fullført" + +#. +> trunk5 +#: pdiff.cpp:2404 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Ingenting er valgt i noe av inndata-vinduene." + +#. +> trunk5 +#: pdiff.cpp:2404 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Feil oppsto ved tillegg av manuelt diff-område" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "&Avbryt" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "A (Basis):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "Fil …" + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Mappe …" + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "C (valgfri):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, fuzzy, kde-format +#| msgid "Swap/Copy Names ..." +msgid "Swap/Copy Names..." +msgstr "Bytt/kopier navn …" + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Bytt om %1<->%2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Kopier %1->Utdata" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Bytt om %1<->utdata" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Utdata (valgfri):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Sett opp …" + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, kde-format +msgid "Open Directory" +msgstr "Åpne mappe" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, fuzzy, kde-format +#| msgid "Use Output File" +msgid "Select Output File" +msgstr "Bruk utdatafil" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Søketekst:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Skill mellom store og små bokstaver" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Søk i A" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Søk i B" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Søk i C" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Utdata fra søk" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Søk" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Prøv ut regulært uttrykk" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Eksempel på autoflette-linje:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "Kopier hit en linje slik som brukt i filene dine, for å teste autofletting." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Resultat av søk:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Eksempel på startlinje for historie (med innledende kommentar):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Kopier en historie-startlinje fra en av filene dine,\n" +"ta med den innledende kommentaren." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Sorteringsrekkefølge for historienøkler:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "Eksempel på startlinje for historieoppføring (uten innledende kommentar):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Kopier en startlinje for historieoppføring fra en av filene dine,\n" +"men ta bort den innledende kommentaren." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "Resulterende sorteringsnøkler:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Tilslag." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Ikke tilslag." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Begynn- og sluttparenteser stemmer ikke overens i regulært uttrykk." + +#~ msgid "&Merge" +#~ msgstr "&Flett" Index: trunk/l10n-support/nb/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/nb/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/nb/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,123 @@ +# Translation of kdiff3fileitemactionplugin to Norwegian Bokmål +# +# Bjørn Steensrud , 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-06-09 08:39+0200\n" +"PO-Revision-Date: 2011-05-07 15:03+0200\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian Bokmål \n" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:92 +#, fuzzy, kde-format +#| msgid "KDiff3 ..." +msgid "KDiff3..." +msgstr "KDiff3 …" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Sammenlikne med %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Flett sammen med %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Lagre «%1» til senere" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "3-veis fletting med basis" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:149 +#, fuzzy, kde-format +#| msgid "Compare with ..." +msgid "Compare with..." +msgstr "Sammenlikne med …" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Tøm liste" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Sammenlikne" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "3-veis sammenlikning" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:179 +#, fuzzy, kde-format +#| msgid "About KDiff3 menu plugin ..." +msgid "About KDiff3 menu plugin..." +msgstr "Om programtillegget for KDiff3-meny …" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Programtillegg for KDiff3 filhandling: Copyright © 2011 Joachim Eibl\n" +"KDiff3 nettsted: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:289 +#, fuzzy, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Bruke utvidelsen av kontekstmenyen:\n" +"For enkel sammenlikning av to markerte filer velg «Sammenlikne».\n" +"Hvis den andre fila ligger et annet sted «Lagre» den første fila til senere. Den dukker opp i undermenyen «Sammenlikne med. Bruk deretter «Sammenlikne med» på den andre fila.\n" +"En 3-veis fletting gjøres ved å «Lagre» basisfila, deretter grenen som skal flettes inn og velg «3-veis fletting med basis» på den andre grenen, som brukes som målfil.\n" +"Det samme gjelder sammenlikning og fletting av mapper." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:297 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "Om programtillegget for KDiff3 filhandling" Index: trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,3942 +0,0 @@ -# Translation of kdiff3 to Norwegian Bokmål -# -# Knut Yrvin , 2003. -# Bjørn Steensrud , 2006, 2008, 2009, 2010, 2011. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-07-24 09:36+0200\n" -"PO-Revision-Date: 2011-09-04 22:27+0200\n" -"Last-Translator: Bjørn Steensrud \n" -"Language-Team: Norwegian Bokmål \n" -"Language: nb\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Klaus Ade Johnstad" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "klaus@skolelinux.no" - -#. +> trunk5 -#: diff.cpp:259 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." - -#. +> trunk5 -#: diff.cpp:263 -#, kde-format -msgid "From Clipboard" -msgstr "Fra utklippstavla" - -#. +> trunk5 -#: diff.cpp:564 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Forventer mellomrom etter avsluttende apostrof." - -#. +> trunk5 -#: diff.cpp:567 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Apostrofer stemmer ikke overens." - -#. +> trunk5 -#: diff.cpp:589 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Uventet apostrof inne i argument." - -#. +> trunk5 -#: diff.cpp:596 -#, kde-format -msgid "No program specified." -msgstr "Ikke noe program oppgitt." - -#. +> trunk5 -#: diff.cpp:720 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Forarbeidet muligens mislykket. Se denne kommandoen:\n" -"\n" -" %1\n" -"\n" -"Kommandoen for forarbeide blir nå slått av." - -#. +> trunk5 -#: diff.cpp:768 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Forarbeidet med å samordne linjer muligens mislykket. Se denne kommandoen:\n" -"\n" -" %1\n" -"\n" -"Forarbeide-kommandoen for linjesamordning blir nå slått av." - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, fuzzy, kde-format -#| msgid "File: %1 Line: %2 Col: %3" -msgid "File %1: Line %2" -msgstr "Fil: %1 linje: %2 kolonne: %3" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, fuzzy, kde-format -#| msgid "Line not available" -msgid "File %1: Line not available" -msgstr "Linje ikke tilgjengelig" - -#. +> trunk5 -#: difftextwindow.cpp:1834 -#, kde-format -msgid "Encoding:" -msgstr "Tegnkoding:" - -#. +> trunk5 -#: difftextwindow.cpp:1836 mergeresultwindow.cpp:3378 optiondialog.cpp:920 -#, kde-format -msgid "Line end style:" -msgstr "Linjeavslutning:" - -#. +> trunk5 -#: difftextwindow.cpp:1866 -#, fuzzy, kde-format -#| msgid "Encoding:" -msgid "Encoding: %1" -msgstr "Tegnkoding:" - -#. +> trunk5 -#: difftextwindow.cpp:1867 mergeresultwindow.cpp:3423 -#, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1867 mergeresultwindow.cpp:3424 -#, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1867 -#, fuzzy, kde-format -#| msgid "Line end style:" -msgid "Line end style: %1" -msgstr "Linjeavslutning:" - -#. +> trunk5 -#: difftextwindow.cpp:1889 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "Øverste linje" - -#. +> trunk5 -#: difftextwindow.cpp:1899 -#, kde-format -msgid "End" -msgstr "Slutt" - -#. +> trunk5 -#: difftextwindow.cpp:1974 smalldialogs.cpp:234 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Open File" -msgid "Open File" -msgstr "Åpne fil" - -#. +> trunk5 -#: difftextwindow.cpp:2022 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 bit" - -#. +> trunk5 -#: difftextwindow.cpp:2037 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Other" -msgid "Other" -msgstr "Andre" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "Uløst" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "Løst" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "Ikkehvitt" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "Hvitt" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy A to B" -msgstr "Kopier A til B" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, kde-format -msgid "Copy B to A" -msgstr "Kopier B til A" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete A" -msgstr "Slett A" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete B" -msgstr "Slett B" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Slett A & B" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to A" -msgstr "Flett til A" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to B" -msgstr "Flett til B" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Flett til A & B" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, kde-format -msgid "Delete (if exists)" -msgstr "Slett (hvis det finnes)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1018 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Flett sammen" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Flett (manuelt)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Feil: Konflikt mellom filtyper" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Feil: Endret og slettet" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Feil: Datoene er like, men ikke filene." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Done" -msgid "Done" -msgstr "Ferdig" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, kde-format -msgid "Error" -msgstr "Feil" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Hoppet over." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Ikke lagret." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "Pågår …" - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "Gjenstår." - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "Navn" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "Handling" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "Status" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Blanding av lenker og normale filer." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Lenke: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Størrelse: " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Dato og størrelse: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Klarte ikke opprette midlertidig kopi av %1." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Klarte ikke åpne %1." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Sammenlikner fil …" - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Feil ved lesing fra %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen og lese gjennom mappa på nytt?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:342 pdiff.cpp:1031 pdiff.cpp:1923 pdiff.cpp:1933 -#, kde-format -msgid "Warning" -msgstr "Advarsel" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, kde-format -msgid "Rescan" -msgstr "Les på nytt" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1033 -#, kde-format -msgid "Continue Merging" -msgstr "Fortsett fletting" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Klarte ikke åpne mapper:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Feil ved åpning av mappe" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"Målmappa må være en annen enn A eller B når tre mapper flettes.\n" -"Kontroller igjen før du fortsetter." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Parameter-advarsel" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Leser mapper …" - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Leser mappe A" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Leser mappe B" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Leser mappe C" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Noen undermapper var ikke lesbare i" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Kontroller rettigheter på undermappene." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1112 pdiff.cpp:1184 -#: pdiff.cpp:1229 pdiff.cpp:1245 pdiff.cpp:1288 pdiff.cpp:1311 -#, kde-format -msgid "Ready." -msgstr "Klar." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" -msgid "Number of manual merges: %1" -msgstr "Antall manuelle flettinger:" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "Dette påvirker alle flettehandlinger." - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Endre alle flette-handlinger" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgid "Processing %1" -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "Behandler %1" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Denne handlinga er ikke mulig nå." - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, kde-format -msgid "Operation Not Possible" -msgstr "Handling ikke mulig" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" -msgid "An error occurred while copying." -msgstr "Det oppsto en feil under kopiering.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "Flettefeil" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Ukjent flettehandling. (Dette må aldri skje!)" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, kde-format -msgid "Unknown merge operation." -msgstr "Ukjent flettehandling." - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" -"Flettingen skal til å starte.\n" -"\n" -"Velg «Gjør det» hvis du har lest instruksjonene og vet hva du gjør.\n" -"Velg «Simuler det» for å se hva som vil skje.\n" -"\n" -"Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET INGEN GARANTI! Ta sikkerhetskopi av vitale data!" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "Starter fletting" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Do It" -msgstr "Gjør det" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, kde-format -msgid "Simulate It" -msgstr "Simuler det" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "Det markerte elementet har forskjellig type i de forskjellige mappene. Velg hva som skal gjøres." - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "Filene er ulike men har samme dato for siste endring. Velg hva som skal gjøres." - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "Det markerte elementet ble endret i en mappe og slettet i en annen. Velg hva som skal gjøres." - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "Denne handlinga er ikke mulig nå fordi en mappefletting pågår." - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" -"Det var en feil i siste steg.\n" -"Vil du fortsette med elementet som ga feil, eller hoppe over det?" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue merge after an error" -msgstr "Fortsett fletting etter feil" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Continue With Last Item" -msgstr "Fortsett med siste element" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, kde-format -msgid "Skip Item" -msgstr "Hopp over element" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "Merge operation complete." -msgstr "Flettehandling fullført." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, kde-format -msgid "Merge Complete" -msgstr "Fletting fullført" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Simulert fletting fullført. Se etter om du er enig i de foreslåtte handlingene." - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" -msgid "An error occurred. Press OK to see detailed information." -msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "slett mappe rekursivt( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "slett ( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Feil: rmdir( %1 ) mislyktes." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Feil: sletting mislyktes." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "manuell fletting( %1, %2, %3 → %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Feil: kopiering (%1 → %2) mislyktes. Eksisterende mål kunne ikke slettes." - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "copyLink( %1 → %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Feil: copyLink mislyktes." - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "kopier(%1 → %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Feil under navneendring( %1 → %2 ): Kan ikke slette eksisterende mål." - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "endre navn ( %1 → %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "Feil: navneendring mislyktes." - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "Lag mappe( %1 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "Feil under oppretting av mappe." - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "Mål" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, kde-format -msgid "Dir" -msgstr "Mappe" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Type" -msgstr "Type" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Size" -msgstr "Størrelse" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Attr" -msgstr "Attr" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Last Modification" -msgstr "Siste endring" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, kde-format -msgid "Link-Destination" -msgstr "Lenkemål" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, kde-format -msgid "File" -msgstr "Fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, kde-format -msgid "not available" -msgstr "ikke tilgjengelig" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "A (mål): " - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "A (basis): " - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "B (mål): " - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "C (mål) :" - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "Mål: " - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Lagre status for mappefletting som …" - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Start/fortsett mappefletting" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Kjør handling for gjeldende element" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Compare Selected File" -msgstr "Sammenlikne valgt fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Merge Current File" -msgstr "Flett gjeldende fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Flett\n" -"Fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Brett sammen alle undermapper" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Fold ut alle undermapper" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose A for All Items" -msgstr "Velg A for alle elementer" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose B for All Items" -msgstr "Velg B for alle elementer" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Choose C for All Items" -msgstr "Velg C for alle elementer" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Auto-velg handling for alle elementer" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, kde-format -msgid "No Operation for All Items" -msgstr "Ingen handling for alle elementer" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Identical Files" -msgstr "Vis identiske filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"Identiske\n" -"filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Different Files" -msgstr "Vis forskjellige filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "Vis filer bare i A" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"Filer \n" -"bare i A" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "Vis filer bare i B" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"Filer \n" -"bare i B" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "Vis filer bare i C" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"Filer \n" -"bare i C" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Sammenlikne uttrykkelig valgte filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Flett uttrykkelig valgte filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, kde-format -msgid "Do Nothing" -msgstr "Ikke gjør noe" - -#. +> trunk5 -#: directorymergewindow.cpp:3660 -#, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: directorymergewindow.cpp:3661 -#, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: directorymergewindow.cpp:3662 -#, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, kde-format -msgid "Delete A && B" -msgstr "Slett A && B" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "Flett til A && B" - -#. +> trunk5 -#: fileaccess.cpp:943 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" -"Under forsøk på å lage sikkerhetskopi lyktes det ikke å slette \n" -"en tidligere kopi. Filnavn: " - -#. +> trunk5 -#: fileaccess.cpp:950 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" -"Under forsøk på å lage sikkerhetskopi lyktes det ikke å endre navn.\n" -"Filnavn: " - -#. +> trunk5 -#: fileaccess.cpp:974 -#, kde-format -msgid "Getting file status: %1" -msgstr "Henter filstatus: %1" - -#. +> trunk5 -#: fileaccess.cpp:1016 -#, kde-format -msgid "Reading file: %1" -msgstr "Leser fil: %1" - -#. +> trunk5 -#: fileaccess.cpp:1054 -#, kde-format -msgid "Writing file: %1" -msgstr "Skriver fil: %1" - -#. +> trunk5 -#: fileaccess.cpp:1087 -#, kde-format -msgid "Out of memory" -msgstr "Slapp opp for minne" - -#. +> trunk5 -#: fileaccess.cpp:1122 -#, kde-format -msgid "Making directory: %1" -msgstr "Lager mappe: %1" - -#. +> trunk5 -#: fileaccess.cpp:1142 -#, kde-format -msgid "Removing directory: %1" -msgstr "Fjerner mappe: %1" - -#. +> trunk5 -#: fileaccess.cpp:1157 -#, kde-format -msgid "Removing file: %1" -msgstr "Fjerner fil: %1" - -#. +> trunk5 -#: fileaccess.cpp:1173 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Oppretter symbolsk lenke: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1201 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Endrer navn på fil: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1233 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Kopierer fil: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1247 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Feil under filkopiering: Klarte ikke åpne fil for lesing. Filnavn: %1" - -#. +> trunk5 -#: fileaccess.cpp:1253 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Feil under filkopiering: Klarte ikke åpne fil for skriving. Filnavn: %1" - -#. +> trunk5 -#: fileaccess.cpp:1265 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Feil under filkopiering: Lesing mislyktes. Filnavn: %1" - -#. +> trunk5 -#: fileaccess.cpp:1274 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Feil under filkopiering: Skriving mislyktes. Filnavn: %1" - -#. +> trunk5 -#: fileaccess.cpp:1557 -#, fuzzy, kde-format -#| msgid "Reading directory: " -msgid "Reading directory: %1" -msgstr "Leser mappe: " - -#. +> trunk5 -#: fileaccess.cpp:1678 -#, kde-format -msgid "Listing directory: %1" -msgstr "Lister mappe: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "Gjeldende oppsett:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "Feil i oppsett:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "--auto brukt, men ingen utdatafil er oppgitt." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "--auto ignorert for mappesammelikning." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "Lagring mislyktes." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1094 pdiff.cpp:1165 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Klarte ikke åpne disse filene:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "Feil ved åpning av fil" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Åpner dokumentere for sammenlikning …" - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "Last på nytt" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "Lagrer gjeldende dokument som …" - -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "Skriv ut forskjellene" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "Avslutter programmet" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Klipper ut det markerte og legger det på utklippstavla" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Kopierer det markerte til utklippstavla" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Limer inn innhold fra utklippstavla til gjeldende posisjon" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "Velg alt i gjeldende vindu" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "Søk etter en streng" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "Søk igjen etter strengen" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Slår statuslinja av/på" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "Sett opp KDiff3 …" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "Gå til gjeldende Delta" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Gjeldende\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "Gå til første Delta" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"Første\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "Gå til siste Delta" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Siste\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Hopper over forskjeller i tomrom når «Vis tomrom» er slått av.)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Gå til forrige Delta" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Forrige\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "Gå til neste Delta" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Neste\n" -"Delta" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Gå til forrige konflikt" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Forrige\n" -"lonflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Gå til neste konflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Neste\n" -"konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Gå til forrige uløste konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Forrige\n" -"uløste" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Gå til neste uløste konflikt" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Neste\n" -"uløste" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Velg linje(r) fra A" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Velg\n" -"A" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Velg linje(r) fra B" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Velg\n" -"B" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Velg linje(r) fra C" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Velg\n" -"C" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Gå automatisk til neste uløste konflikt etter at kildene er valgt" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Auto\n" -"neste" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "Vis mellomrom og tabulatortegn for forskjeller" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"Tomroms\n" -"tegn" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "Vis tomrom" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"Tomroms\n" -"deltaer" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "Vis linjenumre" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Linje\n" -"numre" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Velg A overalt" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Velg B overalt" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Velg C overalt" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Velg A for alle uløste konflikter" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Velg B for alle uløste konflikter" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Velg C for alle uløste konflikter" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Velg A for alle uløste tomromkonflikter" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Velg B for alle uløste tomromkonflikter" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Velg C for alle uløste tomromkonflikter" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Løs enkle konflikter automatisk" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Sett deltaer til konflikter" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Kjør autofletting med regulære uttrykk" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Løs opp historiekonflikter automatisk" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Splitt differansen ved utvalget" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Slå sammen valgte differ" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "Vis vindu A" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "Vis vindu B" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "Vis vindu C" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "Normal oversikt" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "Oversikt A mot B" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "Oversikt A mot C" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "Oversikt B mot C" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Ordbryt i diff-vinduer" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Legg til manuell diff-innretting" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Tilbakestill all manuell diff-innretting" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "Fokus på neste vindu" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "Fokus på forrige vindu" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Bytt om splitt-orientering" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Mappe og tekst delt visning" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Bytt mellom mappe- og tekstvisning" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1922 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." -msgid "The merge result has not been saved." -msgstr "Fletteresultatet er ikke lagret." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "Lagre og avslutt" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "Avslutt uten lagring" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1933 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Fletteresultatet kunne ikke lagres." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1030 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "Lagrer fil …" - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Lagrer fil med nytt filnavn …" - -#. +> trunk5 -#: kdiff3.cpp:756 -#, kde-format -msgid "Save As..." -msgstr "Lagre som …" - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "Utskrift er ikke implementert." - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "Skriver ut …" - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -#| msgctxt "As in 'A selection of [a generated context description]'" -#| msgid " (Selection)" -msgid " (Selection)" -msgstr "(Utvalg)" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "Utskrift fullført." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "Utskrift avbrutt." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "Avslutter …" - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "Slår verktøylinje av/på …" - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "Slå statuslinje av/på …" - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "En KPart som viser SVG-bilder" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "Copyright 2007, Aurélien Gâteau " - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." -msgid "Could not find files for comparison." -msgstr "Klarte ikke finne filer for sammenlikning." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "Sett opp KDiff3" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:112 -#, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"Klarte ikke klargjøre KDiff3-part.\n" -"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i README-fila i kildekoden." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, kde-format -msgid "&File" -msgstr "&Fil" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "M&appe" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Flettehandling på gjeldende element" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Synk-handling på gjeldende element" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" -msgid "M&ovement" -msgstr "F&lytting" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "D&iffvisning" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" -msgid "M&erge" -msgstr "Flett sammen" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, kde-format -msgid "&Window" -msgstr "&Vindu" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Hovedverktøylinje" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Ignorert. (Selvvalgt.)" - -#. +> trunk5 -#: main.cpp:118 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Verktøy for sammenlikning og fletting av filer og mapper" - -#. +> trunk5 -#: main.cpp:119 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:138 -#, kde-format -msgid "Merge the input." -msgstr "Flett inn-data." - -#. +> trunk5 -#: main.cpp:139 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Uttrykkelig angitt basefil. For kompatibilitet med visse verktøy." - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Utdata-fil. Impliserer -m. F.eks: -o nyfil.txt" - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Utdata-fil, igjen. (For kompatibilitet med visse verktøy)." - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "Ingen GUI hvis alle konflikter kan auto-løses. (Trenger -o fil)" - -#. +> trunk5 -#: main.cpp:143 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Do not solve conflicts automatically." -msgstr "Ikke løs konflikter automatisk. (For kompatibilitet …)" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "Synlig navnerstatning for inn-fil 1 (basis)." - -#. +> trunk5 -#: main.cpp:145 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "Synlig navnerstatning for inn-fil 2." - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "Synlig navnerstatning for inn-fil 3." - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Alternativ synlig navnerstatning. Angi en gang for hver inngang." - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Overstyr en innstilling. Bruk en gang for hver innstilling. F.eks.: --cs \"AutoAdvance=1\"" - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "Vis liste over oppsettsinnstillinger og gjeldende verdier." - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "Use a different config file." -msgstr "Bruk en annen oppsettsfil." - -#. +> trunk5 -#: main.cpp:153 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "fil 1 som skal åpnes (basis, hvis ikke oppgitt via --base)" - -#. +> trunk5 -#: main.cpp:154 -#, kde-format -msgid "file2 to open" -msgstr "fil 2 som skal åpnes" - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file3 to open" -msgstr "fil 3 som skal åpnes" - -#. +> trunk5 -#: mergeresultwindow.cpp:159 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Antall uløste konflikter som gjenstår: %1 ( herav %2 tomrom )" - -#. +> trunk5 -#: mergeresultwindow.cpp:340 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Utdata er blitt endret.\n" -"Hvis du fortsetter mister du endringene dine." - -#. +> trunk5 -#: mergeresultwindow.cpp:904 pdiff.cpp:774 -#, kde-format -msgid "All input files are binary equal." -msgstr "Alle inn-filer er binært like." - -#. +> trunk5 -#: mergeresultwindow.cpp:906 -#, kde-format -msgid "All input files contain the same text." -msgstr "Alle inn-filer inneholder samme tekst." - -#. +> trunk5 -#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 -#: mergeresultwindow.cpp:918 pdiff.cpp:780 pdiff.cpp:784 pdiff.cpp:788 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Filene %1 og %2 er binært like.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 -#: mergeresultwindow.cpp:920 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Filer %1 og %2 har lik tekst. \n" - -#. +> trunk5 -#: mergeresultwindow.cpp:926 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:932 -#, kde-format -msgid "Conflicts" -msgstr "Konflikter" - -#. +> trunk5 -#: mergeresultwindow.cpp:1839 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1847 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1849 mergeresultwindow.cpp:2708 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2920 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" -"Ikke alle konflikter er løst ennå.\n" -"Fila er ikke lagret.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2922 mergeresultwindow.cpp:2931 -#, kde-format -msgid "Conflicts Left" -msgstr "Gjenstående konflikter" - -#. +> trunk5 -#: mergeresultwindow.cpp:2929 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style manually.\n" -#| "File not saved.\n" -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved." -msgstr "" -"Det er en konflikt mellom stilene for linjeslutt. Velg manuelt stil for linjeslutt.\n" -"Fila er ikke lagret.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 mergeresultwindow.cpp:2991 -#, kde-format -msgid "File Save Error" -msgstr "Feil ved fillagring" - -#. +> trunk5 -#: mergeresultwindow.cpp:2991 -#, kde-format -msgid "Error while writing." -msgstr "Feil ved skriving." - -#. +> trunk5 -#: mergeresultwindow.cpp:3351 -#, kde-format -msgid "Output:" -msgstr "Utdata:" - -#. +> trunk5 -#: mergeresultwindow.cpp:3363 mergeresultwindow.cpp:3554 -#, kde-format -msgid "[Modified]" -msgstr "[Endret]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3370 -#, fuzzy, kde-format -#| msgid "Encoding for saving" -msgid "Encoding for saving:" -msgstr "Koding for lagring" - -#. +> trunk5 -#: mergeresultwindow.cpp:3469 -#, kde-format -msgid "Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: mergeresultwindow.cpp:3501 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from A: %1" -msgstr "Kodek fra" - -#. +> trunk5 -#: mergeresultwindow.cpp:3503 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from B: %1" -msgstr "Kodek fra" - -#. +> trunk5 -#: mergeresultwindow.cpp:3505 -#, fuzzy, kde-format -#| msgid "Codec from" -msgid "Codec from C: %1" -msgstr "Kodek fra" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, fuzzy, kde-format -#| msgctxt "(qtundo-format)" -#| msgid "Change Font" -msgid "Change Font" -msgstr "Endre skrift" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig." - -#. +> trunk5 -#: optiondialog.cpp:614 -#, kde-format -msgid "Configure" -msgstr "Sett opp" - -#. +> trunk5 -#: optiondialog.cpp:691 -#, kde-format -msgid "Font" -msgstr "Skrift" - -#. +> trunk5 -#: optiondialog.cpp:693 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Skrift for redigering og utdata" - -#. +> trunk5 -#: optiondialog.cpp:711 -#, fuzzy, kde-format -#| msgctxt "QShortcut" -#| msgid "Application Left" -msgid "Application font" -msgstr "Program venstre" - -#. +> trunk5 -#: optiondialog.cpp:715 -#, kde-format -msgid "File view font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Color" -msgstr "Farge" - -#. +> trunk5 -#: optiondialog.cpp:734 -#, kde-format -msgid "Colors Settings" -msgstr "Fargeinnstillinger" - -#. +> trunk5 -#: optiondialog.cpp:751 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Redigering og forskjellsvisning:" - -#. +> trunk5 -#: optiondialog.cpp:759 -#, kde-format -msgid "Foreground color:" -msgstr "Forgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:766 -#, kde-format -msgid "Background color:" -msgstr "Bakgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:775 -#, kde-format -msgid "Diff background color:" -msgstr "Bakgrunnsfarge for forskjell:" - -#. +> trunk5 -#: optiondialog.cpp:783 -#, kde-format -msgid "Color A:" -msgstr "Farge A:" - -#. +> trunk5 -#: optiondialog.cpp:791 -#, kde-format -msgid "Color B:" -msgstr "Farge B:" - -#. +> trunk5 -#: optiondialog.cpp:799 -#, kde-format -msgid "Color C:" -msgstr "Farge C:" - -#. +> trunk5 -#: optiondialog.cpp:806 -#, kde-format -msgid "Conflict color:" -msgstr "Konfliktfarge:" - -#. +> trunk5 -#: optiondialog.cpp:814 -#, kde-format -msgid "Current range background color:" -msgstr "Bakgrunnsfarge for gjeldende område:" - -#. +> trunk5 -#: optiondialog.cpp:822 -#, kde-format -msgid "Current range diff background color:" -msgstr "Bakgrunnsfarge for gjeldende forskjellsområde:" - -#. +> trunk5 -#: optiondialog.cpp:829 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Farge for manuelt innrettede forskjellsområder:" - -#. +> trunk5 -#: optiondialog.cpp:835 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Mappesammenlikning:" - -#. +> trunk5 -#: optiondialog.cpp:841 -#, kde-format -msgid "Newest file color:" -msgstr "Farge for nyeste fil:" - -#. +> trunk5 -#: optiondialog.cpp:845 -#, kde-format -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Endring av denne fargen får bare virkning når neste mappe-sammenlikning utføres." - -#. +> trunk5 -#: optiondialog.cpp:850 -#, kde-format -msgid "Oldest file color:" -msgstr "Farge for eldste fil:" - -#. +> trunk5 -#: optiondialog.cpp:858 -#, kde-format -msgid "Middle age file color:" -msgstr "Farge for filer med midlere alder:" - -#. +> trunk5 -#: optiondialog.cpp:866 -#, kde-format -msgid "Color for missing files:" -msgstr "Farge for manglende filer:" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor" -msgstr "Redigerer" - -#. +> trunk5 -#: optiondialog.cpp:880 -#, kde-format -msgid "Editor Behavior" -msgstr "Redigeringsoppsett" - -#. +> trunk5 -#: optiondialog.cpp:893 -#, kde-format -msgid "Tab inserts spaces" -msgstr "TAB setter inn mellomrom" - -#. +> trunk5 -#: optiondialog.cpp:896 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"På: tab-tasten setter inn passende antall mellomrom.\n" -"Av: Et tab-tegn settes inn." - -#. +> trunk5 -#: optiondialog.cpp:901 -#, kde-format -msgid "Tab size:" -msgstr "TAB-størrelse:" - -#. +> trunk5 -#: optiondialog.cpp:907 -#, kde-format -msgid "Auto indentation" -msgstr "Automatisk innrykk" - -#. +> trunk5 -#: optiondialog.cpp:910 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "På: Innrykket for forrige linje brukes for en ny linje.\n" - -#. +> trunk5 -#: optiondialog.cpp:913 -#, kde-format -msgid "Auto copy selection" -msgstr "Autokopier utvalg" - -#. +> trunk5 -#: optiondialog.cpp:916 -#, kde-format -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"På: Alt som markeres skrives straks til utklippstavla.\n" -"Av: Du må uttrykkelig kopiere, f.eks. med Ctrl-C." - -#. +> trunk5 -#: optiondialog.cpp:930 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Bestemmer tegn for slutt på linja når en fil lagres.\n" -"DOS/Windows: CR+LF; UNIX: LF; med CR=0D, LF=0A" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff" -msgstr "Diff" - -#. +> trunk5 -#: optiondialog.cpp:941 -#, kde-format -msgid "Diff Settings" -msgstr "Innstillinger for Diff" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:965 -#, kde-format -msgid "Ignore numbers (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:968 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Ignorer sifre når linjene søkes opp. (Likner Ignorer tomrom)\n" -"Kan hjelpe til å sammenlikne filer med numeriske data." - -#. +> trunk5 -#: optiondialog.cpp:972 -#, kde-format -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:974 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Behandle kommentarer i C/C++ som tomrom." - -#. +> trunk5 -#: optiondialog.cpp:977 -#, kde-format -msgid "Ignore case (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:980 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Behandle endringer små/store som endring i tomrom («a»<=>«A»)" - -#. +> trunk5 -#: optiondialog.cpp:983 -#, kde-format -msgid "Preprocessor command:" -msgstr "Forarbeide-kommando:" - -#. +> trunk5 -#: optiondialog.cpp:987 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "Selvvalgt forarbeide. (Detaljer finnes i dokumentasjonen)" - -#. +> trunk5 -#: optiondialog.cpp:990 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "Linjesøkende forarbeide, kommando:" - -#. +> trunk5 -#: optiondialog.cpp:994 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Denne forbehandleren brukes bare når linjer søkes.\n" -"(Detaljer i dokumentasjonen)." - -#. +> trunk5 -#: optiondialog.cpp:997 -#, kde-format -msgid "Try hard (slower)" -msgstr "Grundig (langsommere)" - -#. +> trunk5 -#: optiondialog.cpp:1000 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Slår på --minimal for det eksterne diff-programmet.\n" -"Analyse av store filer blir mye langsommere." - -#. +> trunk5 -#: optiondialog.cpp:1004 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Innrett B og C for 3 inn-filer" - -#. +> trunk5 -#: optiondialog.cpp:1007 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Forsøk å rette inn B og C når tre inn-filer sammenliknes eller flettes.\n" -"Ikke anbefalt for fletting fordi fletting kan bli mer komplisert.\\ (Standard er av.)" - -#. +> trunk5 -#: optiondialog.cpp:1019 -#, kde-format -msgid "Merge Settings" -msgstr "Innstillinger for fletting" - -#. +> trunk5 -#: optiondialog.cpp:1033 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Forsinkelse for auto-avansering (ms):" - -#. +> trunk5 -#: optiondialog.cpp:1038 -#, kde-format -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 "" -"Når det brukes auto-avansering vises resultatet av gjeldende utvalg \n" -"i oppgitt tid, før det hoppes til neste konflikt. Verdiområde fra 0-2000 ms" - -#. +> trunk5 -#: optiondialog.cpp:1042 -#, kde-format -msgid "Show info dialogs" -msgstr "Vis informasjonsdialoger" - -#. +> trunk5 -#: optiondialog.cpp:1044 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Vis en dialog med informasjon om antall konflikter." - -#. +> trunk5 -#: optiondialog.cpp:1047 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "Standard for 2-fils tomromsfletting:" - -#. +> trunk5 -#: optiondialog.cpp:1051 optiondialog.cpp:1063 -#, kde-format -msgid "Manual Choice" -msgstr "Manuelt valg" - -#. +> trunk5 -#: optiondialog.cpp:1055 optiondialog.cpp:1068 -#, kde-format -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "Tillat flettealgoritmen å velge inn-data automatisk for endringer som bare gjelder tomrom." - -#. +> trunk5 -#: optiondialog.cpp:1059 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "Standard for 3-fils tomromsfletting:" - -#. +> trunk5 -#: optiondialog.cpp:1072 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "Automatisk fletting med regulært uttrykk" - -#. +> trunk5 -#: optiondialog.cpp:1080 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "Regulært uttrykk for automatisk fletting:" - -#. +> trunk5 -#: optiondialog.cpp:1084 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Regulært uttrykk for linjer der KDiff3 skal velge én kilde automatisk.\n" -"Når en linje med konflikt stemmer med det regulære uttrykket, så \n" -"velges C hvis tilgjengelig, ellers B." - -#. +> trunk5 -#: optiondialog.cpp:1090 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "Kjør autofletting med regulære uttrykk ved flettestart" - -#. +> trunk5 -#: optiondialog.cpp:1092 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Kjør autoflettingen med regulære uttrykk med en\n" -"gang når en fletting begynner.\n" - -#. +> trunk5 -#: optiondialog.cpp:1097 -#, kde-format -msgid "Version Control History Merging" -msgstr "Fletting av historien fra versjonskontroll" - -#. +> trunk5 -#: optiondialog.cpp:1105 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "Regulært uttrykk for start på historien:" - -#. +> trunk5 -#: optiondialog.cpp:1109 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Regulært uttrykk for start på oppføringa i versjonskontroll-historien.\n" -"Denne linja inneholder som regel nøkkelordet \"$Log$\".\n" -"Standard: \".*\\$Log.*\\$.*\"" - -#. +> trunk5 -#: optiondialog.cpp:1115 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "Regulært uttrykk for start på historieoppføring:" - -#. +> trunk5 -#: optiondialog.cpp:1127 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"En historieoppføring består av flere linjer.\n" -"Oppgi et regulært uttrykk som finner første linje (uten kommentaren foran).\n" -"Bruk parenteser for å binde sammen nøkler du vil bruke til sortering.\n" -"Hvis det står tomt regner KDiff3 med at det er blanke linjer mellom historieoppføringene.\n" -"Se i dokumentasjonen etter detaljer." - -#. +> trunk5 -#: optiondialog.cpp:1135 -#, kde-format -msgid "History merge sorting" -msgstr "Flettesortering av historien" - -#. +> trunk5 -#: optiondialog.cpp:1137 -#, kde-format -msgid "Sort version control history by a key." -msgstr "Sorter versjonskontroll-historien etter en nøkkel." - -#. +> trunk5 -#: optiondialog.cpp:1147 -#, kde-format -msgid "History entry start sort key order:" -msgstr "Nøkkelrekkefølge for sortering av historiestart:" - -#. +> trunk5 -#: optiondialog.cpp:1151 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Hvert parentespar brukt i det regulære uttrykket for start på historieoppføringa\n" -"angir en nøkkel som kan brukes til sortering.\n" -"Oppgi en liste over nøkler (nummerert i den rekkefølge de opptrer\n" -"med start på 1), med «,» som skilletegn (f.eks. \"4,5,6,1,2,3,7\").\n" -"Står dette tomt blir det ikke sortert.\n" -"Detaljer finnes i dokumentasjonen." - -#. +> trunk5 -#: optiondialog.cpp:1162 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "Flett versjonshistorien når flettingen begynner" - -#. +> trunk5 -#: optiondialog.cpp:1164 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "Kjør autofletting på versjonshistorien når fletting begynner." - -#. +> trunk5 -#: optiondialog.cpp:1168 -#, kde-format -msgid "Max number of history entries:" -msgstr "Maks antall oppføringer i historien:" - -#. +> trunk5 -#: optiondialog.cpp:1171 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Stopp etter det oppgitte antallet. Bruk -1 for ubegrenset antall oppføringer." - -#. +> trunk5 -#: optiondialog.cpp:1175 -#, kde-format -msgid "Test your regular expressions" -msgstr "Test de regulære uttrykkene" - -#. +> trunk5 -#: optiondialog.cpp:1180 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "Irrelevant flettekommando:" - -#. +> trunk5 -#: optiondialog.cpp:1184 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Hvis det er oppgitt, kjøres dette skriptet etter\n" -"autofletting når ingen andre relevante endringer \n" -"ble funnet. Kalles med parametre filnavn1 filnavn2 filnavn3" - -#. +> trunk5 -#: optiondialog.cpp:1189 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "Automatisk lagring og avslutting etter fletting uten konflikter" - -#. +> trunk5 -#: optiondialog.cpp:1192 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Hvis KDiff3 ble startet for filfletting fra kommandolinja og alle konflikter\n" -"kan løses uten å spørre brukeren, så lagre og avslutt automatisk.\n" -"(Likner kommandolinjevalget «--auto»." - -#. +> trunk5 -#: optiondialog.cpp:1203 optiondialog.cpp:1204 -#, kde-format -msgid "Directory" -msgstr "Mappe" - -#. +> trunk5 -#: optiondialog.cpp:1216 -#, kde-format -msgid "Recursive directories" -msgstr "Rekursive mapper" - -#. +> trunk5 -#: optiondialog.cpp:1218 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Om undermapper skal analyseres eller ikke." - -#. +> trunk5 -#: optiondialog.cpp:1220 -#, kde-format -msgid "File pattern(s):" -msgstr "Filmønster(e):" - -#. +> trunk5 -#: optiondialog.cpp:1225 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Mønster(e) for filnavn som skal analyseres.\n" -"Jokertegn: «*» og «?»\n" -"Flere mønstre kan oppgis med «;» som skilletegn" - -#. +> trunk5 -#: optiondialog.cpp:1230 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "Fil-antimønster(e):" - -#. +> trunk5 -#: optiondialog.cpp:1235 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Mønster(e) for filer som ikke skal analyseres. \n" -"Jokertegn: «*» og «?»\n" -"Flere mønstre kan oppgis med «;» som skilletegn" - -#. +> trunk5 -#: optiondialog.cpp:1240 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "Mappe-antimønster(e) :" - -#. +> trunk5 -#: optiondialog.cpp:1245 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Mønster(e) for mapper som ikke skal analyseres. \n" -"Jokertegn: «*» og «?»\n" -"Flere mønstre kan oppgis med «;» som skilletegn" - -#. +> trunk5 -#: optiondialog.cpp:1250 -#, kde-format -msgid "Use .cvsignore" -msgstr "Bruk .cvsignore" - -#. +> trunk5 -#: optiondialog.cpp:1253 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Utvider antimønsteret til alt som CVS ville ignorere.\n" -"Dette kan gjøres pr. mappe med lokale «.cvsignore»-filer." - -#. +> trunk5 -#: optiondialog.cpp:1257 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Finn skjulte filer og mapper" - -#. +> trunk5 -#: optiondialog.cpp:1260 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Finner filer og mapper som har attributtet «skjult." - -#. +> trunk5 -#: optiondialog.cpp:1262 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Finner filer og mapper med navn som begynner med «.»." - -#. +> trunk5 -#: optiondialog.cpp:1266 -#, kde-format -msgid "Follow file links" -msgstr "Følg fil-lenker" - -#. +> trunk5 -#: optiondialog.cpp:1269 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"På: Sammenlikne filer som lenkene peker på.\n" -"Av: Sammenlikne lenkene." - -#. +> trunk5 -#: optiondialog.cpp:1273 -#, kde-format -msgid "Follow directory links" -msgstr "Følg mappelenker" - -#. +> trunk5 -#: optiondialog.cpp:1276 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"På: Sammenlikne mapper lenkene peker på.\n" -"Av: Sammenlikne lenkene." - -#. +> trunk5 -#: optiondialog.cpp:1291 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Store/små bokstaver i filnavn" - -#. +> trunk5 -#: optiondialog.cpp:1294 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" -"Mappesammenlikningen behandler filer og mapper når navnene er like.\n" -"Slå på dette hvis navnene er versalvâre – dvs store/små bokstaver må være like. (Standard for Windows er av, ellers på.)v" - -#. +> trunk5 -#: optiondialog.cpp:1298 -#, kde-format -msgid "Unfold all subdirectories on load" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1301 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1305 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1308 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1312 -#, kde-format -msgid "File Comparison Mode" -msgstr "Hvordan filer sammenliknes" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison" -msgstr "Binær sammenlikning" - -#. +> trunk5 -#: optiondialog.cpp:1318 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Binær sammenlikning av hver fil. (Standard)" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "Full analysis" -msgstr "Full analyse" - -#. +> trunk5 -#: optiondialog.cpp:1322 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Gjør en full analyse og vis statistikk i ekstra kolonner.\n" -"(Langsommere enn binær sammenlikning, mye langsommere for binære filer.)" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Stol på størrelsen og endringsdatoen (utrygt)" - -#. +> trunk5 -#: optiondialog.cpp:1327 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" -"Filer med samme innhold men forskjellig endringsdato blir vist som forskjellige.\n" -"Nyttig for store mapper eller langsomme nett." - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Stol på størrelse og dato, men bruk binær sammenlikning hvis datoen ikke stemmer (utrygt)" - -#. +> trunk5 -#: optiondialog.cpp:1333 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" -"Hvis datoene ikke er like, men størrelsene er like, så bruk binær sammenlikning.Nyttig for store mapper eller langsomme nett." - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Stol på størrelsen (utrygt)" - -#. +> trunk5 -#: optiondialog.cpp:1339 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" -"Anta at filer er like hvis størrelsene er like.\n" -"Nyttig for store mapper eller langsomme nett når datoen endres under nedlasting." - -#. +> trunk5 -#: optiondialog.cpp:1346 -#, kde-format -msgid "Synchronize directories" -msgstr "Synkroniser mapper" - -#. +> trunk5 -#: optiondialog.cpp:1349 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Kan lagre filer i begge mapper slik at begge\n" -"mappene er like etterpå. Dette virker bare hvis\n" -"to mapper sammenliknes uten å oppgi et mål." - -#. +> trunk5 -#: optiondialog.cpp:1355 -#, kde-format -msgid "White space differences considered equal" -msgstr "Tomromsforskjeller betraktes som like" - -#. +> trunk5 -#: optiondialog.cpp:1358 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Hvis filer er forskjellige bare i tomrom, betrakt dem som\n" -"like. Dette er bare aktivt når det kjøres full analyse." - -#. +> trunk5 -#: optiondialog.cpp:1364 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Kopier den nyeste i stedet for å flette (utrygt)" - -#. +> trunk5 -#: optiondialog.cpp:1367 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"Ikke se inni filene, bare bruk den nyeste fila.\n" -"(Bruk dette bare når du vet hva du gjør!)\n" -"Bare virksomt når to mapper sammenliknes." - -#. +> trunk5 -#: optiondialog.cpp:1372 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Ta sikkerhetskopi av filer (.orig)" - -#. +> trunk5 -#: optiondialog.cpp:1375 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Hvis en ny fil ville bli lagret oppå en gammel, så får den gamle\n" -"fila nytt navn med «.orig» til slutt i stedet for å bli slettet." - -#. +> trunk5 -#: optiondialog.cpp:1451 optiondialog.cpp:1452 -#, kde-format -msgid "Regional Settings" -msgstr "Regionale innstillinger" - -#. +> trunk5 -#: optiondialog.cpp:1466 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Bruk samme koding for alt:" - -#. +> trunk5 -#: optiondialog.cpp:1469 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Hvis dette er slått på kan alle kodinger endres ved bare å endre den første.\n" -"Slå av hvis det trengs separate innstillinger." - -#. +> trunk5 -#: optiondialog.cpp:1473 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " -msgid "Note: Local Encoding is \"%1\"" -msgstr "Merk: Lokal koding er " - -#. +> trunk5 -#: optiondialog.cpp:1477 -#, kde-format -msgid "File Encoding for A:" -msgstr "Filkoding for A :" - -#. +> trunk5 -#: optiondialog.cpp:1483 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Hvis dette er slått på blir Unicode oppdaget (UTF-16 eller UTF-8).\n" -"Hvis fila ikke er i Unicode, så blir den valgte kodingen brukt som reserve.\n" -"(Unicode oppdages avhengig av de første tegnene i en fil.)" - -#. +> trunk5 -#: optiondialog.cpp:1486 optiondialog.cpp:1495 optiondialog.cpp:1504 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Auto-oppdag Unicode" - -#. +> trunk5 -#: optiondialog.cpp:1491 -#, kde-format -msgid "File Encoding for B:" -msgstr "Filkoding for B :" - -#. +> trunk5 -#: optiondialog.cpp:1500 -#, kde-format -msgid "File Encoding for C:" -msgstr "Filkoding for C :" - -#. +> trunk5 -#: optiondialog.cpp:1509 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Filkoding for flettet resultat og lagring:" - -#. +> trunk5 -#: optiondialog.cpp:1513 -#, kde-format -msgid "Auto Select" -msgstr "Autovalg" - -#. +> trunk5 -#: optiondialog.cpp:1516 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Hvis dette er slått på, så brukes kodingen fra inndata-filene.\n" -"Hvis en entydig koding ikke kan bestemmes, vil et dialogvindu be brukeren velge en koding for lagring." - -#. +> trunk5 -#: optiondialog.cpp:1519 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Filkoding for forbehandlingsfiler:" - -#. +> trunk5 -#: optiondialog.cpp:1530 -#, kde-format -msgid "Right To Left Language" -msgstr "Høyre mot venstre-språk" - -#. +> trunk5 -#: optiondialog.cpp:1533 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Noen språk leses fra høyre mot venstre.\n" -"Denne innstillinga endrer visning og redigering tilsvarende." - -#. +> trunk5 -#: optiondialog.cpp:1552 -#, kde-format -msgid "Integration" -msgstr "Integrasjon" - -#. +> trunk5 -#: optiondialog.cpp:1553 -#, kde-format -msgid "Integration Settings" -msgstr "Integrasjonsinnstillinger" - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Kommandolinjeparametre som skal ignoreres:" - -#. +> trunk5 -#: optiondialog.cpp:1571 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Liste over kommandolinje-parametre som skal hoppes over når KDiff3 brukes av andre verktøy.\n" -"Flere verdier kan oppgis atskilt med «;»\n" -"Da forsvinner feilmeldinga «Ukjent parameter»." - -#. +> trunk5 -#: optiondialog.cpp:1576 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Avslutt også med Escape-tasten" - -#. +> trunk5 -#: optiondialog.cpp:1579 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Rask måte å avslutte på.\n" -"For de som er vant til å bruke Escape-tasten." - -#. +> trunk5 -#: optiondialog.cpp:1584 -#, kde-format -msgid "Integrate with ClearCase" -msgstr "Integrer med ClearCase" - -#. +> trunk5 -#: optiondialog.cpp:1587 -#, kde-format -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"Integrer med Rational ClearCase fra IBM.\n" -"Dette endrer «map»-fila i ClearCases undermappe «lib/mgrs»\n" -"(Virker bare hvis ClearCases «bin»-mappe ligger i søkestien.)" - -#. +> trunk5 -#: optiondialog.cpp:1593 -#, kde-format -msgid "Remove ClearCase Integration" -msgstr "Fjern ClearCase-integrering" - -#. +> trunk5 -#: optiondialog.cpp:1596 -#, kde-format -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "Legg tilbake den gamle «map»-fila som ble brukt før ClearCase-integrering." - -#. +> trunk5 -#: optiondialog.cpp:1700 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "Dette tilbakestiller alle valg, ikke bare dem i dette emnet." - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Datatap-feil:\n" -"Hvis det kan gjenskapes, vennligst kontakt forfatteren.\n" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "Severe Internal Error" -msgstr "Alvorlig intern feil" - -#. +> trunk5 -#: pdiff.cpp:131 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Forbehandlingskommando :" - -#. +> trunk5 -#: pdiff.cpp:136 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "Følgende innstillinger som er valgt kan endre data:\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Ved fletting er nok ikke dette ønsket.\n" -"Vil du slå av disse innstillingene eller fortsette med dem slått på?" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Utrygg innstilling for fletting" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Bruk disse innstillingene under fletting" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Slå av utrygge innstillinger" - -#. +> trunk5 -#: pdiff.cpp:171 -#, kde-format -msgid "Loading A" -msgstr "Laster A" - -#. +> trunk5 -#: pdiff.cpp:182 -#, kde-format -msgid "Loading B" -msgstr "Laster B" - -#. +> trunk5 -#: pdiff.cpp:206 pdiff.cpp:236 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" - -#. +> trunk5 -#: pdiff.cpp:213 pdiff.cpp:264 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Linjediff A <-> B" - -#. +> trunk5 -#: pdiff.cpp:224 -#, kde-format -msgid "Loading C" -msgstr "Laster C" - -#. +> trunk5 -#: pdiff.cpp:240 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" - -#. +> trunk5 -#: pdiff.cpp:244 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" - -#. +> trunk5 -#: pdiff.cpp:267 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Linjediff B <-> C" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Linjediff A <-> C" - -#. +> trunk5 -#: pdiff.cpp:776 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "Alle inn-filene inneholder samme tekst, men er ikke binært like." - -#. +> trunk5 -#: pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Filene %1 og %2 har lik tekst, men er ikke binært like. \n" - -#. +> trunk5 -#: pdiff.cpp:800 -#, fuzzy, kde-format -#| 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." -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" -"Det ser ut til at noen av inndata-filene ikke er rene tekstfiler.\n" -"Merk at KDiff3-fletting ikke er beregnet for binære data.\n" -"Fortsett på egen risiko." - -#. +> trunk5 -#: pdiff.cpp:814 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Noen tegn i inndata kunne ikke gjøres om til gyldig unicode.\n" -"Kanskje du bruker feil kodek (f.eks. UTF-8 for filer som ikke er i UTF-8).\n" -"Er du usikker, så ikke lagre resultatet. Fortsett på egen risiko.\n" -"Inndata-filer som er påvirket er i %1. " - -#. +> trunk5 -#: pdiff.cpp:1032 -#, kde-format -msgid "Abort" -msgstr "Avbryt" - -#. +> trunk5 -#: pdiff.cpp:1038 pdiff.cpp:1126 -#, kde-format -msgid "Opening files..." -msgstr "Åpner filer …" - -#. +> trunk5 -#: pdiff.cpp:1103 pdiff.cpp:1174 -#, kde-format -msgid "File open error" -msgstr "Feil ved filåpning" - -#. +> trunk5 -#: pdiff.cpp:1213 -#, kde-format -msgid "Cutting selection..." -msgstr "Klipper ut utvalget …" - -#. +> trunk5 -#: pdiff.cpp:1234 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Kopierer utvalg til utklippstavla …" - -#. +> trunk5 -#: pdiff.cpp:1250 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Setter inn fra utklippstavla …" - -#. +> trunk5 -#: pdiff.cpp:1712 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1713 -#, fuzzy, kde-format -#| msgid "Show the horizontal scrollbar" -msgid "Calculating max width for horizontal scrollbar" -msgstr "Vis vannrett rullefelt" - -#. +> trunk5 -#: pdiff.cpp:1924 -#, kde-format -msgid "Save && Continue" -msgstr "Lagre og fortsett" - -#. +> trunk5 -#: pdiff.cpp:1925 -#, kde-format -msgid "Continue Without Saving" -msgstr "Fortsett uten lagring" - -#. +> trunk5 -#: pdiff.cpp:2137 -#, kde-format -msgid "Search complete." -msgstr "Søk fullført." - -#. +> trunk5 -#: pdiff.cpp:2137 -#, kde-format -msgid "Search Complete" -msgstr "Søk fullført" - -#. +> trunk5 -#: pdiff.cpp:2404 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Ingenting er valgt i noe av inndata-vinduene." - -#. +> trunk5 -#: pdiff.cpp:2404 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Feil oppsto ved tillegg av manuelt diff-område" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "&Avbryt" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "A (Basis):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "Fil …" - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Mappe …" - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "C (valgfri):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." -msgid "Swap/Copy Names..." -msgstr "Bytt/kopier navn …" - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Bytt om %1<->%2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Kopier %1->Utdata" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Bytt om %1<->utdata" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Utdata (valgfri):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Sett opp …" - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, kde-format -msgid "Open Directory" -msgstr "Åpne mappe" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Use Output File" -msgid "Select Output File" -msgstr "Bruk utdatafil" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Søketekst:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Skill mellom store og små bokstaver" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Søk i A" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Søk i B" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Søk i C" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Utdata fra søk" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Søk" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Prøv ut regulært uttrykk" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Eksempel på autoflette-linje:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "Kopier hit en linje slik som brukt i filene dine, for å teste autofletting." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Resultat av søk:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Eksempel på startlinje for historie (med innledende kommentar):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Kopier en historie-startlinje fra en av filene dine,\n" -"ta med den innledende kommentaren." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Sorteringsrekkefølge for historienøkler:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "Eksempel på startlinje for historieoppføring (uten innledende kommentar):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Kopier en startlinje for historieoppføring fra en av filene dine,\n" -"men ta bort den innledende kommentaren." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "Resulterende sorteringsnøkler:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Tilslag." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Ikke tilslag." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Begynn- og sluttparenteser stemmer ikke overens i regulært uttrykk." - -#~ msgid "&Merge" -#~ msgstr "&Flett" Index: trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,123 +0,0 @@ -# Translation of kdiff3fileitemactionplugin to Norwegian Bokmål -# -# Bjørn Steensrud , 2011. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-06-09 08:39+0200\n" -"PO-Revision-Date: 2011-05-07 15:03+0200\n" -"Last-Translator: Bjørn Steensrud \n" -"Language-Team: Norwegian Bokmål \n" -"Language: nb\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.1\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." -msgid "KDiff3..." -msgstr "KDiff3 …" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:124 -#, kde-format -msgid "Compare with %1" -msgstr "Sammenlikne med %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:130 -#, kde-format -msgid "Merge with %1" -msgstr "Flett sammen med %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:136 -#, kde-format -msgid "Save '%1' for later" -msgstr "Lagre «%1» til senere" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:142 -#, kde-format -msgid "3-way merge with base" -msgstr "3-veis fletting med basis" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." -msgid "Compare with..." -msgstr "Sammenlikne med …" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:161 -#, kde-format -msgid "Clear list" -msgstr "Tøm liste" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:169 -#, kde-format -msgid "Compare" -msgstr "Sammenlikne" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:175 -#, kde-format -msgid "3 way comparison" -msgstr "3-veis sammenlikning" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." -msgid "About KDiff3 menu plugin..." -msgstr "Om programtillegget for KDiff3-meny …" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:287 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Programtillegg for KDiff3 filhandling: Copyright © 2011 Joachim Eibl\n" -"KDiff3 nettsted: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:289 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the context menu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare with...\" submenu. Then use \"Compare With\" on the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Bruke utvidelsen av kontekstmenyen:\n" -"For enkel sammenlikning av to markerte filer velg «Sammenlikne».\n" -"Hvis den andre fila ligger et annet sted «Lagre» den første fila til senere. Den dukker opp i undermenyen «Sammenlikne med. Bruk deretter «Sammenlikne med» på den andre fila.\n" -"En 3-veis fletting gjøres ved å «Lagre» basisfila, deretter grenen som skal flettes inn og velg «3-veis fletting med basis» på den andre grenen, som brukes som målfil.\n" -"Det samme gjelder sammenlikning og fletting av mapper." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:297 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "Om programtillegget for KDiff3 filhandling" Index: trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/nb/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,44 +0,0 @@ -# Translation of kdiff3._desktop_ to Norwegian Bokmål -# -# Bjørn Steensrud , 2009, 2011. -msgid "" -msgstr "" -"Project-Id-Version: desktop files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2011-05-15 15:52+0200\n" -"Last-Translator: Bjørn Steensrud \n" -"Language-Team: Norwegian Bokmål \n" -"Language: nb\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.1\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Diff-/Patch-grensesnitt" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Et verktøy for å sammelnlikne og flette filer og mapper" Index: trunk/l10n-support/nds/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nds/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/nds/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,59 @@ +# Sönke Dibbern , 2007, 2008. +# Manfred Wiese , 2011. +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-07-26 09:01+0200\n" +"PO-Revision-Date: 2011-05-07 06:16+0200\n" +"Last-Translator: Manfred Wiese \n" +"Language-Team: Low Saxon \n" +"Language: nds\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 +#: kdiff3plugin/kdiff3plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3" + +#. +> trunk +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:51 +msgctxt "X-KDE-Submenu" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3plugin/kdiff3_plugin.desktop:4 +msgctxt "Name" +msgid "Compare/Merge Files/Directories" +msgstr "Verglieken/Tosamenföhren Dateien Ornern" + +#. +> trunk +#: src/kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: src/kdiff3.desktop:52 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Böversiet för \"diff\" un \"patch\"" + +#. +> trunk +#: src/kdiff3.desktop:105 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "En Warktüüch för't Verglieken un Tosamenföhren vun Dateien un Ornern" + +#. +> trunk +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" Index: trunk/l10n-support/nds/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/nds/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/nds/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,3705 @@ +# Translation of kdiff3.po to Low Saxon +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Sönke Dibbern , 2008, 2009. +# Manfred Wiese , 2009, 2010, 2011. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2012-10-30 10:41+0100\n" +"PO-Revision-Date: 2011-10-09 21:25+0200\n" +"Last-Translator: Manfred Wiese \n" +"Language-Team: Low Saxon \n" +"Language: nds\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. +> trunk +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Sönke Dibbern" + +#. +> trunk +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "s_dibbern@web.de" + +#. +> trunk +#: diff.cpp:251 +msgid "Writing clipboard data to temp file failed." +msgstr "Twischenaflaag-Daten laat sik nich as Temporeerdatei sekern." + +#. +> trunk +#: diff.cpp:255 +msgid "From Clipboard" +msgstr "Ut Twischenaflaag" + +#. +> trunk +#: diff.cpp:537 +msgid "Expecting space after closing apostroph." +msgstr "Free Ruum achter Afsluss-Hoochkomma verwacht" + +#. +> trunk +#: diff.cpp:540 +msgid "Not matching apostrophs." +msgstr "Hoochkommas passt nich" + +#. +> trunk +#: diff.cpp:562 +msgid "Unexpected apostroph within argument." +msgstr "Argument bargt nich verwacht Hoochkomma" + +#. +> trunk +#: diff.cpp:569 +msgid "No program specified." +msgstr "Keen Programm angeven" + +#. +> trunk +#: diff.cpp:671 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Dat Vörverarbeiden is villicht fehlslaan. Prööv dissen Befehl:\n" +"\n" +" %1\n" +"\n" +"De Vörverarbeid-Befehl warrt nu utmaakt." + +#. +> trunk +#: diff.cpp:719 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"De Vörverarbeiden för de Regenutrichten is villicht fehlslaan. Prööv dissen Befehl:\n" +"\n" +" %1\n" +"\n" +"De Vörverarbeid-Befehl för de Regenutrichten warrt nu utmaakt." + +#. +> trunk +#: diff.cpp:1850 diff.cpp:1864 +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Daten sünd wegkamen:\n" +"Lett sik dit wedderhalen, snack dor bitte den Autor op an.\n" + +#. +> trunk +#: diff.cpp:1852 diff.cpp:1866 +msgid "Severe Internal Error" +msgstr "Swoor intern Fehler" + +#. +> trunk +#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 +msgid "File" +msgstr "Datei" + +#. +> trunk +#: difftextwindow.cpp:403 +msgid "Line" +msgstr "Reeg" + +#. +> trunk +#: difftextwindow.cpp:405 +msgid "Line not available" +msgstr "Reeg nich verföögbor" + +#. +> trunk +#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 +msgid "Encoding:" +msgstr "Koderen:" + +#. +> trunk +#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 +#: optiondialog.cpp:762 +msgid "Line end style:" +msgstr "Reegenn-Stil:" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 +msgid "DOS" +msgstr "DOS" + +#. +> trunk +#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 +msgid "Unix" +msgstr "Unix" + +#. +> trunk +#: difftextwindow.cpp:1759 kdiff3.cpp:831 +msgid "Top line" +msgstr "Böverst Reeg" + +#. +> trunk +#: difftextwindow.cpp:1769 +msgid "End" +msgstr "Enn" + +#. +> trunk +#: directorymergewindow.cpp:150 +msgid "Mix of links and normal files." +msgstr "Mischen vun Links un normaal Dateien" + +#. +> trunk +#: directorymergewindow.cpp:157 +msgid "Link: " +msgstr "Link: " + +#. +> trunk +#: directorymergewindow.cpp:165 +msgid "Size. " +msgstr "Grött: " + +#. +> trunk +#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 +msgid "Date & Size: " +msgstr "Datum un Grött: " + +#. +> trunk +#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Temporeerkopie vun \"%1\" lett sik nich opstellen" + +#. +> trunk +#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 +#, kde-format +msgid "Opening %1 failed." +msgstr "\"%1\" lett sik nich opmaken" + +#. +> trunk +#: directorymergewindow.cpp:227 +msgid "Comparing file..." +msgstr "Datei warrt vergleken..." + +#. +> trunk +#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 +#, kde-format +msgid "Error reading from %1" +msgstr "\"%1\" lett sik nich lesen" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Name" +msgstr "Naam" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Operation" +msgstr "Akschoon" + +#. +> trunk +#: directorymergewindow.cpp:372 +msgid "Status" +msgstr "Status" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Unsolved" +msgstr "Nich oplööst" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Solved" +msgstr "Oplööst" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "Nonwhite" +msgstr "Nichfree" + +#. +> trunk +#: directorymergewindow.cpp:373 +msgid "White" +msgstr "Free" + +#. +> trunk +#: directorymergewindow.cpp:402 +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "Du büst jüst togang un föhrst Ornern tosamen. Wullt Du dat Tosamenföhren redig afbreken un den Orner nieg dörkieken?" + +#. +> trunk +#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 +#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 +msgid "Warning" +msgstr "Wohrschoen" + +#. +> trunk +#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 +msgid "Rescan" +msgstr "Nieg dörkieken" + +#. +> trunk +#: directorymergewindow.cpp:405 pdiff.cpp:1081 +msgid "Continue Merging" +msgstr "Tosamenföhren wiedermaken" + +#. +> trunk +#: directorymergewindow.cpp:562 +msgid "Opening of directories failed:" +msgstr "Opmaken vun Ornern fehlslaan:" + +#. +> trunk +#: directorymergewindow.cpp:565 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Orner A \"%1\" gifft dat nich oder is keen Orner.\n" + +#. +> trunk +#: directorymergewindow.cpp:568 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Orner B \"%1\" gifft dat nich oder is keen Orner.\n" + +#. +> trunk +#: directorymergewindow.cpp:571 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Orner C \"%1\" gifft dat nich oder is keen Orner.\n" + +#. +> trunk +#: directorymergewindow.cpp:573 +msgid "Directory Open Error" +msgstr "Fehler bi't Ornern-Opmaken" + +#. +> trunk +#: directorymergewindow.cpp:581 +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"De Teelorner mutt bi't Tosamenföhren vun 3 Dateien nich de sülve wesen as A oder B.\n" +"\n" +"Prööv dat bitte, ehr Du wiedermaakst." + +#. +> trunk +#: directorymergewindow.cpp:583 +msgid "Parameter Warning" +msgstr "Parameter-Wohrschoen" + +#. +> trunk +#: directorymergewindow.cpp:588 +msgid "Scanning directories..." +msgstr "Ornern warrt dörkeken..." + +#. +> trunk +#: directorymergewindow.cpp:621 +msgid "Reading Directory A" +msgstr "Orner A warrt leest" + +#. +> trunk +#: directorymergewindow.cpp:643 +msgid "Reading Directory B" +msgstr "Orner B warrt leest" + +#. +> trunk +#: directorymergewindow.cpp:665 +msgid "Reading Directory C" +msgstr "Orner C warrt leest" + +#. +> trunk +#: directorymergewindow.cpp:691 +msgid "Some subdirectories were not readable in" +msgstr "En Reeg Ünnerornern lett sik nich lesen binnen" + +#. +> trunk +#: directorymergewindow.cpp:696 +msgid "Check the permissions of the subdirectories." +msgstr "Prööv bitte de Verlöven vun de Ünnerornern." + +#. +> trunk +#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 +#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 +#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 +msgid "Ready." +msgstr "Praat." + +#. +> trunk +#: directorymergewindow.cpp:749 +msgid "Directory Comparison Status" +msgstr "Ornervergliek-Status" + +#. +> trunk +#: directorymergewindow.cpp:750 +msgid "Number of subdirectories:" +msgstr "Tall vun Ünnerornern:" + +#. +> trunk +#: directorymergewindow.cpp:751 +msgid "Number of equal files:" +msgstr "Tall vun liek Dateien:" + +#. +> trunk +#: directorymergewindow.cpp:752 +msgid "Number of different files:" +msgstr "Tall vun verscheden Dateien:" + +#. +> trunk +#: directorymergewindow.cpp:755 +msgid "Number of manual merges:" +msgstr "Tall vun Tosamenföhren vun Hand:" + +#. +> trunk +#: directorymergewindow.cpp:926 +msgid "This affects all merge operations." +msgstr "Dit bedröppt all Tosamenföhr-Akschonen" + +#. +> trunk +#: directorymergewindow.cpp:927 +msgid "Changing All Merge Operations" +msgstr "All Tosamenföhr-Akschonen ännern" + +#. +> trunk +#: directorymergewindow.cpp:1326 +msgid "Processing " +msgstr "Bi to verarbeiden: " + +#. +> trunk +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 +msgid "To do." +msgstr "Opgaav" + +#. +> trunk +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 +msgid "Copy A to B" +msgstr "A op B koperen" + +#. +> trunk +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 +msgid "Copy B to A" +msgstr "B op A koperen" + +#. +> trunk +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 +msgid "Delete A" +msgstr "A wegdoon" + +#. +> trunk +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 +msgid "Delete B" +msgstr "B wegdoon" + +#. +> trunk +#: directorymergewindow.cpp:1828 +msgid "Delete A & B" +msgstr "A un B wegdoon" + +#. +> trunk +#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 +msgid "Merge to A" +msgstr "Mit A tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 +msgid "Merge to B" +msgstr "Mit B tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:1831 +msgid "Merge to A & B" +msgstr "Mit A un B tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 +msgid "Delete (if exists)" +msgstr "Wegdoon (wenn vörhannen)" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 +msgid "Merge" +msgstr "Tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 +msgid "Merge (manual)" +msgstr "Tosamenföhren (vun Hand)" + +#. +> trunk +#: directorymergewindow.cpp:1838 +msgid "Error: Conflicting File Types" +msgstr "Fehler: Inkompatibel Dateitypen" + +#. +> trunk +#: directorymergewindow.cpp:1839 +msgid "Error: Changed and Deleted" +msgstr "Fehler: Ännert un wegdaan" + +#. +> trunk +#: directorymergewindow.cpp:1840 +msgid "Error: Dates are equal but files are not." +msgstr "Fehler: De Daten sünd liek, man de Dateien nich." + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 +msgid "This operation is currently not possible." +msgstr "Disse Akschoon is opstunns nich mööglich." + +#. +> trunk +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 +msgid "Operation Not Possible" +msgstr "Akschoon nich mööglich" + +#. +> trunk +#: directorymergewindow.cpp:1959 +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 "" +"Dit schull nienich vörkamen.\n" +"\n" +"mergeResultSaved: m_pMFI=0\n" +"\n" +"Lett sik dit wedderhalen, snack dor bitte den Programmschriever op an." + +#. +> trunk +#: directorymergewindow.cpp:1959 +msgid "Program Error" +msgstr "Programmfehler" + +#. +> trunk +#: directorymergewindow.cpp:1970 +msgid "An error occurred while copying.\n" +msgstr "Dat geev en Fehler bi't Koperen.\n" + +#. +> trunk +#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 +#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 +#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 +#: directorymergewindow.cpp:2388 +msgid "Error" +msgstr "Fehler" + +#. +> trunk +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 +msgid "Merge Error" +msgstr "Tosamenföhr-Fehler" + +#. +> trunk +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 +msgid "Error." +msgstr "Fehler." + +#. +> trunk +#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 +#: directorymergewindow.cpp:2326 +msgid "Done." +msgstr "Afslaten." + +#. +> trunk +#: directorymergewindow.cpp:2004 +msgid "Not saved." +msgstr "Nich sekert" + +#. +> trunk +#: directorymergewindow.cpp:2039 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Nich begäng Tosamenföhrakschoon (Dit mutt nienich vörkamen!)" + +#. +> trunk +#: directorymergewindow.cpp:2071 +msgid "Unknown merge operation." +msgstr "Nich begäng Tosamenföhrakschoon" + +#. +> trunk +#: directorymergewindow.cpp:2086 +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 "" +"Dat Tosamenföhren kann nu loosgahn.\n" +"\n" +"Klick op \"Utföhren\", wenn Du de Anwiesen leest hest un weetst, wat Du deist.\n" +"Klick op \"Simuleren\", wenn Du weten wullt, wat passeren dee.\n" +"\n" +"Beacht bitte, dit Programm hett jümmers noch Beta-Status un dat gifft keen Garantien, för gor nix. Maak Sekerheitkopien vun Dien wichtige Daten!" + +#. +> trunk +#: directorymergewindow.cpp:2091 +msgid "Starting Merge" +msgstr "Tosamenföhren starten" + +#. +> trunk +#: directorymergewindow.cpp:2092 +msgid "Do It" +msgstr "Doon" + +#. +> trunk +#: directorymergewindow.cpp:2093 +msgid "Simulate It" +msgstr "Simuleren" + +#. +> trunk +#: directorymergewindow.cpp:2119 +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "De rutheevte Indrag hett binnen de verscheden Ornern verscheden Typen. Wat wullt Du doon?" + +#. +> trunk +#: directorymergewindow.cpp:2128 +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "De Ännerdaten vun de Dateien sünd liek, man de Dateien sünd dat nich. Wat wullt Du doon?" + +#. +> trunk +#: directorymergewindow.cpp:2137 +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "De rutheevte Indrag wöör binnen een Orner ännert un ut den anner wegdaan. Wat wullt Du doon?" + +#. +> trunk +#: directorymergewindow.cpp:2188 +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "Disse Akschoon lett sik opstunns nich utföhren, dor löppt en Orner-Tosamenföhren." + +#. +> trunk +#: directorymergewindow.cpp:2248 +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 "" +"Bi den verleden Schritt hett dat en Fehler geven.\n" +"Wullt Du mit dat Element wiedermaken, dat den Fehler utlööst hett, oder wullt Du dat utlaten?" + +#. +> trunk +#: directorymergewindow.cpp:2250 +msgid "Continue merge after an error" +msgstr "Tosamenföhren na Fehler wiedermaken" + +#. +> trunk +#: directorymergewindow.cpp:2251 +msgid "Continue With Last Item" +msgstr "Mit verleden Element wiedermaken" + +#. +> trunk +#: directorymergewindow.cpp:2252 +msgid "Skip Item" +msgstr "Element utlaten" + +#. +> trunk +#: directorymergewindow.cpp:2286 +msgid "Skipped." +msgstr "Utlaten." + +#. +> trunk +#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 +msgid "In progress..." +msgstr "In de Maak..." + +#. +> trunk +#: directorymergewindow.cpp:2341 +msgid "Merge operation complete." +msgstr "Tosamenföhren afslaten." + +#. +> trunk +#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 +msgid "Merge Complete" +msgstr "Tosamenföhren afslaten" + +#. +> trunk +#: directorymergewindow.cpp:2354 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Dat simuleerte Tosamensmölten is afslaten Kiek, wat Du de vörslaan Akschonen utföhren wullt." + +#. +> trunk +#: directorymergewindow.cpp:2388 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Dat hett en Fehler geven. Klick op OK, wenn Du de Enkelheiten ankieken wullt.\n" + +#. +> trunk +#: directorymergewindow.cpp:2420 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Fehler bi't Wegdoon vun \"%1\": Opstellen vun Sekerheitkopie fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2427 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "Orner un Ünnerornern wegdoon (%1)" + +#. +> trunk +#: directorymergewindow.cpp:2429 +#, kde-format +msgid "delete( %1 )" +msgstr "wegdoon (%1)" + +#. +> trunk +#: directorymergewindow.cpp:2444 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Fehler: Wegdoon vun Orner fehlslaan, bides he leest wöör." + +#. +> trunk +#: directorymergewindow.cpp:2463 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Fehler: rmdir-Akschoon (%1) fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2473 +msgid "Error: delete operation failed." +msgstr "Fehler: Wegdoon fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2499 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "Vun Hand tosamenföhren (%1, %2, %3 -> %4)" + +#. +> trunk +#: directorymergewindow.cpp:2502 +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Beacht bitte: Na't Tosamenföhren vun Hand schull de Bruker mit F7 wiedermaken" + +#. +> trunk +#: directorymergewindow.cpp:2527 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Fehler: Koperen (%1 -> %2) fehlslaan. Wegdoon vun vörhannen Teel fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2536 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "Link koperen (%1 -> %2)" + +#. +> trunk +#: directorymergewindow.cpp:2547 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Fehler: Koperen vun Link fehlslaan. Feern links warrt noch nich ünnerstütt." + +#. +> trunk +#: directorymergewindow.cpp:2553 +msgid "Error: copyLink failed." +msgstr "Fehler: Koperen vun Link fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2578 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "Koperen (%1 -> %2)" + +#. +> trunk +#: directorymergewindow.cpp:2604 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Fehler bi't Ümnömen (%1 -> %2): Vörhannen Teel lett sik nich wegmaken." + +#. +> trunk +#: directorymergewindow.cpp:2610 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "Ümnömen (%1 -> %2)" + +#. +> trunk +#: directorymergewindow.cpp:2619 +msgid "Error: Rename failed." +msgstr "Fehler: Ümnömen fehlslaan." + +#. +> trunk +#: directorymergewindow.cpp:2637 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Fehler bi't Opstellen vun Orner \"%1\". Vörhannen Datei lett sik nich wegdoon." + +#. +> trunk +#: directorymergewindow.cpp:2653 +#, kde-format +msgid "makeDir( %1 )" +msgstr "Orner opstellen (%1)" + +#. +> trunk +#: directorymergewindow.cpp:2663 +msgid "Error while creating directory." +msgstr "Fehler bi't Opstellen vun Orner." + +#. +> trunk +#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 +msgid "Dest" +msgstr "Teel" + +#. +> trunk +#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 +msgid "Dir" +msgstr "Orner" + +#. +> trunk +#: directorymergewindow.cpp:2692 +msgid "Type" +msgstr "Typ" + +#. +> trunk +#: directorymergewindow.cpp:2692 +msgid "Size" +msgstr "Grött" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Attr" +msgstr "Attr" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Last Modification" +msgstr "Verleden Ännern" + +#. +> trunk +#: directorymergewindow.cpp:2693 +msgid "Link-Destination" +msgstr "Link-Teel" + +#. +> trunk +#: directorymergewindow.cpp:2740 +msgid "not available" +msgstr "nich verföögbor" + +#. +> trunk +#: directorymergewindow.cpp:2760 +msgid "A (Dest): " +msgstr "A (Teel): " + +#. +> trunk +#: directorymergewindow.cpp:2763 +msgid "A (Base): " +msgstr "B (Grundl.): " + +#. +> trunk +#: directorymergewindow.cpp:2769 +msgid "B (Dest): " +msgstr "B (Teel): " + +#. +> trunk +#: directorymergewindow.cpp:2777 +msgid "C (Dest): " +msgstr "C (Teel): " + +#. +> trunk +#: directorymergewindow.cpp:2783 +msgid "Dest: " +msgstr "Teel: " + +#. +> trunk +#: directorymergewindow.cpp:2850 +msgid "Save Directory Merge State As..." +msgstr "Orner-Tosamenföhrstatus sekern as..." + +#. +> trunk +#: directorymergewindow.cpp:2973 +msgid "Start/Continue Directory Merge" +msgstr "Orner-Tosamenföhren starten/wiedermaken" + +#. +> trunk +#: directorymergewindow.cpp:2974 +msgid "Run Operation for Current Item" +msgstr "Akschoon mit aktuell Element utföhren" + +#. +> trunk +#: directorymergewindow.cpp:2975 +msgid "Compare Selected File" +msgstr "Utsöcht Datei verglieken" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "Merge Current File" +msgstr "Aktuell Datei tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:2976 +msgid "" +"Merge\n" +"File" +msgstr "" +"Datei\n" +"tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:2977 +msgid "Fold All Subdirs" +msgstr "All Ünnerornern infoolden" + +#. +> trunk +#: directorymergewindow.cpp:2978 +msgid "Unfold All Subdirs" +msgstr "All Ünnerornern utfoolden" + +#. +> trunk +#: directorymergewindow.cpp:2982 +msgid "Choose A for All Items" +msgstr "A bi all Indrääg utsöken" + +#. +> trunk +#: directorymergewindow.cpp:2983 +msgid "Choose B for All Items" +msgstr "B bi all Indrääg utsöken" + +#. +> trunk +#: directorymergewindow.cpp:2984 +msgid "Choose C for All Items" +msgstr "C bi all Indrääg utsöken" + +#. +> trunk +#: directorymergewindow.cpp:2985 +msgid "Auto-Choose Operation for All Items" +msgstr "Akschoon bi all Indrääg automaatsch utsöken" + +#. +> trunk +#: directorymergewindow.cpp:2986 +msgid "No Operation for All Items" +msgstr "Keen Akschoon för all Indrääg" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "Show Identical Files" +msgstr "Liek Dateien wiesen" + +#. +> trunk +#: directorymergewindow.cpp:2991 +msgid "" +"Identical\n" +"Files" +msgstr "" +"Liek\n" +"Dateien" + +#. +> trunk +#: directorymergewindow.cpp:2992 +msgid "Show Different Files" +msgstr "Verscheden Dateien wiesen" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "Show Files only in A" +msgstr "Dateien bloots in A wiesen" + +#. +> trunk +#: directorymergewindow.cpp:2993 +msgid "" +"Files\n" +"only in A" +msgstr "" +"Dateien\n" +"bloots in A" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "Show Files only in B" +msgstr "Dateien bloots in B wiesen" + +#. +> trunk +#: directorymergewindow.cpp:2994 +msgid "" +"Files\n" +"only in B" +msgstr "" +"Dateien\n" +"bloots in B" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "Show Files only in C" +msgstr "Dateien bloots in C wiesen" + +#. +> trunk +#: directorymergewindow.cpp:2995 +msgid "" +"Files\n" +"only in C" +msgstr "" +"Dateien\n" +"bloots in C" + +#. +> trunk +#: directorymergewindow.cpp:2999 +msgid "Compare Explicitly Selected Files" +msgstr "Utsöcht Dateien verglieken" + +#. +> trunk +#: directorymergewindow.cpp:3000 +msgid "Merge Explicitly Selected Files" +msgstr "Utsöcht Dateien tosamenföhren" + +#. +> trunk +#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 +msgid "Do Nothing" +msgstr "Nix doon" + +#. +> trunk +#: directorymergewindow.cpp:3003 +msgid "A" +msgstr "A" + +#. +> trunk +#: directorymergewindow.cpp:3004 +msgid "B" +msgstr "B" + +#. +> trunk +#: directorymergewindow.cpp:3005 +msgid "C" +msgstr "C" + +#. +> trunk +#: directorymergewindow.cpp:3014 +msgid "Delete A && B" +msgstr "A un B wegdoon" + +#. +> trunk +#: directorymergewindow.cpp:3017 +msgid "Merge to A && B" +msgstr "Na A un B tosamenföhren" + +#. +> trunk +#: fileaccess.cpp:617 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"Bi't Opstellen vun en Sekerheitkopie lett sik en öller Sekerheitkopie nich wegdoon.\n" +"Dateinaam: " + +#. +> trunk +#: fileaccess.cpp:624 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"Bi't Opstellen vun en Sekerheitkopie lett sik en Datei nich ümnömen.\n" +"Dateinaams: " + +#. +> trunk +#: fileaccess.cpp:648 +#, kde-format +msgid "Getting file status: %1" +msgstr "Dateistatus warrt leest: %1" + +#. +> trunk +#: fileaccess.cpp:691 +#, kde-format +msgid "Reading file: %1" +msgstr "Datei warrt leest: %1" + +#. +> trunk +#: fileaccess.cpp:728 +#, kde-format +msgid "Writing file: %1" +msgstr "Datei warrt schreven: %1" + +#. +> trunk +#: fileaccess.cpp:756 +msgid "Out of memory" +msgstr "Nich noog Spieker" + +#. +> trunk +#: fileaccess.cpp:791 +#, kde-format +msgid "Making directory: %1" +msgstr "Orner warrt opstellt: %1" + +#. +> trunk +#: fileaccess.cpp:811 +#, kde-format +msgid "Removing directory: %1" +msgstr "Orner warrt wegmaakt: %1" + +#. +> trunk +#: fileaccess.cpp:826 +#, kde-format +msgid "Removing file: %1" +msgstr "Datei warrt wegmaakt: %1" + +#. +> trunk +#: fileaccess.cpp:842 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Symboolsch Link warrt opstellt: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:869 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Datei warrt ümnöömt: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:902 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Datei warrt kopeert: %1 -> %2" + +#. +> trunk +#: fileaccess.cpp:916 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Fehler bi't Koperen: Datei lett sik nich lesen. Dateinaam: %1" + +#. +> trunk +#: fileaccess.cpp:922 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Fehler bi't Koperen: Datei lett sik nich schrieven. Dateinaam: %1" + +#. +> trunk +#: fileaccess.cpp:937 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Fehler bi't Koperen: Lesen fehlslaan. Dateinaam: %1" + +#. +> trunk +#: fileaccess.cpp:946 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Fehler bi't Koperen: Schrieven fehlslaan. Dateinaam: %1" + +#. +> trunk +#: fileaccess.cpp:1236 +msgid "Reading directory: " +msgstr "Orner warrt leest: " + +#. +> trunk +#: fileaccess.cpp:1360 +#, kde-format +msgid "Listing directory: %1" +msgstr "Orner warrt oplist: %1" + +#. +> trunk +#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 +msgid "&Cancel" +msgstr "&Afbreken" + +#. +> trunk +#: kdiff3.cpp:169 +msgid "Current Configuration:" +msgstr "Aktuell Instellen:" + +#. +> trunk +#: kdiff3.cpp:174 +msgid "Config Option Error:" +msgstr "Fehler binnen de Instellen:" + +#. +> trunk +#: kdiff3.cpp:219 +msgid "Option --auto used, but no output file specified." +msgstr "Optschoon \"--auto\" bruukt, man keen Utgaavdatei angeven." + +#. +> trunk +#: kdiff3.cpp:369 +msgid "Option --auto ignored for directory comparison." +msgstr "Optschoon \"--auto\" warrt bi't Verglieken vun Ornern övergahn." + +#. +> trunk +#: kdiff3.cpp:405 +msgid "Saving failed." +msgstr "Sekern fehlslaan." + +#. +> trunk +#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 +msgid "Opening of these files failed:" +msgstr "Disse Dateien laat sik nich opmaken:" + +#. +> trunk +#: kdiff3.cpp:449 +msgid "File Open Error" +msgstr "Fehler bi't Opmaken" + +#. +> trunk +#: kdiff3.cpp:477 +msgid "Opens documents for comparison..." +msgstr "Dokmenten warrt för't Verglieken opmaakt..." + +#. +> trunk +#: kdiff3.cpp:479 +msgid "Reload" +msgstr "Nieg laden" + +#. +> trunk +#: kdiff3.cpp:482 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Sekert dat Resultaat vun't Tosamenföhren. All Konflikten mööt oplööst wesen!" + +#. +> trunk +#: kdiff3.cpp:484 +msgid "Saves the current document as..." +msgstr "Sekert dat aktuelle Dokment as..." + +#. +> trunk +#: kdiff3.cpp:487 +msgid "Print the differences" +msgstr "Verscheel drucken" + +#. +> trunk +#: kdiff3.cpp:490 +msgid "Quits the application" +msgstr "Maakt dat Programm ut" + +#. +> trunk +#: kdiff3.cpp:492 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Knippt dat utsöchte Rebeet un föögt dat na de Twischenaflaag in" + +#. +> trunk +#: kdiff3.cpp:494 +msgid "Copies the selected section to the clipboard" +msgstr "Kopeert den utsöchten Afsnitt na de Twischenaflaag" + +#. +> trunk +#: kdiff3.cpp:496 +msgid "Pastes the clipboard contents to current position" +msgstr "Föögt de Twischenaflaag ehr Inholt bi de aktuelle Steed in." + +#. +> trunk +#: kdiff3.cpp:498 +msgid "Select everything in current window" +msgstr "Allens binnen dat aktuelle Finster utsöken" + +#. +> trunk +#: kdiff3.cpp:500 +msgid "Search for a string" +msgstr "Na en Tekenkeed söken" + +#. +> trunk +#: kdiff3.cpp:502 +msgid "Search again for the string" +msgstr "Nochmaal na en Tekenkeed söken" + +#. +> trunk +#: kdiff3.cpp:507 +msgid "Enables/disables the statusbar" +msgstr "Maakt den Statusbalken an oder ut" + +#. +> trunk +#: kdiff3.cpp:511 +msgid "Configure KDiff3..." +msgstr "KDiff3 instellen..." + +#. +> trunk +#: kdiff3.cpp:532 +msgid "Go to Current Delta" +msgstr "Na aktuellen Verscheel gahn" + +#. +> trunk +#: kdiff3.cpp:532 +msgid "" +"Current\n" +"Delta" +msgstr "" +"Aktuell\n" +"Verscheel" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "Go to First Delta" +msgstr "Na eersten Verscheel gahn" + +#. +> trunk +#: kdiff3.cpp:534 +msgid "" +"First\n" +"Delta" +msgstr "" +"Eerst\n" +"Verscheel" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "Go to Last Delta" +msgstr "Na lesten Verscheel gahn" + +#. +> trunk +#: kdiff3.cpp:536 +msgid "" +"Last\n" +"Delta" +msgstr "" +"Lest\n" +"Verscheel" + +#. +> trunk +#: kdiff3.cpp:538 +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Övergeiht Freeruum-Verschelen, wenn \"Freerüüm wiesen\" utmaakt is.)" + +#. +> trunk +#: kdiff3.cpp:539 +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Övergeiht Freeruum-Verschelen nich, ok wenn \"Freerüüm wiesen\" utmaakt is.)" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "Go to Previous Delta" +msgstr "Na verleden Verscheel gahn" + +#. +> trunk +#: kdiff3.cpp:540 +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Verleden\n" +"Verscheel" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "Go to Next Delta" +msgstr "Na nakamen Verscheel gahn" + +#. +> trunk +#: kdiff3.cpp:542 +msgid "" +"Next\n" +"Delta" +msgstr "" +"Nakamen\n" +"Verscheel" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "Go to Previous Conflict" +msgstr "Na verleden Konflikt gahn" + +#. +> trunk +#: kdiff3.cpp:544 +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Verleden\n" +"Konflikt" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "Go to Next Conflict" +msgstr "Na nakamen Konflikt gahn" + +#. +> trunk +#: kdiff3.cpp:546 +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Nakamen\n" +"Konflikt" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "Go to Previous Unsolved Conflict" +msgstr "Na verleden Konflikt gahn, de nich oplööst is" + +#. +> trunk +#: kdiff3.cpp:548 +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Verleden\n" +"n. oplööst" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "Go to Next Unsolved Conflict" +msgstr "Na nakamen Konflikt gahn, de nich oplööst is" + +#. +> trunk +#: kdiff3.cpp:550 +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Nakamen\n" +"n. oplööst" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "Select Line(s) From A" +msgstr "Reeg ut A bruken" + +#. +> trunk +#: kdiff3.cpp:552 +msgid "" +"Choose\n" +"A" +msgstr "" +"A\n" +"bruken" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "Select Line(s) From B" +msgstr "Reeg ut B bruken" + +#. +> trunk +#: kdiff3.cpp:553 +msgid "" +"Choose\n" +"B" +msgstr "" +"B\n" +"bruken" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "Select Line(s) From C" +msgstr "Reeg ut C bruken" + +#. +> trunk +#: kdiff3.cpp:554 +msgid "" +"Choose\n" +"C" +msgstr "" +"C\n" +"bruken" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Na Bornköör automaatsch na nakamen nich oplöösten Konflikt gahn" + +#. +> trunk +#: kdiff3.cpp:555 +msgid "" +"Auto\n" +"Next" +msgstr "" +"Autom.\n" +"Nakamen" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "Show Space && Tabulator Characters for Differences" +msgstr "Free- un Tab-Tekens as Verscheel wiesen" + +#. +> trunk +#: kdiff3.cpp:557 +msgid "" +"White\n" +"Characters" +msgstr "Freerüüm" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "Show White Space" +msgstr "Freerüüm wiesen" + +#. +> trunk +#: kdiff3.cpp:558 +msgid "" +"White\n" +"Deltas" +msgstr "" +"Freeruum-\n" +"Verschelen" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "Show Line Numbers" +msgstr "Reegnummern wiesen" + +#. +> trunk +#: kdiff3.cpp:560 +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Reeg-\n" +"nummern" + +#. +> trunk +#: kdiff3.cpp:561 +msgid "Choose A Everywhere" +msgstr "Jümmers A bruken" + +#. +> trunk +#: kdiff3.cpp:562 +msgid "Choose B Everywhere" +msgstr "Jümmers B bruken" + +#. +> trunk +#: kdiff3.cpp:563 +msgid "Choose C Everywhere" +msgstr "Jümmers C bruken" + +#. +> trunk +#: kdiff3.cpp:564 +msgid "Choose A for All Unsolved Conflicts" +msgstr "A för all nich oplööst Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:565 +msgid "Choose B for All Unsolved Conflicts" +msgstr "B för all nich oplööst Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:566 +msgid "Choose C for All Unsolved Conflicts" +msgstr "C för all nich oplööst Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:567 +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "A för all nich oplööst Freeruum-Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:568 +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "B för all nich oplööst Freeruum-Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:569 +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "C för all nich oplööst Freeruum-Konflikten bruken" + +#. +> trunk +#: kdiff3.cpp:570 +msgid "Automatically Solve Simple Conflicts" +msgstr "Eenfach Konflikten automaatsch oplösen" + +#. +> trunk +#: kdiff3.cpp:571 +msgid "Set Deltas to Conflicts" +msgstr "All Verschelen as Konflikten markeren" + +#. +> trunk +#: kdiff3.cpp:572 +msgid "Run Regular Expression Auto Merge" +msgstr "Automaatsch Tosamenföhren mit reguleer Utdruck" + +#. +> trunk +#: kdiff3.cpp:573 +msgid "Automatically Solve History Conflicts" +msgstr "Vörgeschicht-Konflikten automaatsch oplösen" + +#. +> trunk +#: kdiff3.cpp:574 +msgid "Split Diff At Selection" +msgstr "Verscheel bi Köör delen" + +#. +> trunk +#: kdiff3.cpp:575 +msgid "Join Selected Diffs" +msgstr "Utsöcht Verschelen tosamenstellen" + +#. +> trunk +#: kdiff3.cpp:577 +msgid "Show Window A" +msgstr "Finster A wiesen" + +#. +> trunk +#: kdiff3.cpp:578 +msgid "Show Window B" +msgstr "Finster B wiesen" + +#. +> trunk +#: kdiff3.cpp:579 +msgid "Show Window C" +msgstr "Finster C wiesen" + +#. +> trunk +#: kdiff3.cpp:580 kdiff3.cpp:591 +msgid "Focus Next Window" +msgstr "Nakamen Finster anmaken" + +#. +> trunk +#: kdiff3.cpp:582 +msgid "Normal Overview" +msgstr "Normaal Översicht" + +#. +> trunk +#: kdiff3.cpp:583 +msgid "A vs. B Overview" +msgstr "A-B-Översicht" + +#. +> trunk +#: kdiff3.cpp:584 +msgid "A vs. C Overview" +msgstr "A-C-Översicht" + +#. +> trunk +#: kdiff3.cpp:585 +msgid "B vs. C Overview" +msgstr "B-C-Översicht" + +#. +> trunk +#: kdiff3.cpp:586 +msgid "Word Wrap Diff Windows" +msgstr "Regen ümbreken" + +#. +> trunk +#: kdiff3.cpp:587 +msgid "Add Manual Diff Alignment" +msgstr "Verscheel-Utrichten vun Hand tofögen" + +#. +> trunk +#: kdiff3.cpp:588 +msgid "Clear All Manual Diff Alignments" +msgstr "All Vun-Hand-Utrichten wegmaken" + +#. +> trunk +#: kdiff3.cpp:593 +msgid "Focus Prev Window" +msgstr "Verleden Finster anmaken" + +#. +> trunk +#: kdiff3.cpp:594 +msgid "Toggle Split Orientation" +msgstr "Deelricht wesseln" + +#. +> trunk +#: kdiff3.cpp:596 +msgid "Dir && Text Split Screen View" +msgstr "Deelt Ansicht för Orner un Text" + +#. +> trunk +#: kdiff3.cpp:598 +msgid "Toggle Between Dir && Text View" +msgstr "Orner- un Text-Ansicht wesseln" + +#. +> trunk +#: kdiff3.cpp:654 pdiff.cpp:1812 +msgid "The merge result hasn't been saved." +msgstr "Tosamenföhr-Resultaat wöör nich sekert" + +#. +> trunk +#: kdiff3.cpp:656 +msgid "Save && Quit" +msgstr "Sekern && Utmaken" + +#. +> trunk +#: kdiff3.cpp:657 +msgid "Quit Without Saving" +msgstr "Utmaken un nich Sekern" + +#. +> trunk +#: kdiff3.cpp:665 pdiff.cpp:1823 +msgid "Saving the merge result failed." +msgstr "Tosamenföhr-Resultaat lett sik nich sekern" + +#. +> trunk +#: kdiff3.cpp:676 pdiff.cpp:1078 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Du föhrst jüst Ornern tosamen. Wullt Du dat redig afbreken?" + +#. +> trunk +#: kdiff3.cpp:701 +msgid "Saving file..." +msgstr "Datei warrt sekert..." + +#. +> trunk +#: kdiff3.cpp:718 +msgid "Saving file with a new filename..." +msgstr "Datei warrt mit en nieg Dateinaam sekert..." + +#. +> trunk +#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 +msgid "Save As..." +msgstr "Sekern as..." + +#. +> trunk +#: kdiff3.cpp:781 +msgid "Printing not implemented." +msgstr "Drucken nich inbuut" + +#. +> trunk +#: kdiff3.cpp:815 +msgid "Printing..." +msgstr "An't Drucken..." + +#. +> trunk +#: kdiff3.cpp:956 +msgid "Selection" +msgstr "Köör" + +#. +> trunk +#: kdiff3.cpp:982 +msgid "Printing completed." +msgstr "Drucken afslaten." + +#. +> trunk +#: kdiff3.cpp:986 +msgid "Printing aborted." +msgstr "Drucken afbraken." + +#. +> trunk +#: kdiff3.cpp:993 +msgid "Exiting..." +msgstr "Bi to utstiegen..." + +#. +> trunk +#: kdiff3.cpp:1006 +msgid "Toggling toolbar..." +msgstr "Warktüüchbalken warrt an-/utmaakt..." + +#. +> trunk +#: kdiff3.cpp:1027 +msgid "Toggle the statusbar..." +msgstr "Statusbalken an-/utmaken..." + +#. +> trunk +#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 +msgid "Couldn't find files for comparison." +msgstr "Dateien för't Verglieken laat sik nich finnen." + +#. +> trunk +#: kdiff3_part.cpp:302 +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk +#: kdiff3_part.cpp:303 main.cpp:174 +msgid "Joachim Eibl" +msgstr "Joachim Eibl" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:4 +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_part.rc:13 +msgid "Configure KDiff3" +msgstr "KDiff3 instellen" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_part.rc:16 +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk +#: kdiff3_shell.cpp:76 +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"De KDiff3-Komponent lett sik nich torechtmaken.\n" +"Dit kummt normalerwies bi Problemen mit de Installatschoon vör. De Enkelheiten staht binnen de README-Datei vun't Born-Paket." + +#. i18n: ectx: Menu (file) +#. +> trunk +#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 +msgid "&File" +msgstr "&Datei" + +#. i18n: ectx: Menu (directory) +#. +> trunk +#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 +msgid "&Directory" +msgstr "&Orner" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk +#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 +#: kreplacements/kreplacements.cpp:497 +msgid "Current Item Merge Operation" +msgstr "Tosamenföhr-Akschoon för aktuell Element" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk +#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 +#: kreplacements/kreplacements.cpp:498 +msgid "Current Item Sync Operation" +msgstr "Synkroniseer-Akschoon för aktuell Element" + +#. i18n: ectx: Menu (movement) +#. +> trunk +#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 +msgid "&Movement" +msgstr "&Verschuven" + +#. i18n: ectx: Menu (diff) +#. +> trunk +#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 +msgid "D&iffview" +msgstr "Verscheel&ansicht" + +#. i18n: ectx: Menu (merge) +#. +> trunk +#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 +msgid "&Merge" +msgstr "&Tosamenföhren" + +#. i18n: ectx: Menu (window) +#. +> trunk +#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 +msgid "&Window" +msgstr "&Finster" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk +#: kdiff3_shell.rc:106 +msgid "Main Toolbar" +msgstr "Hööft-Warktüüchbalken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 +#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 +msgid "Cancel" +msgstr "Afbreken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 +#: smalldialogs.cpp:508 +msgid "OK" +msgstr "OK" + +#. +> trunk +#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 +msgid "Help" +msgstr "Hülp" + +#. +> trunk +#: kreplacements/kreplacements.cpp:185 +msgid "Defaults" +msgstr "Vörinstellen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:297 +msgid "&Edit" +msgstr "&Bewerken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:305 +msgid "&Settings" +msgstr "&Instellen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:306 +msgid "&Help" +msgstr "&Hülp" + +#. +> trunk +#: kreplacements/kreplacements.cpp:353 +msgid "&About" +msgstr "&Vertell wat över" + +#. +> trunk +#: kreplacements/kreplacements.cpp:369 +msgid "A&uthor" +msgstr "A&utor" + +#. +> trunk +#: kreplacements/kreplacements.cpp:383 +msgid "&Thanks To" +msgstr "&Dank" + +#. +> trunk +#: kreplacements/kreplacements.cpp:597 +msgid "Open" +msgstr "Opmaken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:606 +msgid "Save" +msgstr "Sekern" + +#. +> trunk +#: kreplacements/kreplacements.cpp:623 +msgid "Print..." +msgstr "Drucken..." + +#. +> trunk +#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 +msgid "Quit" +msgstr "Utmaken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:639 +msgid "Cut" +msgstr "Knippen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:647 +msgid "Copy" +msgstr "Koperen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:655 +msgid "Paste" +msgstr "Infögen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:663 +msgid "Select All" +msgstr "All utsöken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:671 +msgid "Show Toolbar" +msgstr "Warktüüchbalken wiesen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:679 +msgid "Show &Status Bar" +msgstr "&Statusbalken wiesen" + +#. +> trunk +#: kreplacements/kreplacements.cpp:687 +#, kde-format +msgid "&Configure %1..." +msgstr "%1 &instellen..." + +#. +> trunk +#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 +msgid "About" +msgstr "Över" + +#. +> trunk +#: kreplacements/kreplacements.cpp:722 +msgid "Find" +msgstr "Söken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:730 +msgid "Find Next" +msgstr "Nakamen söken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:750 +msgid "Select Font" +msgstr "Schriftoort utsöken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 +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 "" +"Du hest en Schriftoort mit variabel Breed utsöcht.\n" +"\n" +"Dit Programm kann Schriftoorden mit variabel Breed nich richtig\n" +"bruken, Du hest villicht Problemen bi't Bewerken vun Dateien.\n" +"\n" +"Wullt Du wiedermaken oder en anner Schriftoort utsöken?" + +#. +> trunk +#: kreplacements/kreplacements.cpp:792 +msgid "Incompatible font." +msgstr "Schriftoort is nich kompatibel." + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Continue at my own risk" +msgstr "Op mien egen Riskanz wiedermaken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:793 +msgid "Select another font" +msgstr "En anner Schriftoort utsöken" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1134 +msgid "For more documentation, see the help-menu or the subdirectory doc." +msgstr "Anner Dokmentatschoon gifft dat in't Hülp-Menü oder in't Kapitel Ünnerornern." + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "KDiff3-Usage" +msgstr "KDiff3-Bruuk" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "Ignore" +msgstr "Övergahn" + +#. +> trunk +#: kreplacements/kreplacements.cpp:1137 +msgid "Exit" +msgstr "Utstiegen" + +#. +> trunk +#: kreplacements/kreplacements.h:105 +msgid "Continue" +msgstr "Wiedermaken" + +#. +> trunk +#: main.cpp:74 main.cpp:76 +msgid "Ignored. (User defined.)" +msgstr "Övergahn. (Vun'n Bruker fastleggt.)" + +#. +> trunk +#: main.cpp:162 +msgid "kdiff3" +msgstr "kdiff3" + +#. +> trunk +#: main.cpp:166 +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Tosamenföhr-Warktüüch för Dateien un Ornern" + +#. +> trunk +#: main.cpp:167 +msgid "(c) 2002-2011 Joachim Eibl" +msgstr "© 2002-2011, Joachim Eibl" + +#. +> trunk +#: main.cpp:175 +msgid "Eike Sauer" +msgstr "Eike Sauer" + +#. +> trunk +#: main.cpp:175 +msgid "Bugfixes, Debian package maintainer" +msgstr "Fehlerrichten, Pleger för de Debian-Paketen" + +#. +> trunk +#: main.cpp:176 +msgid "Sebastien Fricker" +msgstr "Sebastien Fricker" + +#. +> trunk +#: main.cpp:176 +msgid "Windows installer" +msgstr "Windows-Installeerprogramm" + +#. +> trunk +#: main.cpp:177 +msgid "Stephan Binner" +msgstr "Stephan Binner" + +#. +> trunk +#: main.cpp:177 +msgid "i18n-help" +msgstr "i18n-Hülp" + +#. +> trunk +#: main.cpp:178 +msgid "Stefan Partheymueller" +msgstr "Stefan Partheymueller" + +#. +> trunk +#: main.cpp:178 +msgid "Clipboard-patch" +msgstr "Twischenaflaag-Kodeplaster" + +#. +> trunk +#: main.cpp:179 +msgid "David Faure" +msgstr "David Faure" + +#. +> trunk +#: main.cpp:179 +msgid "KIO-Help" +msgstr "KIO-Hülp" + +#. +> trunk +#: main.cpp:180 +msgid "Bernd Gehrmann" +msgstr "Bernd Gehrmann" + +#. +> trunk +#: main.cpp:180 +msgid "Class CvsIgnoreList from Cervisia" +msgstr "Klass \"CvsIgnoreList\" ut \"Cervisia\"" + +#. +> trunk +#: main.cpp:181 +msgid "Andre Woebbeking" +msgstr "Andre Woebbeking" + +#. +> trunk +#: main.cpp:181 +msgid "Class StringMatcher" +msgstr "Klass \"StringMatcher\"" + +#. +> trunk +#: main.cpp:182 +msgid "Michael Denio" +msgstr "Michael Denio" + +#. +> trunk +#: main.cpp:182 +msgid "Directory Equality-Coloring patch" +msgstr "Kodeplaster för Orner-Liekheitklören" + +#. +> trunk +#: main.cpp:183 +msgid "Manfred Koehler" +msgstr "Manfred Koehler" + +#. +> trunk +#: main.cpp:183 +msgid "Fix for slow startup on Windows" +msgstr "Richten vun langsam Start op Windows" + +#. +> trunk +#: main.cpp:184 +msgid "Sergey Zorin" +msgstr "Sergey Zorin" + +#. +> trunk +#: main.cpp:184 +msgid "Diff Ext for Windows" +msgstr "Extern Diff för Windows" + +#. +> trunk +#: main.cpp:185 +msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" + +#. +> trunk +#: main.cpp:185 +msgid "GNU-Diffutils" +msgstr "GNU-Diffutils" + +#. +> trunk +#: main.cpp:186 +msgid "Tino Boellsterling, Timothy Mee" +msgstr "Tino Boellsterling, Timothy Mee" + +#. +> trunk +#: main.cpp:186 +msgid "Intensive test, use and feedback" +msgstr "Deegt Proberen, Bruuk un Resonanz" + +#. +> trunk +#: main.cpp:187 +msgid "Michael Schmidt" +msgstr "Michael Schmidt" + +#. +> trunk +#: main.cpp:187 +msgid "Mac support" +msgstr "Mac-Ünnerstütten" + +#. +> trunk +#: main.cpp:188 +msgid "Valentin Rusu" +msgstr "Valentin Rusu" + +#. +> trunk +#: main.cpp:188 main.cpp:189 +msgid "KDE4 porting" +msgstr "Porteren na KDE4" + +#. +> trunk +#: main.cpp:189 +msgid "Albert Astals Cid" +msgstr "Albert Astals Cid" + +#. +> trunk +#: main.cpp:190 +msgid "Silvan Scherrer" +msgstr "Silvan Scherrer" + +#. +> trunk +#: main.cpp:190 +msgid "OS2 port" +msgstr "Porteren na OS2" + +#. +> trunk +#: main.cpp:192 +msgid "+ Many thanks to those who reported bugs and contributed ideas!" +msgstr "Un velen Dank to all de Lüüd, de Fehlerberichten schreven un Vörslääg maakt hebbt!" + +#. +> trunk +#: main.cpp:198 +msgid "Merge the input." +msgstr "De Ingaav tosamenföhren" + +#. +> trunk +#: main.cpp:199 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Utspraken Basisdatei. För de Kompatibiliteet mit anner Warktüüch." + +#. +> trunk +#: main.cpp:200 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Utgaavdatei. Slutt \"-m\" in. Bispill: -o niegdatei.txt" + +#. +> trunk +#: main.cpp:201 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Utgaavdatei, nochmaal. (För de Kompatibiliteet mit anner Warktüüch.)" + +#. +> trunk +#: main.cpp:202 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "Keen Böversiet, wenn sik all Konflikten automaatsch oplösen laat (\"-o Utgaavdatei\" nödig)" + +#. +> trunk +#: main.cpp:203 +msgid "Don't solve conflicts automatically. (For compatibility...)" +msgstr "Konflikt nich automaatsch oplösen. (För de Kompatibiliteet...)" + +#. +> trunk +#: main.cpp:204 +msgid "Visible name replacement for input file 1 (base)." +msgstr "Sichtbor Tuuschnaam för Ingaavdatei 1 (Grundlaag)." + +#. +> trunk +#: main.cpp:205 +msgid "Visible name replacement for input file 2." +msgstr "Sichtbor Tuuschnaam för Ingaavdatei 2." + +#. +> trunk +#: main.cpp:206 +msgid "Visible name replacement for input file 3." +msgstr "Sichtbor Tuuschnaam för Ingaavdatei 3." + +#. +> trunk +#: main.cpp:207 +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Anner sichtbor Tuuschnaam. Eenmaal för elkeen Ingaavdatei angeven." + +#. +> trunk +#: main.cpp:208 +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "En Instellen överschrieven. Eenmaal för elkeen Instellen bruken, a.B.: »--cs \"AutoAdvance=1\"«" + +#. +> trunk +#: main.cpp:209 +msgid "Show list of config settings and current values." +msgstr "List vun Instellenoptschonen un Weerten wiesen" + +#. +> trunk +#: main.cpp:210 +msgid "Use a different config file." +msgstr "En anner Instellendatei bruken" + +#. +> trunk +#: main.cpp:213 +msgid "file1 to open (base, if not specified via --base)" +msgstr "Eerste Datei, de Du opmaken wullt (Grundlaag, wenn nich mit \"--base\" angeven)" + +#. +> trunk +#: main.cpp:214 +msgid "file2 to open" +msgstr "Twete Datei, de Du opmaken wullt" + +#. +> trunk +#: main.cpp:215 +msgid "file3 to open" +msgstr "Drüdde Datei, de Du opmaken wullt" + +#. +> trunk +#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 +#: mergeresultwindow.cpp:1014 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Tall vun överbleven nich oplööst Konflikten: %1 (dor sünd %2 vun Freeruum-Konflikten)" + +#. +> trunk +#: mergeresultwindow.cpp:303 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Du hest de Utgaav ännert.\n" +"Maakst Du wieder, kaamt Dien Ännern weg." + +#. +> trunk +#: mergeresultwindow.cpp:834 pdiff.cpp:532 +msgid "All input files are binary equal." +msgstr "All Ingaavdateien sünd bineer liek." + +#. +> trunk +#: mergeresultwindow.cpp:836 +msgid "All input files contain the same text." +msgstr "All Ingaavdateien bargt den sülven Text." + +#. +> trunk +#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 +#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "De Dateien %1 un %2 sünd bineer liek.\n" + +#. +> trunk +#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 +#: mergeresultwindow.cpp:843 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "De Dateien %1 un %2 bargt den sülven Text.\n" + +#. +> trunk +#: mergeresultwindow.cpp:849 +msgid "Total number of conflicts: " +msgstr "Heel Tall vun Konflikt: " + +#. +> trunk +#: mergeresultwindow.cpp:850 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"Tall vun automaatsch oplööst Konflikten: " + +#. +> trunk +#: mergeresultwindow.cpp:851 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"Tall vun nich oplööst Konflikten: " + +#. +> trunk +#: mergeresultwindow.cpp:853 +msgid "Conflicts" +msgstr "Konflikten" + +#. +> trunk +#: mergeresultwindow.cpp:1728 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1736 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 +msgid "" +msgstr "" + +#. +> trunk +#: mergeresultwindow.cpp:2725 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"Noch sünd nich all Konflikten oplööst.\n" +"Datei nich sekert.\n" + +#. +> trunk +#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 +msgid "Conflicts Left" +msgstr "Konflikten na" + +#. +> trunk +#: mergeresultwindow.cpp:2734 +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" +msgstr "" +"Dat giffft en Konflikt mit de Reegennen. Söök bitte den Reegenn-Stil vun Hand ut.\n" +"Datei nich sekert.\n" + +#. +> trunk +#: mergeresultwindow.cpp:2748 +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Sekerheitkopie lett sik nich opstellen. Datei nich sekert." + +#. +> trunk +#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 +msgid "File Save Error" +msgstr "Fehler bi't Sekern" + +#. +> trunk +#: mergeresultwindow.cpp:2792 +msgid "Error while writing." +msgstr "Fehler bi't Schrieven" + +#. +> trunk +#: mergeresultwindow.cpp:3122 +msgid "Output" +msgstr "Utgaav" + +#. +> trunk +#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 +msgid "[Modified]" +msgstr "[Ännert]" + +#. +> trunk +#: mergeresultwindow.cpp:3141 +msgid "Encoding for saving" +msgstr "Koderen bi't Sekern" + +#. +> trunk +#: mergeresultwindow.cpp:3229 +msgid "Conflict" +msgstr "Konflikt" + +#. +> trunk +#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 +#: mergeresultwindow.cpp:3265 +msgid "Codec from" +msgstr "Koderen vun" + +#. +> trunk +#: optiondialog.cpp:367 +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 Bit" + +#. +> trunk +#: optiondialog.cpp:368 +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk +#: optiondialog.cpp:369 +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk +#: optiondialog.cpp:388 +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Änner dit, wenn Tekens buten dat ASCII-Rebeet nich propper wiest warrt." + +#. +> trunk +#: optiondialog.cpp:465 +msgid "Configure" +msgstr "Instellen" + +#. +> trunk +#: optiondialog.cpp:531 +msgid "Font" +msgstr "Schriftoort" + +#. +> trunk +#: optiondialog.cpp:532 +msgid "Editor & Diff Output Font" +msgstr "Editor- un Verscheel-Schriftoort" + +#. +> trunk +#: optiondialog.cpp:556 +msgid "Italic font for deltas" +msgstr "Kursievschrift för Verschelen" + +#. +> trunk +#: optiondialog.cpp:559 +msgid "" +"Selects the italic version of the font for differences.\n" +"If the font doesn't support italic characters, then this does nothing." +msgstr "" +"Bruukt för Verschelen de Schriftoort in kursiev.\n" +"Gifft dat för de Schriftoort keen kursive Tekens, deit disse Optschoon nix." + +#. +> trunk +#: optiondialog.cpp:568 +msgid "Color" +msgstr "Klöör" + +#. +> trunk +#: optiondialog.cpp:569 +msgid "Colors Settings" +msgstr "Klören instellen" + +#. +> trunk +#: optiondialog.cpp:588 +msgid "Editor and Diff Views:" +msgstr "Editor- un Verscheel-Ansichten:" + +#. +> trunk +#: optiondialog.cpp:596 +msgid "Foreground color:" +msgstr "Vörgrundklöör:" + +#. +> trunk +#: optiondialog.cpp:603 +msgid "Background color:" +msgstr "Achtergrundklöör:" + +#. +> trunk +#: optiondialog.cpp:612 +msgid "Diff background color:" +msgstr "Verscheel-Achtergrundklöör:" + +#. +> trunk +#: optiondialog.cpp:620 +msgid "Color A:" +msgstr "Klöör A:" + +#. +> trunk +#: optiondialog.cpp:628 +msgid "Color B:" +msgstr "Klöör B:" + +#. +> trunk +#: optiondialog.cpp:636 +msgid "Color C:" +msgstr "Klöör C:" + +#. +> trunk +#: optiondialog.cpp:643 +msgid "Conflict color:" +msgstr "Konflikt-Klöör:" + +#. +> trunk +#: optiondialog.cpp:651 +msgid "Current range background color:" +msgstr "Achtergrundklöör för aktuell Rebeet:" + +#. +> trunk +#: optiondialog.cpp:659 +msgid "Current range diff background color:" +msgstr "Verscheel-Achtergrundklöör för aktuell Rebeet:" + +#. +> trunk +#: optiondialog.cpp:666 +msgid "Color for manually aligned difference ranges:" +msgstr "Klöör för vun Hand utricht Verscheelrebeden:" + +#. +> trunk +#: optiondialog.cpp:672 +msgid "Directory Comparison View:" +msgstr "Ornerverscheel-Ansicht:" + +#. +> trunk +#: optiondialog.cpp:678 +msgid "Newest file color:" +msgstr "Klöör för niegst Datei:" + +#. +> trunk +#: optiondialog.cpp:682 +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Ännern an disse Klöör warrt eerst bi't nakamen Verglieken vun Ornern bruukt." + +#. +> trunk +#: optiondialog.cpp:687 +msgid "Oldest file color:" +msgstr "Klöör för öllst Datei:" + +#. +> trunk +#: optiondialog.cpp:695 +msgid "Middle age file color:" +msgstr "Klöör för en middeloolt Datei:" + +#. +> trunk +#: optiondialog.cpp:703 +msgid "Color for missing files:" +msgstr "Klöör för fehlen Dateien:" + +#. +> trunk +#: optiondialog.cpp:717 +msgid "Editor" +msgstr "Editor" + +#. +> trunk +#: optiondialog.cpp:718 +msgid "Editor Behavior" +msgstr "Editor-Bedregen" + +#. +> trunk +#: optiondialog.cpp:732 +msgid "Tab inserts spaces" +msgstr "Tabtast föögt Freetekens in" + +#. +> trunk +#: optiondialog.cpp:735 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"An: De Tabtast föögt en propper Tall vun Freetekens in.\n" +"Ut: De Tabtast föögt en Tabteken in." + +#. +> trunk +#: optiondialog.cpp:741 +msgid "Tab size:" +msgstr "Tab-Breed:" + +#. +> trunk +#: optiondialog.cpp:747 +msgid "Auto indentation" +msgstr "Autom. inrücken" + +#. +> trunk +#: optiondialog.cpp:750 +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "An: De Inrückdeepde ut de verleden Reeg warrt för de niege bruukt.\n" + +#. +> trunk +#: optiondialog.cpp:754 +msgid "Auto copy selection" +msgstr "Köör autom. koperen" + +#. +> trunk +#: optiondialog.cpp:757 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"An: All Kören warrt fuurts na de Twischenaflaag kopeert.\n" +"Ut: Du muttst dat Koperen sülven maken, a.B. mit Strg+C." + +#. +> trunk +#: optiondialog.cpp:772 +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Leggt de Tekens fast, de bi't Sekern för Reegennen bruukt warrt.\n" +"DOS/Windows: CR+LF, UNIX: LF (CR = 0D, LF = 0A)" + +#. +> trunk +#: optiondialog.cpp:784 +msgid "Diff" +msgstr "Verscheel" + +#. +> trunk +#: optiondialog.cpp:785 +msgid "Diff Settings" +msgstr "Verscheel-Instellen" + +#. +> trunk +#: optiondialog.cpp:809 +msgid "Treat as white space." +msgstr "As Freeruum hanteren" + +#. +> trunk +#: optiondialog.cpp:811 +msgid "Ignore numbers" +msgstr "Tallen övergahn" + +#. +> trunk +#: optiondialog.cpp:814 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Talltekens bi't Regenutrichten övergahn (liek to \"Freerüüm övergahn\").\n" +"Mag bi't Verglieken vun Dateien mit Tallen beter Resultaten geven." + +#. +> trunk +#: optiondialog.cpp:819 +msgid "Ignore C/C++ comments" +msgstr "C/C++-Kommentaren övergahn" + +#. +> trunk +#: optiondialog.cpp:821 +msgid "Treat C/C++ comments like white space." +msgstr "C/C++-Kommentaren liek as Freerüüm hanteren." + +#. +> trunk +#: optiondialog.cpp:825 +msgid "Ignore case" +msgstr "Groot-/Lüttschrieven övergahn" + +#. +> trunk +#: optiondialog.cpp:828 +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Verschelen in Groot- un Lüttschrieven liek as Freerüüm-Verschelen hanteren." + +#. +> trunk +#: optiondialog.cpp:832 +msgid "Preprocessor command:" +msgstr "Vörverarbeid-Befehl:" + +#. +> trunk +#: optiondialog.cpp:836 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Vun Bruker fastleggt Vörverarbeiden (Enkelheiten binnen de Dokmentatschoon)." + +#. +> trunk +#: optiondialog.cpp:839 +msgid "Line-matching preprocessor command:" +msgstr "Vörverarbeid-Befehl för't Regenutrichten:" + +#. +> trunk +#: optiondialog.cpp:843 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Disse Vörverarbeiden warrt bloots bi't Regenutrichten bruukt.\n" +"(Enkelheiten binnen de Dokmentatschoon)" + +#. +> trunk +#: optiondialog.cpp:846 +msgid "Try hard (slower)" +msgstr "In't Tüüch leggen (langsamer)" + +#. +> trunk +#: optiondialog.cpp:849 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Bruukt de Optschoon \"--minimal\" vun't Diff-Programm.\n" +"Dat Dörkieken vun groot Dateien warrt denn bannig wat langsamer." + +#. +> trunk +#: optiondialog.cpp:854 +msgid "Align B and C for 3 input files" +msgstr "B un C för 3 Ingaavdateien utrichten" + +#. +> trunk +#: optiondialog.cpp:857 +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"B un C bi't Verglieken oder Tosamenföhren vun 3 Ingaavdateien toenanner utrichten.\n" +"Bi't Tosamenföhren nich anraadt, dat mag to vigeliensch warrn.\n" +"(Standard is Ut.)" + +#. +> trunk +#: optiondialog.cpp:870 +msgid "Merge Settings" +msgstr "Tosamenföhr-Instellen" + +#. +> trunk +#: optiondialog.cpp:885 +msgid "Auto advance delay (ms):" +msgstr "Töövtiet för't autom. Wiedergahn (ms):" + +#. +> trunk +#: optiondialog.cpp:890 +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 "" +"Is dat Automaatsche Wiedergahn anmaakt, warrt dat Resultaat vun de aktuelle Köör\n" +"för de angeven Tiet wiest, ehr dat Programm na den nakamen Konflikt jumpt. Weerten: 0 - 2000 ms." + +#. +> trunk +#: optiondialog.cpp:895 +msgid "Show info dialogs" +msgstr "Infodialogen wiesen" + +#. +> trunk +#: optiondialog.cpp:897 +msgid "Show a dialog with information about the number of conflicts." +msgstr "En Dialoog mit de Tall vun Konflikten wiesen" + +#. +> trunk +#: optiondialog.cpp:900 +msgid "White space 2-file merge default:" +msgstr "Freeruum-Standard bi 2-Dateien-Tosamenföhren:" + +#. +> trunk +#: optiondialog.cpp:904 optiondialog.cpp:917 +msgid "Manual Choice" +msgstr "Köör vun Hand" + +#. +> trunk +#: optiondialog.cpp:908 optiondialog.cpp:922 +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "Den Tosamenföhr-Algoritmus bi Freeruum-Konflikten automaatsch en Born utsöken laten" + +#. +> trunk +#: optiondialog.cpp:913 +msgid "White space 3-file merge default:" +msgstr "Freeruum-Standard bi 3-Dateien-Tosamenföhren:" + +#. +> trunk +#: optiondialog.cpp:927 +msgid "Automatic Merge Regular Expression" +msgstr "Reguleer Utdruck för't autom. Tosamenföhren" + +#. +> trunk +#: optiondialog.cpp:936 smalldialogs.cpp:414 +msgid "Auto merge regular expression:" +msgstr "Reguleer Utdruck för't autom. Tosamenföhren:" + +#. +> trunk +#: optiondialog.cpp:940 +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" +"Reguleer Utdruck för Regen, bi de KDiff3 automaatsch een Born utsöken schall.\n" +"Passt de Utdruck op en Reeg mit en Konflikt, warrt - wenn verföögbor - de Reeg\n" +"ut Born C, sünst de Reeg ut Born B bruukt." + +#. +> trunk +#: optiondialog.cpp:946 +msgid "Run regular expression auto merge on merge start" +msgstr "Bi't Starten vun't Tosamenföhren automaatsch na reguleer Utdruck tosamenföhren" + +#. +> trunk +#: optiondialog.cpp:948 +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Dat automaatsche Tosamenföhren langs de reguleren\n" +"Utdrück för't automaatsche Tosamenföhren direktemang\n" +"utföhren, wenn dat Tosamenföhren anfangt.\n" + +#. +> trunk +#: optiondialog.cpp:953 +msgid "Version Control History Merging" +msgstr "Tosamenföhren mit Verschoonkuntrull-Vörgeschicht" + +#. +> trunk +#: optiondialog.cpp:962 smalldialogs.cpp:441 +msgid "History start regular expression:" +msgstr "Reguleer Utdruck för Vörgeschicht-Anfang:" + +#. +> trunk +#: optiondialog.cpp:966 +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Reguleer Utdruck för den Anfang vun den Verschoonkuntrull-Vörgeschichtindrag.\n" +"Normalerwies bargt disse Reeg dat Slötelwoort \"$Log$\".\n" +"Standardweert: \".*\\$Log.*\\$.*\"" + +#. +> trunk +#: optiondialog.cpp:972 smalldialogs.cpp:469 +msgid "History entry start regular expression:" +msgstr "Reguleer Utdruck för Vörgeschichtindrag-Anfang:" + +#. +> trunk +#: optiondialog.cpp:984 +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"En Verschoonkuntrull-Vörgeschichtindrag geiht över mehr Regen.\n" +"Hier kannst Du den reguleren Utdruck angeven, mit den sik de eerste Reeg kennen lett (ahn den vöranstellten Kommentar).\n" +"Mit Klemmen kannst Du Slötels för't Sorteren tosamenkoppeln.\n" +"Lettst Du dat leddig, nimmt KDiff3 an, dat leddig Regen twischen Vörgeschichtindrääg staht.\n" +"De Enkelheiten staht binnen de Dokmentatschoon." + +#. +> trunk +#: optiondialog.cpp:992 +msgid "History merge sorting" +msgstr "Sorteren bi Vörgeschicht-Tosamenföhren" + +#. +> trunk +#: optiondialog.cpp:994 +msgid "Sort version control history by a key." +msgstr "Verschoonkuntrull-Vörgeschicht na Slötel sorteren" + +#. +> trunk +#: optiondialog.cpp:1004 +msgid "History entry start sort key order:" +msgstr "Sorteerreeg för Vörgeschichtindrag-Anfang:" + +#. +> trunk +#: optiondialog.cpp:1008 +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Elkeen Klemmenpoor binnen den reguleren Utdruck för den Vörgeschichtindrag-Anfang\n" +"koppelt en Slötel tosamen, de sik bi't Sorteren bruken lett.\n" +"Hier kannst Du de Reeg för de Slötels över ehr Nummern angeven\n" +"(fangt bi 1 an, nummereert na de Reeg, in de se in den reguleren Utdruck staht).\n" +"Bruuk Kommas (\",\") as Trennteken (a.B.: \"4,5,6,1,2,3,7\").\n" +"Lettst Du dat leddig, warrt nich sorteert.\n" +"De Enkelheiten staht binnen de Dokmentatschoon." + +#. +> trunk +#: optiondialog.cpp:1019 +msgid "Merge version control history on merge start" +msgstr "Verschoonkuntrull-Vörgeschicht bi't Starten vun't Tosamenföhren tosamenföhren" + +#. +> trunk +#: optiondialog.cpp:1021 +msgid "Run version control history automerge on merge start." +msgstr "Bi't Starten vun't Tosamenföhren automaatsch Verschoonkuntrull-Vörgeschicht tosamenföhren" + +#. +> trunk +#: optiondialog.cpp:1025 +msgid "Max number of history entries:" +msgstr "Hööchsttall vun Vörgeschichtindrääg:" + +#. +> trunk +#: optiondialog.cpp:1028 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Na angeven Tall ophollen. Bi -1 nich ophollen." + +#. +> trunk +#: optiondialog.cpp:1032 +msgid "Test your regular expressions" +msgstr "Regulere Utdrück utproberen" + +#. +> trunk +#: optiondialog.cpp:1037 +msgid "Irrelevant merge command:" +msgstr "Tosamenföhr-Befehl bi fehlen Ännern:" + +#. +> trunk +#: optiondialog.cpp:1041 +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Wenn angeven, warrt dit Skript na't automaatsche\n" +"Tosamenföhren opropen, wenn dat sünst keen Ännern geven hett.\n" +"Warrt mit disse Parameters opropen: Dateinaam1 Dateinaam2 Dateinaam3" + +#. +> trunk +#: optiondialog.cpp:1047 +msgid "Auto save and quit on merge without conflicts" +msgstr "Na't Tosamenföhren ahn Konflikten autom. sekern un utmaken" + +#. +> trunk +#: optiondialog.cpp:1050 +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Wenn KDiff3 för't Tosamenföhren vun Dateien opropen warrt un sik all\n" +"Konflikten oplösen laat un de Bruker nix bidregen mutt, denn\n" +"dat Resultaat automaatsch sekern un dat Programm utmaken.\n" +"(Liek to de Befehlsreegoptschoon \"--auto\".)" + +#. +> trunk +#: optiondialog.cpp:1061 optiondialog.cpp:1062 +msgid "Directory" +msgstr "Orner" + +#. +> trunk +#: optiondialog.cpp:1075 +msgid "Recursive directories" +msgstr "Rekursiev" + +#. +> trunk +#: optiondialog.cpp:1077 +msgid "Whether to analyze subdirectories or not." +msgstr "Leggt fast, wat ok Ünnerornern dörkeken warrt." + +#. +> trunk +#: optiondialog.cpp:1079 +msgid "File pattern(s):" +msgstr "Dateimuster(n):" + +#. +> trunk +#: optiondialog.cpp:1084 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Muster(n) vun Dateien, de Du bekieken wullt.\n" +"Platzholltekens: \"*\" un \"?\"\n" +"Trennteken twischen Mustern: \";\"" + +#. +> trunk +#: optiondialog.cpp:1090 +msgid "File-anti-pattern(s):" +msgstr "Datei-Utsluutmuster(n):" + +#. +> trunk +#: optiondialog.cpp:1095 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Muster(n) för Dateien, de Du vun't Bekieken utsluten wullt.\n" +"Platzholltekens: \"*\" un \"?\"\n" +"Trennteken twischen Mustern: \";\"" + +#. +> trunk +#: optiondialog.cpp:1101 +msgid "Dir-anti-pattern(s):" +msgstr "Orner-Utsluutmuster(n):" + +#. +> trunk +#: optiondialog.cpp:1106 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Muster(n) för Ornern, de Du vun't Bekieken utsluten wullt.\n" +"Platzholltekens: \"*\" un \"?\"\n" +"Trennteken twischen Mustern: \";\"" + +#. +> trunk +#: optiondialog.cpp:1112 +msgid "Use .cvsignore" +msgstr "\".cvsignore\" bruken" + +#. +> trunk +#: optiondialog.cpp:1115 +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Verwiedert dat Utsluutmuster op allens, wat CVS övergahn dee.\n" +"Bi lokaal \".cvsignore\"-Dateien kann dat vun den Orner afhangen." + +#. +> trunk +#: optiondialog.cpp:1120 +msgid "Find hidden files and directories" +msgstr "Versteken Dateien un Ornern bekieken" + +#. +> trunk +#: optiondialog.cpp:1123 +msgid "Finds files and directories with the hidden attribute." +msgstr "Ok Ornern un Dateien mit dat \"Versteken\"-Attribut bekieken" + +#. +> trunk +#: optiondialog.cpp:1125 +msgid "Finds files and directories starting with '.'." +msgstr "Ok Dateien un Ornern bekieken, de mit en Punkt anfangt" + +#. +> trunk +#: optiondialog.cpp:1129 +msgid "Follow file links" +msgstr "Dateilinks nagahn" + +#. +> trunk +#: optiondialog.cpp:1132 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"An: De Datei verglieken, op de de Link wiest.\n" +"Ut: De Links verglieken." + +#. +> trunk +#: optiondialog.cpp:1137 +msgid "Follow directory links" +msgstr "Ornerlinks nagahn" + +#. +> trunk +#: optiondialog.cpp:1140 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"An: Den Orner verglieken, op den de Link wiest.\n" +"Ut: De Links verglieken." + +#. +> trunk +#: optiondialog.cpp:1156 +msgid "Case sensitive filename comparison" +msgstr "Bi Dateinaam-Vergliek op Groot- un Lüttschrieven kieken" + +#. +> trunk +#: optiondialog.cpp:1159 +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" +"De Ornervergliek vergliekt Dateien oder Ornern, wenn ehr Naams liek sünd.\n" +"Maakt dit an, wenn de Groot-/Lüttschrieven liek wesen mutt. (Op Windows standardwies ut, sünst an)." + +#. +> trunk +#: optiondialog.cpp:1163 +msgid "File Comparison Mode" +msgstr "Dateivergliek-Bedriefoort" + +#. +> trunk +#: optiondialog.cpp:1169 +msgid "Binary comparison" +msgstr "Bineervergliek" + +#. +> trunk +#: optiondialog.cpp:1170 +msgid "Binary comparison of each file. (Default)" +msgstr "Bineervergliek bi all Dateien (Standard)" + +#. +> trunk +#: optiondialog.cpp:1173 +msgid "Full analysis" +msgstr "Heel Dörkiek" + +#. +> trunk +#: optiondialog.cpp:1174 +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"En heel Dörkiek doon un bito Statistik binnen besünner Striepen wiesen.\n" +"(Langsamer as en Bineervergliek, veel langsamer bi Bineerdateien.)" + +#. +> trunk +#: optiondialog.cpp:1178 +msgid "Trust the size and modification date (unsafe)" +msgstr "Grött un Ännerdatum bruken (nich seker)" + +#. +> trunk +#: optiondialog.cpp:1179 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Dateien mit liek Ännerdatum un Längde as liek hanteren.\n" +"Dateien mit liek Inholt, man verscheden Ännerdatum warrt as verscheden wiest.\n" +"Goot bi groot Ornern oder binnen langsam Nettwarken." + +#. +> trunk +#: optiondialog.cpp:1184 +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Grött un Ännerdatum bruken, man bi nich liek Datum bineer verglieken (nich seker)" + +#. +> trunk +#: optiondialog.cpp:1185 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Dateien mit liek Ännerdatum un Längde as liek hanteren.\n" +"Is de Grött liek, man dat Datum nich, de Dateien bineer verglieken.\n" +"Goot bi groot Ornern oder binnen langsam Nettwarken." + +#. +> trunk +#: optiondialog.cpp:1190 +msgid "Trust the size (unsafe)" +msgstr "Grött bruken (nich seker)" + +#. +> trunk +#: optiondialog.cpp:1191 +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 "" +"Dateien mit liek Längde as liek hanteren.\n" +"Goot bi groot Ornern oder binnen langsam Nettwarken, wenn sik dat Datum bi't Daalladen ännert." + +#. +> trunk +#: optiondialog.cpp:1199 +msgid "Synchronize directories" +msgstr "Ornern synkroniseren" + +#. +> trunk +#: optiondialog.cpp:1202 +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 "" +"Dateien ut un na beed Ornern so koperen, dat\n" +"se achteran liek sünd.\n" +"Funkscheneert bloots bi't Verglieken vun twee Ornern, un wenn keen Teel angeven is." + +#. +> trunk +#: optiondialog.cpp:1208 +msgid "White space differences considered equal" +msgstr "Freeruum-Verschelen as liek hanteren" + +#. +> trunk +#: optiondialog.cpp:1211 +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Dateien as liek hanteren, wenn se bloots in de Freerüüm verscheden sünd.\n" +"Dit is bloots anmaakt, wenn Du \"Heel Dörkiek\" utsöcht hest." + +#. +> trunk +#: optiondialog.cpp:1217 +msgid "Copy newer instead of merging (unsafe)" +msgstr "Nieger Datei koperen, nich tosamenföhren (nich seker)" + +#. +> trunk +#: optiondialog.cpp:1220 +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 "" +"Inholt nich bekieken, eenfach de niegere Datei nehmen.\n" +"(Bruuk dit bloots, wenn Du nau weetst, wat Du dor deist!)\n" +"Funkscheneert bloots bi't Verglieken vun twee Ornern." + +#. +> trunk +#: optiondialog.cpp:1225 +msgid "Backup files (.orig)" +msgstr "Sekerheitkopie (.orig) opstellen" + +#. +> trunk +#: optiondialog.cpp:1228 +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Schull en Datei över en öller Datei schreven warrn, denn warrt de\n" +"öllere Datei ümnöömt un \".orig\" na ehr Naam anhangt." + +#. +> trunk +#: optiondialog.cpp:1301 optiondialog.cpp:1302 +msgid "Regional Settings" +msgstr "Regiooninstellen" + +#. +> trunk +#: optiondialog.cpp:1405 +msgid "Language (restart required)" +msgstr "Spraak (Niegstart nödig)" + +#. +> trunk +#: optiondialog.cpp:1448 +msgid "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." +msgstr "" +"Hier kannst Du de Spraak för de Böversiet utsöken, oder \"Auto\".\n" +"Ännerst Du de Spraak, muttst Du KDiff3 utmaken un nieg opropen, ehr de Ännern övernahmen warrt." + +#. +> trunk +#: optiondialog.cpp:1466 +msgid "Use the same encoding for everything:" +msgstr "De sülve Koderen för allens bruken:" + +#. +> trunk +#: optiondialog.cpp:1469 +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Is dit anmaakt, kannst Du all Koderen över de eerste ännern.\n" +"Maak dit ut, wenn verscheden Instellen för de Dateien nödig sünd." + +#. +> trunk +#: optiondialog.cpp:1474 +msgid "Note: Local Encoding is " +msgstr "Beacht: De lokale Koderen is " + +#. +> trunk +#: optiondialog.cpp:1478 +msgid "File Encoding for A:" +msgstr "Koderen för Datei A:" + +#. +> trunk +#: optiondialog.cpp:1484 +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Is dit anmaakt, warrt Unicode (UTF-8 oder UTF-16) as Koderen opdeckt.\n" +"Is de Datei nich in Unicode, warrt de utsöchte Koderen bruukt.\n" +"(Dat Opdecken vun Unicode hangt vun de eersten Bytes vun en Datei af.)" + +#. +> trunk +#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 +msgid "Auto Detect Unicode" +msgstr "Unicode automaatsch opdecken" + +#. +> trunk +#: optiondialog.cpp:1493 +msgid "File Encoding for B:" +msgstr "Koderen för Datei B:" + +#. +> trunk +#: optiondialog.cpp:1502 +msgid "File Encoding for C:" +msgstr "Koderen för Datei C:" + +#. +> trunk +#: optiondialog.cpp:1511 +msgid "File Encoding for Merge Output and Saving:" +msgstr "Koderen för't Tosamenföhren un Sekern:" + +#. +> trunk +#: optiondialog.cpp:1515 +msgid "Auto Select" +msgstr "Autom. Köör" + +#. +> trunk +#: optiondialog.cpp:1518 +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Wenn anmaakt, warrt de Koderen vun de Ingaavdateien bruukt.\n" +"Is dat nich eenkennig, warrt de Bruker na de Koderen för't Sekern fraagt." + +#. +> trunk +#: optiondialog.cpp:1522 +msgid "File Encoding for Preprocessor Files:" +msgstr "Koderen för de Vörverarbeid-Dateien:" + +#. +> trunk +#: optiondialog.cpp:1533 +msgid "Right To Left Language" +msgstr "Rechts-Na-Links-Spraak" + +#. +> trunk +#: optiondialog.cpp:1536 +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"En Reeg Schriften warrt vun rechts na links leest.\n" +"Disse Optschoon passt dor de Ansicht un den Editor op to." + +#. +> trunk +#: optiondialog.cpp:1551 +msgid "Integration" +msgstr "Inbinnen" + +#. +> trunk +#: optiondialog.cpp:1552 +msgid "Integration Settings" +msgstr "Inbinnen instellen" + +#. +> trunk +#: optiondialog.cpp:1566 +msgid "Command line options to ignore:" +msgstr "Befehlsreeg-Optschonen, de övergahn warrt:" + +#. +> trunk +#: optiondialog.cpp:1571 +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"List vun Befehlsreeg-Optschonen, de övergahn warrt, wenn anner Programmen KDiff3 oproopt.\n" +"Du kannst mehr Weerten angeven, wenn dor twischen en \";\" steiht.\n" +"Dit verhöödt den \"Nich begäng Optschoon\"-Fehler." + +#. +> trunk +#: optiondialog.cpp:1578 +msgid "Quit also via Escape key" +msgstr "Ok mit ESC-Tast utmaken" + +#. +> trunk +#: optiondialog.cpp:1581 +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Gau Metood för't Utmaken.\n" +"För de Lüüd, de de ESC-Tast anworrn sünd." + +#. +> trunk +#: optiondialog.cpp:1586 +msgid "Integrate with ClearCase" +msgstr "Na \"ClearCase\" inbinnen" + +#. +> trunk +#: optiondialog.cpp:1589 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"Na \"Rational ClearCase\" vun IBM inbinnen.\n" +"Ännert de Datei \"map\" binnen den ClearCase-Ünnerorner \"lib/mgrs\".\n" +"(Funkscheneert bloots, wenn sik de ClearCase-Orner \"bin\" över de PATH-Ümgevenvariabel finnen lett.)" + +#. +> trunk +#: optiondialog.cpp:1595 +msgid "Remove ClearCase Integration" +msgstr "Inbinnen na ClearCase lösen" + +#. +> trunk +#: optiondialog.cpp:1598 +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "De ole \"map\"-Datei ut de Tiet vör't Inbinnen na ClearCase wedderherstellen" + +#. +> trunk +#: optiondialog.cpp:1683 +msgid "Incompatible Font" +msgstr "Inkompatibel Schriftoort" + +#. +> trunk +#: optiondialog.cpp:1684 +msgid "Continue at Own Risk" +msgstr "Op egen Riskanz wiedermaken" + +#. +> trunk +#: optiondialog.cpp:1685 +msgid "Select Another Font" +msgstr "Anner Schriftoort utsöken" + +#. +> trunk +#: optiondialog.cpp:1720 +msgid "This resets all options. Not only those of the current topic." +msgstr "Disse Funkschoon sett all Optschonen torüch, nich bloots de för't aktuelle Thema." + +#. +> trunk +#: pdiff.cpp:260 +msgid "PreprocessorCmd: " +msgstr "Vörverarbeid-Befehl: " + +#. +> trunk +#: pdiff.cpp:265 +msgid "The following option(s) you selected might change data:\n" +msgstr "Disse vun Di utsöchten Optschonen köönt Daten ännern:\n" + +#. +> trunk +#: pdiff.cpp:266 +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Dat will Een normalerwies bi't Tosamenföhren nich hebben.\n" +"Wullt Du disse Instellen ut- oder dor mit wiedermaken?" + +#. +> trunk +#: pdiff.cpp:268 +msgid "Option Unsafe for Merging" +msgstr "Optschoon för't Tosamenföhren nich seker" + +#. +> trunk +#: pdiff.cpp:269 +msgid "Use These Options During Merge" +msgstr "Disse Optschonen bruken" + +#. +> trunk +#: pdiff.cpp:270 +msgid "Disable Unsafe Options" +msgstr "Nich seker Optschonen utmaken" + +#. +> trunk +#: pdiff.cpp:300 +msgid "Loading A" +msgstr "A warrt laadt" + +#. +> trunk +#: pdiff.cpp:304 +msgid "Loading B" +msgstr "B warrt laadt" + +#. +> trunk +#: pdiff.cpp:321 pdiff.cpp:347 +msgid "Diff: A <-> B" +msgstr "Verscheel: A <-> B" + +#. +> trunk +#: pdiff.cpp:327 pdiff.cpp:372 +msgid "Linediff: A <-> B" +msgstr "Reegverscheel: A <-> B" + +#. +> trunk +#: pdiff.cpp:338 +msgid "Loading C" +msgstr "C warrt laadt" + +#. +> trunk +#: pdiff.cpp:350 +msgid "Diff: B <-> C" +msgstr "Verscheel: B <-> C" + +#. +> trunk +#: pdiff.cpp:353 +msgid "Diff: A <-> C" +msgstr "Verscheel: A <-> C" + +#. +> trunk +#: pdiff.cpp:375 +msgid "Linediff: B <-> C" +msgstr "Reegverscheel: B <-> C" + +#. +> trunk +#: pdiff.cpp:378 +msgid "Linediff: A <-> C" +msgstr "Reegverscheel: A <-> C" + +#. +> trunk +#: pdiff.cpp:534 +msgid "All input files contain the same text, but are not binary equal." +msgstr "All Ingaavdateien bargt den sülven Text, man sünd bineer nich liek." + +#. +> trunk +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "De Dateien %1 un %2 bargt den sülven Text, man sünd bineer nich liek.\n" + +#. +> trunk +#: pdiff.cpp:551 +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 "" +"As't lett sünd nich all Ingaavdateien reen Textdateien.\n" +"Beacht, KDiff3 is nich för't Tosamenföhren vun Bineerdaten maakt.\n" +"Maak man op Dien egen Riskanz wieder." + +#. +> trunk +#: pdiff.cpp:566 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Don't save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"En Reeg vun Tekens laat sik nich na gellen Unikode wanneln.\n" +"Villicht is Dien bruukt Koderen nich richtig, (a.B. UTF-8 för Dateien in en anner Koderen as UTF-8).\n" +"Büst Du nich seker, denn spieker dat Resultaat beter nich af. Du kannst op Dien egen Riskanz wiedermaken.\n" +"De bedrapen Ingaavdateien liggt in %1." + +#. +> trunk +#: pdiff.cpp:1080 +msgid "Abort" +msgstr "Afbreken" + +#. +> trunk +#: pdiff.cpp:1087 pdiff.cpp:1175 +msgid "Opening files..." +msgstr "Dateien warrt opmaakt..." + +#. +> trunk +#: pdiff.cpp:1152 pdiff.cpp:1223 +msgid "File open error" +msgstr "Fehler bi't Datei-Opmaken" + +#. +> trunk +#: pdiff.cpp:1255 +msgid "Cutting selection..." +msgstr "Köör warrt knippt..." + +#. +> trunk +#: pdiff.cpp:1276 +msgid "Copying selection to clipboard..." +msgstr "Köör warrt na de Twischenaflaag kopeert..." + +#. +> trunk +#: pdiff.cpp:1292 +msgid "Inserting clipboard contents..." +msgstr "Twischenaflaag-Inholt warrt inföögt..." + +#. +> trunk +#: pdiff.cpp:1814 +msgid "Save && Continue" +msgstr "Sekern un wiedermaken" + +#. +> trunk +#: pdiff.cpp:1815 +msgid "Continue Without Saving" +msgstr "Ahn Sekern wiedermaken" + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search complete." +msgstr "Söök afslaten." + +#. +> trunk +#: pdiff.cpp:2018 +msgid "Search Complete" +msgstr "Söök afslaten" + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Nothing is selected in either diff input window." +msgstr "Binnen keen Verscheel-Ingaavfinster is wat utsöcht." + +#. +> trunk +#: pdiff.cpp:2252 +msgid "Error while adding manual diff range" +msgstr "Fehler bi't Tofögen vun en Verscheelrebeet vun Hand" + +#. +> trunk +#: smalldialogs.cpp:58 +msgid "A (Base):" +msgstr "A (Basis):" + +#. +> trunk +#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 +#: smalldialogs.cpp:142 +msgid "File..." +msgstr "Datei..." + +#. +> trunk +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:144 +msgid "Dir..." +msgstr "Orner..." + +#. +> trunk +#: smalldialogs.cpp:93 +msgid "C (Optional):" +msgstr "C (köörwies):" + +#. +> trunk +#: smalldialogs.cpp:116 +msgid "Swap/Copy Names ..." +msgstr "Naams tuschen/koperen..." + +#. +> trunk +#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 +#, kde-format +msgid "Swap %1<->%2" +msgstr "%1<->%2 tuschen" + +#. +> trunk +#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#, kde-format +msgid "Copy %1->Output" +msgstr "%1 -> Utgaav koperen" + +#. +> trunk +#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#, kde-format +msgid "Swap %1<->Output" +msgstr "%1 <-> Utgaav tuschen" + +#. +> trunk +#: smalldialogs.cpp:136 +msgid "Output (optional):" +msgstr "Utgaav (köörwies):" + +#. +> trunk +#: smalldialogs.cpp:168 +msgid "Configure..." +msgstr "Instellen..." + +#. +> trunk +#: smalldialogs.cpp:174 +msgid "&OK" +msgstr "&OK" + +#. +> trunk +#: smalldialogs.cpp:362 +msgid "Search text:" +msgstr "Sööktext:" + +#. +> trunk +#: smalldialogs.cpp:369 +msgid "Case sensitive" +msgstr "Op Groot-/Lüttschrieven kieken" + +#. +> trunk +#: smalldialogs.cpp:372 +msgid "Search A" +msgstr "A dörkieken" + +#. +> trunk +#: smalldialogs.cpp:377 +msgid "Search B" +msgstr "B dörkieken" + +#. +> trunk +#: smalldialogs.cpp:382 +msgid "Search C" +msgstr "C dörkieken" + +#. +> trunk +#: smalldialogs.cpp:387 +msgid "Search output" +msgstr "Utgaav dörkieken" + +#. +> trunk +#: smalldialogs.cpp:392 +msgid "&Search" +msgstr "&Söken" + +#. +> trunk +#: smalldialogs.cpp:409 +msgid "Regular Expression Tester" +msgstr "Reguleer Utdrück utproberen" + +#. +> trunk +#: smalldialogs.cpp:422 +msgid "Example auto merge line:" +msgstr "Bispillreeg för't autom. Tosamenföhren:" + +#. +> trunk +#: smalldialogs.cpp:424 +msgid "To test auto merge, copy a line as used in your files." +msgstr "Kopeer en Reeg, as se binnen Dien Dateien vörkamen kann, wenn Du dat autom. Tosamenföhren utproberen wullt." + +#. +> trunk +#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 +msgid "Match result:" +msgstr "Passen Resultaat:" + +#. +> trunk +#: smalldialogs.cpp:449 +msgid "Example history start line (with leading comment):" +msgstr "Bispillreeg för en Vörgeschicht-Anfang (mit vöranstellt Kommentar):" + +#. +> trunk +#: smalldialogs.cpp:451 +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" +"Kopeer en Vörgeschicht-Anfangreeg, as se binnen\n" +"Dien Dateien vörkamen kann, un ok den vöranstellten\n" +"Kommentar." + +#. +> trunk +#: smalldialogs.cpp:477 +msgid "History sort key order:" +msgstr "Vörgeschicht-Sorteerreeg:" + +#. +> trunk +#: smalldialogs.cpp:485 +msgid "Example history entry start line (without leading comment):" +msgstr "Bispillreeg för en Vörgeschichtindrag-Anfang (ahn vöranstellt Kommentar):" + +#. +> trunk +#: smalldialogs.cpp:487 +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" +"Kopeer en Vörgeschichtindrag-Anfangreeg, as se\n" +"binnen Dien Dateien vörkamen kann, man nich den\n" +"vöranstellten Kommentar." + +#. +> trunk +#: smalldialogs.cpp:501 +msgid "Sort key result:" +msgstr "Sorteerresultaat:" + +#. +> trunk +#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 +msgid "Match success." +msgstr "Dreper funnen." + +#. +> trunk +#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 +msgid "Match failed." +msgstr "Keen Dreper funnen." + +#. +> trunk +#: smalldialogs.cpp:574 +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Binnen den reguleren Utdruck passt de linken un rechten Klemmen nich tosamen." + +#~ msgid "Ok" +#~ msgstr "OK" + +#, fuzzy +#~| msgid "&Window" +#~ msgid "Dos/Windows" +#~ msgstr "&Finster" + +#, fuzzy +#~| msgid "Auto Select" +#~ msgid "Autodetect" +#~ msgstr "Autom. Köör" + +#~ msgid "Directory Merge" +#~ msgstr "Orner-Tosamenföhren" + +#~ msgid "C&ontinue" +#~ msgstr "Wieder&maken" Index: trunk/l10n-support/nds/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/nds/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/nds/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,103 @@ +# translation of kdiff3fileitemactionplugin.po to Low Saxon +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Manfred Wiese , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2011-08-02 08:55+0200\n" +"PO-Revision-Date: 2011-09-21 07:00+0200\n" +"Last-Translator: Manfred Wiese \n" +"Language-Team: Low Saxon \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: nds\n" + +#. +> trunk +#: kdiff3fileitemaction.cpp:94 +msgid "KDiff3 ..." +msgstr "KDiff3…" + +#. +> trunk +#: kdiff3fileitemaction.cpp:125 +#, kde-format +msgid "Compare with %1" +msgstr "Mit \"%1\" verglieken" + +#. +> trunk +#: kdiff3fileitemaction.cpp:131 +#, kde-format +msgid "Merge with %1" +msgstr "Mit \"%1\" tosamenföhren" + +#. +> trunk +#: kdiff3fileitemaction.cpp:137 +#, kde-format +msgid "Save '%1' for later" +msgstr "\"%1\" för later sekern" + +#. +> trunk +#: kdiff3fileitemaction.cpp:143 +msgid "3-way merge with base" +msgstr "3-Weeg-Tosamenföhren mit Grundlaag" + +#. +> trunk +#: kdiff3fileitemaction.cpp:150 +msgid "Compare with ..." +msgstr "Verglieken mit..." + +#. +> trunk +#: kdiff3fileitemaction.cpp:162 +msgid "Clear list" +msgstr "List leddig maken" + +#. +> trunk +#: kdiff3fileitemaction.cpp:170 +msgid "Compare" +msgstr "Verglieken" + +#. +> trunk +#: kdiff3fileitemaction.cpp:176 +msgid "3 way comparison" +msgstr "3-Weeg-Verglieken" + +#. +> trunk +#: kdiff3fileitemaction.cpp:180 +msgid "About KDiff3 menu plugin ..." +msgstr "Över dat KDiff3-Menümoduul…" + +#. +> trunk +#: kdiff3fileitemaction.cpp:284 +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"KDiff3-Dateiindrag-Akschonenmoduul. Copyright © 2011 Joachim Eibl\n" +"KDiff3-Tohuussiet: http://kdiff3.sourceforge.net\n" +"\n" + +#. +> trunk +#: kdiff3fileitemaction.cpp:286 +msgid "" +"Using the contextmenu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"De Rechtsklickmenü-Verwiedern bruken:\n" +"Twee utsöcht Dateien laat sik eenfach mit »Verglieken« verglieken.\n" +"Is de anner Datei an en anner Steed, »Seker« de eerste Datei »för later«, se dukt denn in't Ünnermenü »Verglieken mit...« op, dat Du för de twete Datei opröppst.\n" +"Wullt Du Dateien tosamenföhren, »seker« toeerst de Grunddatei, denn den Telg, den Du tosamenföhren wullt, un för de drüdde Datei bruukst Du »3-Weeg-Tosamenföhren mit Grundlaag«, se warrt denn dat Teel.\n" +"Dat sülve gellt ok för't Verglieken un Tosamenföhren vun Ornern." + +#. +> trunk +#: kdiff3fileitemaction.cpp:294 +msgid "About KDiff3 File Item Action Plugin" +msgstr "Över dat KDiff3-Dateiindrag-Akschonenmoduul…" Index: trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,3705 +0,0 @@ -# Translation of kdiff3.po to Low Saxon -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Sönke Dibbern , 2008, 2009. -# Manfred Wiese , 2009, 2010, 2011. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-30 10:41+0100\n" -"PO-Revision-Date: 2011-10-09 21:25+0200\n" -"Last-Translator: Manfred Wiese \n" -"Language-Team: Low Saxon \n" -"Language: nds\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#. +> trunk -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Sönke Dibbern" - -#. +> trunk -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "s_dibbern@web.de" - -#. +> trunk -#: diff.cpp:251 -msgid "Writing clipboard data to temp file failed." -msgstr "Twischenaflaag-Daten laat sik nich as Temporeerdatei sekern." - -#. +> trunk -#: diff.cpp:255 -msgid "From Clipboard" -msgstr "Ut Twischenaflaag" - -#. +> trunk -#: diff.cpp:537 -msgid "Expecting space after closing apostroph." -msgstr "Free Ruum achter Afsluss-Hoochkomma verwacht" - -#. +> trunk -#: diff.cpp:540 -msgid "Not matching apostrophs." -msgstr "Hoochkommas passt nich" - -#. +> trunk -#: diff.cpp:562 -msgid "Unexpected apostroph within argument." -msgstr "Argument bargt nich verwacht Hoochkomma" - -#. +> trunk -#: diff.cpp:569 -msgid "No program specified." -msgstr "Keen Programm angeven" - -#. +> trunk -#: diff.cpp:671 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Dat Vörverarbeiden is villicht fehlslaan. Prööv dissen Befehl:\n" -"\n" -" %1\n" -"\n" -"De Vörverarbeid-Befehl warrt nu utmaakt." - -#. +> trunk -#: diff.cpp:719 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"De Vörverarbeiden för de Regenutrichten is villicht fehlslaan. Prööv dissen Befehl:\n" -"\n" -" %1\n" -"\n" -"De Vörverarbeid-Befehl för de Regenutrichten warrt nu utmaakt." - -#. +> trunk -#: diff.cpp:1850 diff.cpp:1864 -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Daten sünd wegkamen:\n" -"Lett sik dit wedderhalen, snack dor bitte den Autor op an.\n" - -#. +> trunk -#: diff.cpp:1852 diff.cpp:1866 -msgid "Severe Internal Error" -msgstr "Swoor intern Fehler" - -#. +> trunk -#: difftextwindow.cpp:401 directorymergewindow.cpp:2723 -msgid "File" -msgstr "Datei" - -#. +> trunk -#: difftextwindow.cpp:403 -msgid "Line" -msgstr "Reeg" - -#. +> trunk -#: difftextwindow.cpp:405 -msgid "Line not available" -msgstr "Reeg nich verföögbor" - -#. +> trunk -#: difftextwindow.cpp:1703 difftextwindow.cpp:1736 -msgid "Encoding:" -msgstr "Koderen:" - -#. +> trunk -#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149 -#: optiondialog.cpp:762 -msgid "Line end style:" -msgstr "Reegenn-Stil:" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195 -msgid "DOS" -msgstr "DOS" - -#. +> trunk -#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 -msgid "Unix" -msgstr "Unix" - -#. +> trunk -#: difftextwindow.cpp:1759 kdiff3.cpp:831 -msgid "Top line" -msgstr "Böverst Reeg" - -#. +> trunk -#: difftextwindow.cpp:1769 -msgid "End" -msgstr "Enn" - -#. +> trunk -#: directorymergewindow.cpp:150 -msgid "Mix of links and normal files." -msgstr "Mischen vun Links un normaal Dateien" - -#. +> trunk -#: directorymergewindow.cpp:157 -msgid "Link: " -msgstr "Link: " - -#. +> trunk -#: directorymergewindow.cpp:165 -msgid "Size. " -msgstr "Grött: " - -#. +> trunk -#: directorymergewindow.cpp:178 directorymergewindow.cpp:188 -msgid "Date & Size: " -msgstr "Datum un Grött: " - -#. +> trunk -#: directorymergewindow.cpp:198 directorymergewindow.cpp:204 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Temporeerkopie vun \"%1\" lett sik nich opstellen" - -#. +> trunk -#: directorymergewindow.cpp:215 directorymergewindow.cpp:223 -#, kde-format -msgid "Opening %1 failed." -msgstr "\"%1\" lett sik nich opmaken" - -#. +> trunk -#: directorymergewindow.cpp:227 -msgid "Comparing file..." -msgstr "Datei warrt vergleken..." - -#. +> trunk -#: directorymergewindow.cpp:237 directorymergewindow.cpp:243 -#, kde-format -msgid "Error reading from %1" -msgstr "\"%1\" lett sik nich lesen" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Name" -msgstr "Naam" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Operation" -msgstr "Akschoon" - -#. +> trunk -#: directorymergewindow.cpp:372 -msgid "Status" -msgstr "Status" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Unsolved" -msgstr "Nich oplööst" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Solved" -msgstr "Oplööst" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "Nonwhite" -msgstr "Nichfree" - -#. +> trunk -#: directorymergewindow.cpp:373 -msgid "White" -msgstr "Free" - -#. +> trunk -#: directorymergewindow.cpp:402 -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "Du büst jüst togang un föhrst Ornern tosamen. Wullt Du dat Tosamenföhren redig afbreken un den Orner nieg dörkieken?" - -#. +> trunk -#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677 -#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823 -msgid "Warning" -msgstr "Wohrschoen" - -#. +> trunk -#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979 -msgid "Rescan" -msgstr "Nieg dörkieken" - -#. +> trunk -#: directorymergewindow.cpp:405 pdiff.cpp:1081 -msgid "Continue Merging" -msgstr "Tosamenföhren wiedermaken" - -#. +> trunk -#: directorymergewindow.cpp:562 -msgid "Opening of directories failed:" -msgstr "Opmaken vun Ornern fehlslaan:" - -#. +> trunk -#: directorymergewindow.cpp:565 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Orner A \"%1\" gifft dat nich oder is keen Orner.\n" - -#. +> trunk -#: directorymergewindow.cpp:568 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Orner B \"%1\" gifft dat nich oder is keen Orner.\n" - -#. +> trunk -#: directorymergewindow.cpp:571 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Orner C \"%1\" gifft dat nich oder is keen Orner.\n" - -#. +> trunk -#: directorymergewindow.cpp:573 -msgid "Directory Open Error" -msgstr "Fehler bi't Ornern-Opmaken" - -#. +> trunk -#: directorymergewindow.cpp:581 -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"De Teelorner mutt bi't Tosamenföhren vun 3 Dateien nich de sülve wesen as A oder B.\n" -"\n" -"Prööv dat bitte, ehr Du wiedermaakst." - -#. +> trunk -#: directorymergewindow.cpp:583 -msgid "Parameter Warning" -msgstr "Parameter-Wohrschoen" - -#. +> trunk -#: directorymergewindow.cpp:588 -msgid "Scanning directories..." -msgstr "Ornern warrt dörkeken..." - -#. +> trunk -#: directorymergewindow.cpp:621 -msgid "Reading Directory A" -msgstr "Orner A warrt leest" - -#. +> trunk -#: directorymergewindow.cpp:643 -msgid "Reading Directory B" -msgstr "Orner B warrt leest" - -#. +> trunk -#: directorymergewindow.cpp:665 -msgid "Reading Directory C" -msgstr "Orner C warrt leest" - -#. +> trunk -#: directorymergewindow.cpp:691 -msgid "Some subdirectories were not readable in" -msgstr "En Reeg Ünnerornern lett sik nich lesen binnen" - -#. +> trunk -#: directorymergewindow.cpp:696 -msgid "Check the permissions of the subdirectories." -msgstr "Prööv bitte de Verlöven vun de Ünnerornern." - -#. +> trunk -#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737 -#: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233 -#: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328 -msgid "Ready." -msgstr "Praat." - -#. +> trunk -#: directorymergewindow.cpp:749 -msgid "Directory Comparison Status" -msgstr "Ornervergliek-Status" - -#. +> trunk -#: directorymergewindow.cpp:750 -msgid "Number of subdirectories:" -msgstr "Tall vun Ünnerornern:" - -#. +> trunk -#: directorymergewindow.cpp:751 -msgid "Number of equal files:" -msgstr "Tall vun liek Dateien:" - -#. +> trunk -#: directorymergewindow.cpp:752 -msgid "Number of different files:" -msgstr "Tall vun verscheden Dateien:" - -#. +> trunk -#: directorymergewindow.cpp:755 -msgid "Number of manual merges:" -msgstr "Tall vun Tosamenföhren vun Hand:" - -#. +> trunk -#: directorymergewindow.cpp:926 -msgid "This affects all merge operations." -msgstr "Dit bedröppt all Tosamenföhr-Akschonen" - -#. +> trunk -#: directorymergewindow.cpp:927 -msgid "Changing All Merge Operations" -msgstr "All Tosamenföhr-Akschonen ännern" - -#. +> trunk -#: directorymergewindow.cpp:1326 -msgid "Processing " -msgstr "Bi to verarbeiden: " - -#. +> trunk -#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756 -msgid "To do." -msgstr "Opgaav" - -#. +> trunk -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010 -msgid "Copy A to B" -msgstr "A op B koperen" - -#. +> trunk -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011 -msgid "Copy B to A" -msgstr "B op A koperen" - -#. +> trunk -#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012 -msgid "Delete A" -msgstr "A wegdoon" - -#. +> trunk -#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013 -msgid "Delete B" -msgstr "B wegdoon" - -#. +> trunk -#: directorymergewindow.cpp:1828 -msgid "Delete A & B" -msgstr "A un B wegdoon" - -#. +> trunk -#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015 -msgid "Merge to A" -msgstr "Mit A tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016 -msgid "Merge to B" -msgstr "Mit B tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:1831 -msgid "Merge to A & B" -msgstr "Mit A un B tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007 -msgid "Delete (if exists)" -msgstr "Wegdoon (wenn vörhannen)" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110 -msgid "Merge" -msgstr "Tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837 -msgid "Merge (manual)" -msgstr "Tosamenföhren (vun Hand)" - -#. +> trunk -#: directorymergewindow.cpp:1838 -msgid "Error: Conflicting File Types" -msgstr "Fehler: Inkompatibel Dateitypen" - -#. +> trunk -#: directorymergewindow.cpp:1839 -msgid "Error: Changed and Deleted" -msgstr "Fehler: Ännert un wegdaan" - -#. +> trunk -#: directorymergewindow.cpp:1840 -msgid "Error: Dates are equal but files are not." -msgstr "Fehler: De Daten sünd liek, man de Dateien nich." - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 -msgid "This operation is currently not possible." -msgstr "Disse Akschoon is opstunns nich mööglich." - -#. +> trunk -#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895 -#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188 -msgid "Operation Not Possible" -msgstr "Akschoon nich mööglich" - -#. +> trunk -#: directorymergewindow.cpp:1959 -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 "" -"Dit schull nienich vörkamen.\n" -"\n" -"mergeResultSaved: m_pMFI=0\n" -"\n" -"Lett sik dit wedderhalen, snack dor bitte den Programmschriever op an." - -#. +> trunk -#: directorymergewindow.cpp:1959 -msgid "Program Error" -msgstr "Programmfehler" - -#. +> trunk -#: directorymergewindow.cpp:1970 -msgid "An error occurred while copying.\n" -msgstr "Dat geev en Fehler bi't Koperen.\n" - -#. +> trunk -#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039 -#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119 -#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137 -#: directorymergewindow.cpp:2388 -msgid "Error" -msgstr "Fehler" - -#. +> trunk -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389 -msgid "Merge Error" -msgstr "Tosamenföhr-Fehler" - -#. +> trunk -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394 -msgid "Error." -msgstr "Fehler." - -#. +> trunk -#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286 -#: directorymergewindow.cpp:2326 -msgid "Done." -msgstr "Afslaten." - -#. +> trunk -#: directorymergewindow.cpp:2004 -msgid "Not saved." -msgstr "Nich sekert" - -#. +> trunk -#: directorymergewindow.cpp:2039 -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Nich begäng Tosamenföhrakschoon (Dit mutt nienich vörkamen!)" - -#. +> trunk -#: directorymergewindow.cpp:2071 -msgid "Unknown merge operation." -msgstr "Nich begäng Tosamenföhrakschoon" - -#. +> trunk -#: directorymergewindow.cpp:2086 -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 "" -"Dat Tosamenföhren kann nu loosgahn.\n" -"\n" -"Klick op \"Utföhren\", wenn Du de Anwiesen leest hest un weetst, wat Du deist.\n" -"Klick op \"Simuleren\", wenn Du weten wullt, wat passeren dee.\n" -"\n" -"Beacht bitte, dit Programm hett jümmers noch Beta-Status un dat gifft keen Garantien, för gor nix. Maak Sekerheitkopien vun Dien wichtige Daten!" - -#. +> trunk -#: directorymergewindow.cpp:2091 -msgid "Starting Merge" -msgstr "Tosamenföhren starten" - -#. +> trunk -#: directorymergewindow.cpp:2092 -msgid "Do It" -msgstr "Doon" - -#. +> trunk -#: directorymergewindow.cpp:2093 -msgid "Simulate It" -msgstr "Simuleren" - -#. +> trunk -#: directorymergewindow.cpp:2119 -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "De rutheevte Indrag hett binnen de verscheden Ornern verscheden Typen. Wat wullt Du doon?" - -#. +> trunk -#: directorymergewindow.cpp:2128 -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "De Ännerdaten vun de Dateien sünd liek, man de Dateien sünd dat nich. Wat wullt Du doon?" - -#. +> trunk -#: directorymergewindow.cpp:2137 -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "De rutheevte Indrag wöör binnen een Orner ännert un ut den anner wegdaan. Wat wullt Du doon?" - -#. +> trunk -#: directorymergewindow.cpp:2188 -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "Disse Akschoon lett sik opstunns nich utföhren, dor löppt en Orner-Tosamenföhren." - -#. +> trunk -#: directorymergewindow.cpp:2248 -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 "" -"Bi den verleden Schritt hett dat en Fehler geven.\n" -"Wullt Du mit dat Element wiedermaken, dat den Fehler utlööst hett, oder wullt Du dat utlaten?" - -#. +> trunk -#: directorymergewindow.cpp:2250 -msgid "Continue merge after an error" -msgstr "Tosamenföhren na Fehler wiedermaken" - -#. +> trunk -#: directorymergewindow.cpp:2251 -msgid "Continue With Last Item" -msgstr "Mit verleden Element wiedermaken" - -#. +> trunk -#: directorymergewindow.cpp:2252 -msgid "Skip Item" -msgstr "Element utlaten" - -#. +> trunk -#: directorymergewindow.cpp:2286 -msgid "Skipped." -msgstr "Utlaten." - -#. +> trunk -#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507 -msgid "In progress..." -msgstr "In de Maak..." - -#. +> trunk -#: directorymergewindow.cpp:2341 -msgid "Merge operation complete." -msgstr "Tosamenföhren afslaten." - -#. +> trunk -#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344 -msgid "Merge Complete" -msgstr "Tosamenföhren afslaten" - -#. +> trunk -#: directorymergewindow.cpp:2354 -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Dat simuleerte Tosamensmölten is afslaten Kiek, wat Du de vörslaan Akschonen utföhren wullt." - -#. +> trunk -#: directorymergewindow.cpp:2388 -msgid "An error occurred. Press OK to see detailed information.\n" -msgstr "Dat hett en Fehler geven. Klick op OK, wenn Du de Enkelheiten ankieken wullt.\n" - -#. +> trunk -#: directorymergewindow.cpp:2420 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Fehler bi't Wegdoon vun \"%1\": Opstellen vun Sekerheitkopie fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2427 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "Orner un Ünnerornern wegdoon (%1)" - -#. +> trunk -#: directorymergewindow.cpp:2429 -#, kde-format -msgid "delete( %1 )" -msgstr "wegdoon (%1)" - -#. +> trunk -#: directorymergewindow.cpp:2444 -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Fehler: Wegdoon vun Orner fehlslaan, bides he leest wöör." - -#. +> trunk -#: directorymergewindow.cpp:2463 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Fehler: rmdir-Akschoon (%1) fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2473 -msgid "Error: delete operation failed." -msgstr "Fehler: Wegdoon fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2499 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "Vun Hand tosamenföhren (%1, %2, %3 -> %4)" - -#. +> trunk -#: directorymergewindow.cpp:2502 -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Beacht bitte: Na't Tosamenföhren vun Hand schull de Bruker mit F7 wiedermaken" - -#. +> trunk -#: directorymergewindow.cpp:2527 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Fehler: Koperen (%1 -> %2) fehlslaan. Wegdoon vun vörhannen Teel fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2536 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "Link koperen (%1 -> %2)" - -#. +> trunk -#: directorymergewindow.cpp:2547 -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Fehler: Koperen vun Link fehlslaan. Feern links warrt noch nich ünnerstütt." - -#. +> trunk -#: directorymergewindow.cpp:2553 -msgid "Error: copyLink failed." -msgstr "Fehler: Koperen vun Link fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2578 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "Koperen (%1 -> %2)" - -#. +> trunk -#: directorymergewindow.cpp:2604 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Fehler bi't Ümnömen (%1 -> %2): Vörhannen Teel lett sik nich wegmaken." - -#. +> trunk -#: directorymergewindow.cpp:2610 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "Ümnömen (%1 -> %2)" - -#. +> trunk -#: directorymergewindow.cpp:2619 -msgid "Error: Rename failed." -msgstr "Fehler: Ümnömen fehlslaan." - -#. +> trunk -#: directorymergewindow.cpp:2637 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Fehler bi't Opstellen vun Orner \"%1\". Vörhannen Datei lett sik nich wegdoon." - -#. +> trunk -#: directorymergewindow.cpp:2653 -#, kde-format -msgid "makeDir( %1 )" -msgstr "Orner opstellen (%1)" - -#. +> trunk -#: directorymergewindow.cpp:2663 -msgid "Error while creating directory." -msgstr "Fehler bi't Opstellen vun Orner." - -#. +> trunk -#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798 -msgid "Dest" -msgstr "Teel" - -#. +> trunk -#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723 -msgid "Dir" -msgstr "Orner" - -#. +> trunk -#: directorymergewindow.cpp:2692 -msgid "Type" -msgstr "Typ" - -#. +> trunk -#: directorymergewindow.cpp:2692 -msgid "Size" -msgstr "Grött" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Attr" -msgstr "Attr" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Last Modification" -msgstr "Verleden Ännern" - -#. +> trunk -#: directorymergewindow.cpp:2693 -msgid "Link-Destination" -msgstr "Link-Teel" - -#. +> trunk -#: directorymergewindow.cpp:2740 -msgid "not available" -msgstr "nich verföögbor" - -#. +> trunk -#: directorymergewindow.cpp:2760 -msgid "A (Dest): " -msgstr "A (Teel): " - -#. +> trunk -#: directorymergewindow.cpp:2763 -msgid "A (Base): " -msgstr "B (Grundl.): " - -#. +> trunk -#: directorymergewindow.cpp:2769 -msgid "B (Dest): " -msgstr "B (Teel): " - -#. +> trunk -#: directorymergewindow.cpp:2777 -msgid "C (Dest): " -msgstr "C (Teel): " - -#. +> trunk -#: directorymergewindow.cpp:2783 -msgid "Dest: " -msgstr "Teel: " - -#. +> trunk -#: directorymergewindow.cpp:2850 -msgid "Save Directory Merge State As..." -msgstr "Orner-Tosamenföhrstatus sekern as..." - -#. +> trunk -#: directorymergewindow.cpp:2973 -msgid "Start/Continue Directory Merge" -msgstr "Orner-Tosamenföhren starten/wiedermaken" - -#. +> trunk -#: directorymergewindow.cpp:2974 -msgid "Run Operation for Current Item" -msgstr "Akschoon mit aktuell Element utföhren" - -#. +> trunk -#: directorymergewindow.cpp:2975 -msgid "Compare Selected File" -msgstr "Utsöcht Datei verglieken" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "Merge Current File" -msgstr "Aktuell Datei tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:2976 -msgid "" -"Merge\n" -"File" -msgstr "" -"Datei\n" -"tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:2977 -msgid "Fold All Subdirs" -msgstr "All Ünnerornern infoolden" - -#. +> trunk -#: directorymergewindow.cpp:2978 -msgid "Unfold All Subdirs" -msgstr "All Ünnerornern utfoolden" - -#. +> trunk -#: directorymergewindow.cpp:2982 -msgid "Choose A for All Items" -msgstr "A bi all Indrääg utsöken" - -#. +> trunk -#: directorymergewindow.cpp:2983 -msgid "Choose B for All Items" -msgstr "B bi all Indrääg utsöken" - -#. +> trunk -#: directorymergewindow.cpp:2984 -msgid "Choose C for All Items" -msgstr "C bi all Indrääg utsöken" - -#. +> trunk -#: directorymergewindow.cpp:2985 -msgid "Auto-Choose Operation for All Items" -msgstr "Akschoon bi all Indrääg automaatsch utsöken" - -#. +> trunk -#: directorymergewindow.cpp:2986 -msgid "No Operation for All Items" -msgstr "Keen Akschoon för all Indrääg" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "Show Identical Files" -msgstr "Liek Dateien wiesen" - -#. +> trunk -#: directorymergewindow.cpp:2991 -msgid "" -"Identical\n" -"Files" -msgstr "" -"Liek\n" -"Dateien" - -#. +> trunk -#: directorymergewindow.cpp:2992 -msgid "Show Different Files" -msgstr "Verscheden Dateien wiesen" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "Show Files only in A" -msgstr "Dateien bloots in A wiesen" - -#. +> trunk -#: directorymergewindow.cpp:2993 -msgid "" -"Files\n" -"only in A" -msgstr "" -"Dateien\n" -"bloots in A" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "Show Files only in B" -msgstr "Dateien bloots in B wiesen" - -#. +> trunk -#: directorymergewindow.cpp:2994 -msgid "" -"Files\n" -"only in B" -msgstr "" -"Dateien\n" -"bloots in B" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "Show Files only in C" -msgstr "Dateien bloots in C wiesen" - -#. +> trunk -#: directorymergewindow.cpp:2995 -msgid "" -"Files\n" -"only in C" -msgstr "" -"Dateien\n" -"bloots in C" - -#. +> trunk -#: directorymergewindow.cpp:2999 -msgid "Compare Explicitly Selected Files" -msgstr "Utsöcht Dateien verglieken" - -#. +> trunk -#: directorymergewindow.cpp:3000 -msgid "Merge Explicitly Selected Files" -msgstr "Utsöcht Dateien tosamenföhren" - -#. +> trunk -#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009 -msgid "Do Nothing" -msgstr "Nix doon" - -#. +> trunk -#: directorymergewindow.cpp:3003 -msgid "A" -msgstr "A" - -#. +> trunk -#: directorymergewindow.cpp:3004 -msgid "B" -msgstr "B" - -#. +> trunk -#: directorymergewindow.cpp:3005 -msgid "C" -msgstr "C" - -#. +> trunk -#: directorymergewindow.cpp:3014 -msgid "Delete A && B" -msgstr "A un B wegdoon" - -#. +> trunk -#: directorymergewindow.cpp:3017 -msgid "Merge to A && B" -msgstr "Na A un B tosamenföhren" - -#. +> trunk -#: fileaccess.cpp:617 -msgid "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " -msgstr "" -"Bi't Opstellen vun en Sekerheitkopie lett sik en öller Sekerheitkopie nich wegdoon.\n" -"Dateinaam: " - -#. +> trunk -#: fileaccess.cpp:624 -msgid "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " -msgstr "" -"Bi't Opstellen vun en Sekerheitkopie lett sik en Datei nich ümnömen.\n" -"Dateinaams: " - -#. +> trunk -#: fileaccess.cpp:648 -#, kde-format -msgid "Getting file status: %1" -msgstr "Dateistatus warrt leest: %1" - -#. +> trunk -#: fileaccess.cpp:691 -#, kde-format -msgid "Reading file: %1" -msgstr "Datei warrt leest: %1" - -#. +> trunk -#: fileaccess.cpp:728 -#, kde-format -msgid "Writing file: %1" -msgstr "Datei warrt schreven: %1" - -#. +> trunk -#: fileaccess.cpp:756 -msgid "Out of memory" -msgstr "Nich noog Spieker" - -#. +> trunk -#: fileaccess.cpp:791 -#, kde-format -msgid "Making directory: %1" -msgstr "Orner warrt opstellt: %1" - -#. +> trunk -#: fileaccess.cpp:811 -#, kde-format -msgid "Removing directory: %1" -msgstr "Orner warrt wegmaakt: %1" - -#. +> trunk -#: fileaccess.cpp:826 -#, kde-format -msgid "Removing file: %1" -msgstr "Datei warrt wegmaakt: %1" - -#. +> trunk -#: fileaccess.cpp:842 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Symboolsch Link warrt opstellt: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:869 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Datei warrt ümnöömt: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:902 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Datei warrt kopeert: %1 -> %2" - -#. +> trunk -#: fileaccess.cpp:916 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Fehler bi't Koperen: Datei lett sik nich lesen. Dateinaam: %1" - -#. +> trunk -#: fileaccess.cpp:922 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Fehler bi't Koperen: Datei lett sik nich schrieven. Dateinaam: %1" - -#. +> trunk -#: fileaccess.cpp:937 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Fehler bi't Koperen: Lesen fehlslaan. Dateinaam: %1" - -#. +> trunk -#: fileaccess.cpp:946 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Fehler bi't Koperen: Schrieven fehlslaan. Dateinaam: %1" - -#. +> trunk -#: fileaccess.cpp:1236 -msgid "Reading directory: " -msgstr "Orner warrt leest: " - -#. +> trunk -#: fileaccess.cpp:1360 -#, kde-format -msgid "Listing directory: %1" -msgstr "Orner warrt oplist: %1" - -#. +> trunk -#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396 -msgid "&Cancel" -msgstr "&Afbreken" - -#. +> trunk -#: kdiff3.cpp:169 -msgid "Current Configuration:" -msgstr "Aktuell Instellen:" - -#. +> trunk -#: kdiff3.cpp:174 -msgid "Config Option Error:" -msgstr "Fehler binnen de Instellen:" - -#. +> trunk -#: kdiff3.cpp:219 -msgid "Option --auto used, but no output file specified." -msgstr "Optschoon \"--auto\" bruukt, man keen Utgaavdatei angeven." - -#. +> trunk -#: kdiff3.cpp:369 -msgid "Option --auto ignored for directory comparison." -msgstr "Optschoon \"--auto\" warrt bi't Verglieken vun Ornern övergahn." - -#. +> trunk -#: kdiff3.cpp:405 -msgid "Saving failed." -msgstr "Sekern fehlslaan." - -#. +> trunk -#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214 -msgid "Opening of these files failed:" -msgstr "Disse Dateien laat sik nich opmaken:" - -#. +> trunk -#: kdiff3.cpp:449 -msgid "File Open Error" -msgstr "Fehler bi't Opmaken" - -#. +> trunk -#: kdiff3.cpp:477 -msgid "Opens documents for comparison..." -msgstr "Dokmenten warrt för't Verglieken opmaakt..." - -#. +> trunk -#: kdiff3.cpp:479 -msgid "Reload" -msgstr "Nieg laden" - -#. +> trunk -#: kdiff3.cpp:482 -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Sekert dat Resultaat vun't Tosamenföhren. All Konflikten mööt oplööst wesen!" - -#. +> trunk -#: kdiff3.cpp:484 -msgid "Saves the current document as..." -msgstr "Sekert dat aktuelle Dokment as..." - -#. +> trunk -#: kdiff3.cpp:487 -msgid "Print the differences" -msgstr "Verscheel drucken" - -#. +> trunk -#: kdiff3.cpp:490 -msgid "Quits the application" -msgstr "Maakt dat Programm ut" - -#. +> trunk -#: kdiff3.cpp:492 -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Knippt dat utsöchte Rebeet un föögt dat na de Twischenaflaag in" - -#. +> trunk -#: kdiff3.cpp:494 -msgid "Copies the selected section to the clipboard" -msgstr "Kopeert den utsöchten Afsnitt na de Twischenaflaag" - -#. +> trunk -#: kdiff3.cpp:496 -msgid "Pastes the clipboard contents to current position" -msgstr "Föögt de Twischenaflaag ehr Inholt bi de aktuelle Steed in." - -#. +> trunk -#: kdiff3.cpp:498 -msgid "Select everything in current window" -msgstr "Allens binnen dat aktuelle Finster utsöken" - -#. +> trunk -#: kdiff3.cpp:500 -msgid "Search for a string" -msgstr "Na en Tekenkeed söken" - -#. +> trunk -#: kdiff3.cpp:502 -msgid "Search again for the string" -msgstr "Nochmaal na en Tekenkeed söken" - -#. +> trunk -#: kdiff3.cpp:507 -msgid "Enables/disables the statusbar" -msgstr "Maakt den Statusbalken an oder ut" - -#. +> trunk -#: kdiff3.cpp:511 -msgid "Configure KDiff3..." -msgstr "KDiff3 instellen..." - -#. +> trunk -#: kdiff3.cpp:532 -msgid "Go to Current Delta" -msgstr "Na aktuellen Verscheel gahn" - -#. +> trunk -#: kdiff3.cpp:532 -msgid "" -"Current\n" -"Delta" -msgstr "" -"Aktuell\n" -"Verscheel" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "Go to First Delta" -msgstr "Na eersten Verscheel gahn" - -#. +> trunk -#: kdiff3.cpp:534 -msgid "" -"First\n" -"Delta" -msgstr "" -"Eerst\n" -"Verscheel" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "Go to Last Delta" -msgstr "Na lesten Verscheel gahn" - -#. +> trunk -#: kdiff3.cpp:536 -msgid "" -"Last\n" -"Delta" -msgstr "" -"Lest\n" -"Verscheel" - -#. +> trunk -#: kdiff3.cpp:538 -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Övergeiht Freeruum-Verschelen, wenn \"Freerüüm wiesen\" utmaakt is.)" - -#. +> trunk -#: kdiff3.cpp:539 -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Övergeiht Freeruum-Verschelen nich, ok wenn \"Freerüüm wiesen\" utmaakt is.)" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "Go to Previous Delta" -msgstr "Na verleden Verscheel gahn" - -#. +> trunk -#: kdiff3.cpp:540 -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Verleden\n" -"Verscheel" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "Go to Next Delta" -msgstr "Na nakamen Verscheel gahn" - -#. +> trunk -#: kdiff3.cpp:542 -msgid "" -"Next\n" -"Delta" -msgstr "" -"Nakamen\n" -"Verscheel" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "Go to Previous Conflict" -msgstr "Na verleden Konflikt gahn" - -#. +> trunk -#: kdiff3.cpp:544 -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Verleden\n" -"Konflikt" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "Go to Next Conflict" -msgstr "Na nakamen Konflikt gahn" - -#. +> trunk -#: kdiff3.cpp:546 -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Nakamen\n" -"Konflikt" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "Go to Previous Unsolved Conflict" -msgstr "Na verleden Konflikt gahn, de nich oplööst is" - -#. +> trunk -#: kdiff3.cpp:548 -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Verleden\n" -"n. oplööst" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "Go to Next Unsolved Conflict" -msgstr "Na nakamen Konflikt gahn, de nich oplööst is" - -#. +> trunk -#: kdiff3.cpp:550 -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Nakamen\n" -"n. oplööst" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "Select Line(s) From A" -msgstr "Reeg ut A bruken" - -#. +> trunk -#: kdiff3.cpp:552 -msgid "" -"Choose\n" -"A" -msgstr "" -"A\n" -"bruken" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "Select Line(s) From B" -msgstr "Reeg ut B bruken" - -#. +> trunk -#: kdiff3.cpp:553 -msgid "" -"Choose\n" -"B" -msgstr "" -"B\n" -"bruken" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "Select Line(s) From C" -msgstr "Reeg ut C bruken" - -#. +> trunk -#: kdiff3.cpp:554 -msgid "" -"Choose\n" -"C" -msgstr "" -"C\n" -"bruken" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Na Bornköör automaatsch na nakamen nich oplöösten Konflikt gahn" - -#. +> trunk -#: kdiff3.cpp:555 -msgid "" -"Auto\n" -"Next" -msgstr "" -"Autom.\n" -"Nakamen" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "Show Space && Tabulator Characters for Differences" -msgstr "Free- un Tab-Tekens as Verscheel wiesen" - -#. +> trunk -#: kdiff3.cpp:557 -msgid "" -"White\n" -"Characters" -msgstr "Freerüüm" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "Show White Space" -msgstr "Freerüüm wiesen" - -#. +> trunk -#: kdiff3.cpp:558 -msgid "" -"White\n" -"Deltas" -msgstr "" -"Freeruum-\n" -"Verschelen" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "Show Line Numbers" -msgstr "Reegnummern wiesen" - -#. +> trunk -#: kdiff3.cpp:560 -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Reeg-\n" -"nummern" - -#. +> trunk -#: kdiff3.cpp:561 -msgid "Choose A Everywhere" -msgstr "Jümmers A bruken" - -#. +> trunk -#: kdiff3.cpp:562 -msgid "Choose B Everywhere" -msgstr "Jümmers B bruken" - -#. +> trunk -#: kdiff3.cpp:563 -msgid "Choose C Everywhere" -msgstr "Jümmers C bruken" - -#. +> trunk -#: kdiff3.cpp:564 -msgid "Choose A for All Unsolved Conflicts" -msgstr "A för all nich oplööst Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:565 -msgid "Choose B for All Unsolved Conflicts" -msgstr "B för all nich oplööst Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:566 -msgid "Choose C for All Unsolved Conflicts" -msgstr "C för all nich oplööst Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:567 -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "A för all nich oplööst Freeruum-Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:568 -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "B för all nich oplööst Freeruum-Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:569 -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "C för all nich oplööst Freeruum-Konflikten bruken" - -#. +> trunk -#: kdiff3.cpp:570 -msgid "Automatically Solve Simple Conflicts" -msgstr "Eenfach Konflikten automaatsch oplösen" - -#. +> trunk -#: kdiff3.cpp:571 -msgid "Set Deltas to Conflicts" -msgstr "All Verschelen as Konflikten markeren" - -#. +> trunk -#: kdiff3.cpp:572 -msgid "Run Regular Expression Auto Merge" -msgstr "Automaatsch Tosamenföhren mit reguleer Utdruck" - -#. +> trunk -#: kdiff3.cpp:573 -msgid "Automatically Solve History Conflicts" -msgstr "Vörgeschicht-Konflikten automaatsch oplösen" - -#. +> trunk -#: kdiff3.cpp:574 -msgid "Split Diff At Selection" -msgstr "Verscheel bi Köör delen" - -#. +> trunk -#: kdiff3.cpp:575 -msgid "Join Selected Diffs" -msgstr "Utsöcht Verschelen tosamenstellen" - -#. +> trunk -#: kdiff3.cpp:577 -msgid "Show Window A" -msgstr "Finster A wiesen" - -#. +> trunk -#: kdiff3.cpp:578 -msgid "Show Window B" -msgstr "Finster B wiesen" - -#. +> trunk -#: kdiff3.cpp:579 -msgid "Show Window C" -msgstr "Finster C wiesen" - -#. +> trunk -#: kdiff3.cpp:580 kdiff3.cpp:591 -msgid "Focus Next Window" -msgstr "Nakamen Finster anmaken" - -#. +> trunk -#: kdiff3.cpp:582 -msgid "Normal Overview" -msgstr "Normaal Översicht" - -#. +> trunk -#: kdiff3.cpp:583 -msgid "A vs. B Overview" -msgstr "A-B-Översicht" - -#. +> trunk -#: kdiff3.cpp:584 -msgid "A vs. C Overview" -msgstr "A-C-Översicht" - -#. +> trunk -#: kdiff3.cpp:585 -msgid "B vs. C Overview" -msgstr "B-C-Översicht" - -#. +> trunk -#: kdiff3.cpp:586 -msgid "Word Wrap Diff Windows" -msgstr "Regen ümbreken" - -#. +> trunk -#: kdiff3.cpp:587 -msgid "Add Manual Diff Alignment" -msgstr "Verscheel-Utrichten vun Hand tofögen" - -#. +> trunk -#: kdiff3.cpp:588 -msgid "Clear All Manual Diff Alignments" -msgstr "All Vun-Hand-Utrichten wegmaken" - -#. +> trunk -#: kdiff3.cpp:593 -msgid "Focus Prev Window" -msgstr "Verleden Finster anmaken" - -#. +> trunk -#: kdiff3.cpp:594 -msgid "Toggle Split Orientation" -msgstr "Deelricht wesseln" - -#. +> trunk -#: kdiff3.cpp:596 -msgid "Dir && Text Split Screen View" -msgstr "Deelt Ansicht för Orner un Text" - -#. +> trunk -#: kdiff3.cpp:598 -msgid "Toggle Between Dir && Text View" -msgstr "Orner- un Text-Ansicht wesseln" - -#. +> trunk -#: kdiff3.cpp:654 pdiff.cpp:1812 -msgid "The merge result hasn't been saved." -msgstr "Tosamenföhr-Resultaat wöör nich sekert" - -#. +> trunk -#: kdiff3.cpp:656 -msgid "Save && Quit" -msgstr "Sekern && Utmaken" - -#. +> trunk -#: kdiff3.cpp:657 -msgid "Quit Without Saving" -msgstr "Utmaken un nich Sekern" - -#. +> trunk -#: kdiff3.cpp:665 pdiff.cpp:1823 -msgid "Saving the merge result failed." -msgstr "Tosamenföhr-Resultaat lett sik nich sekern" - -#. +> trunk -#: kdiff3.cpp:676 pdiff.cpp:1078 -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Du föhrst jüst Ornern tosamen. Wullt Du dat redig afbreken?" - -#. +> trunk -#: kdiff3.cpp:701 -msgid "Saving file..." -msgstr "Datei warrt sekert..." - -#. +> trunk -#: kdiff3.cpp:718 -msgid "Saving file with a new filename..." -msgstr "Datei warrt mit en nieg Dateinaam sekert..." - -#. +> trunk -#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614 -msgid "Save As..." -msgstr "Sekern as..." - -#. +> trunk -#: kdiff3.cpp:781 -msgid "Printing not implemented." -msgstr "Drucken nich inbuut" - -#. +> trunk -#: kdiff3.cpp:815 -msgid "Printing..." -msgstr "An't Drucken..." - -#. +> trunk -#: kdiff3.cpp:956 -msgid "Selection" -msgstr "Köör" - -#. +> trunk -#: kdiff3.cpp:982 -msgid "Printing completed." -msgstr "Drucken afslaten." - -#. +> trunk -#: kdiff3.cpp:986 -msgid "Printing aborted." -msgstr "Drucken afbraken." - -#. +> trunk -#: kdiff3.cpp:993 -msgid "Exiting..." -msgstr "Bi to utstiegen..." - -#. +> trunk -#: kdiff3.cpp:1006 -msgid "Toggling toolbar..." -msgstr "Warktüüchbalken warrt an-/utmaakt..." - -#. +> trunk -#: kdiff3.cpp:1027 -msgid "Toggle the statusbar..." -msgstr "Statusbalken an-/utmaken..." - -#. +> trunk -#: kdiff3_part.cpp:157 kdiff3_part.cpp:234 -msgid "Couldn't find files for comparison." -msgstr "Dateien för't Verglieken laat sik nich finnen." - -#. +> trunk -#: kdiff3_part.cpp:302 -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk -#: kdiff3_part.cpp:303 main.cpp:174 -msgid "Joachim Eibl" -msgstr "Joachim Eibl" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:4 -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_part.rc:13 -msgid "Configure KDiff3" -msgstr "KDiff3 instellen" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_part.rc:16 -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3_shell.cpp:76 -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"De KDiff3-Komponent lett sik nich torechtmaken.\n" -"Dit kummt normalerwies bi Problemen mit de Installatschoon vör. De Enkelheiten staht binnen de README-Datei vun't Born-Paket." - -#. i18n: ectx: Menu (file) -#. +> trunk -#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296 -msgid "&File" -msgstr "&Datei" - -#. i18n: ectx: Menu (directory) -#. +> trunk -#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298 -msgid "&Directory" -msgstr "&Orner" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk -#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488 -#: kreplacements/kreplacements.cpp:497 -msgid "Current Item Merge Operation" -msgstr "Tosamenföhr-Akschoon för aktuell Element" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk -#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489 -#: kreplacements/kreplacements.cpp:498 -msgid "Current Item Sync Operation" -msgstr "Synkroniseer-Akschoon för aktuell Element" - -#. i18n: ectx: Menu (movement) -#. +> trunk -#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301 -msgid "&Movement" -msgstr "&Verschuven" - -#. i18n: ectx: Menu (diff) -#. +> trunk -#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302 -msgid "D&iffview" -msgstr "Verscheel&ansicht" - -#. i18n: ectx: Menu (merge) -#. +> trunk -#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303 -msgid "&Merge" -msgstr "&Tosamenföhren" - -#. i18n: ectx: Menu (window) -#. +> trunk -#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304 -msgid "&Window" -msgstr "&Finster" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk -#: kdiff3_shell.rc:106 -msgid "Main Toolbar" -msgstr "Hööft-Warktüüchbalken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189 -#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512 -msgid "Cancel" -msgstr "Afbreken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339 -#: smalldialogs.cpp:508 -msgid "OK" -msgstr "OK" - -#. +> trunk -#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715 -msgid "Help" -msgstr "Hülp" - -#. +> trunk -#: kreplacements/kreplacements.cpp:185 -msgid "Defaults" -msgstr "Vörinstellen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:297 -msgid "&Edit" -msgstr "&Bewerken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:305 -msgid "&Settings" -msgstr "&Instellen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:306 -msgid "&Help" -msgstr "&Hülp" - -#. +> trunk -#: kreplacements/kreplacements.cpp:353 -msgid "&About" -msgstr "&Vertell wat över" - -#. +> trunk -#: kreplacements/kreplacements.cpp:369 -msgid "A&uthor" -msgstr "A&utor" - -#. +> trunk -#: kreplacements/kreplacements.cpp:383 -msgid "&Thanks To" -msgstr "&Dank" - -#. +> trunk -#: kreplacements/kreplacements.cpp:597 -msgid "Open" -msgstr "Opmaken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:606 -msgid "Save" -msgstr "Sekern" - -#. +> trunk -#: kreplacements/kreplacements.cpp:623 -msgid "Print..." -msgstr "Drucken..." - -#. +> trunk -#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107 -msgid "Quit" -msgstr "Utmaken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:639 -msgid "Cut" -msgstr "Knippen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:647 -msgid "Copy" -msgstr "Koperen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:655 -msgid "Paste" -msgstr "Infögen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:663 -msgid "Select All" -msgstr "All utsöken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:671 -msgid "Show Toolbar" -msgstr "Warktüüchbalken wiesen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:679 -msgid "Show &Status Bar" -msgstr "&Statusbalken wiesen" - -#. +> trunk -#: kreplacements/kreplacements.cpp:687 -#, kde-format -msgid "&Configure %1..." -msgstr "%1 &instellen..." - -#. +> trunk -#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707 -msgid "About" -msgstr "Över" - -#. +> trunk -#: kreplacements/kreplacements.cpp:722 -msgid "Find" -msgstr "Söken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:730 -msgid "Find Next" -msgstr "Nakamen söken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:750 -msgid "Select Font" -msgstr "Schriftoort utsöken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679 -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 "" -"Du hest en Schriftoort mit variabel Breed utsöcht.\n" -"\n" -"Dit Programm kann Schriftoorden mit variabel Breed nich richtig\n" -"bruken, Du hest villicht Problemen bi't Bewerken vun Dateien.\n" -"\n" -"Wullt Du wiedermaken oder en anner Schriftoort utsöken?" - -#. +> trunk -#: kreplacements/kreplacements.cpp:792 -msgid "Incompatible font." -msgstr "Schriftoort is nich kompatibel." - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Continue at my own risk" -msgstr "Op mien egen Riskanz wiedermaken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:793 -msgid "Select another font" -msgstr "En anner Schriftoort utsöken" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1134 -msgid "For more documentation, see the help-menu or the subdirectory doc." -msgstr "Anner Dokmentatschoon gifft dat in't Hülp-Menü oder in't Kapitel Ünnerornern." - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "KDiff3-Usage" -msgstr "KDiff3-Bruuk" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "Ignore" -msgstr "Övergahn" - -#. +> trunk -#: kreplacements/kreplacements.cpp:1137 -msgid "Exit" -msgstr "Utstiegen" - -#. +> trunk -#: kreplacements/kreplacements.h:105 -msgid "Continue" -msgstr "Wiedermaken" - -#. +> trunk -#: main.cpp:74 main.cpp:76 -msgid "Ignored. (User defined.)" -msgstr "Övergahn. (Vun'n Bruker fastleggt.)" - -#. +> trunk -#: main.cpp:162 -msgid "kdiff3" -msgstr "kdiff3" - -#. +> trunk -#: main.cpp:166 -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Tosamenföhr-Warktüüch för Dateien un Ornern" - -#. +> trunk -#: main.cpp:167 -msgid "(c) 2002-2011 Joachim Eibl" -msgstr "© 2002-2011, Joachim Eibl" - -#. +> trunk -#: main.cpp:175 -msgid "Eike Sauer" -msgstr "Eike Sauer" - -#. +> trunk -#: main.cpp:175 -msgid "Bugfixes, Debian package maintainer" -msgstr "Fehlerrichten, Pleger för de Debian-Paketen" - -#. +> trunk -#: main.cpp:176 -msgid "Sebastien Fricker" -msgstr "Sebastien Fricker" - -#. +> trunk -#: main.cpp:176 -msgid "Windows installer" -msgstr "Windows-Installeerprogramm" - -#. +> trunk -#: main.cpp:177 -msgid "Stephan Binner" -msgstr "Stephan Binner" - -#. +> trunk -#: main.cpp:177 -msgid "i18n-help" -msgstr "i18n-Hülp" - -#. +> trunk -#: main.cpp:178 -msgid "Stefan Partheymueller" -msgstr "Stefan Partheymueller" - -#. +> trunk -#: main.cpp:178 -msgid "Clipboard-patch" -msgstr "Twischenaflaag-Kodeplaster" - -#. +> trunk -#: main.cpp:179 -msgid "David Faure" -msgstr "David Faure" - -#. +> trunk -#: main.cpp:179 -msgid "KIO-Help" -msgstr "KIO-Hülp" - -#. +> trunk -#: main.cpp:180 -msgid "Bernd Gehrmann" -msgstr "Bernd Gehrmann" - -#. +> trunk -#: main.cpp:180 -msgid "Class CvsIgnoreList from Cervisia" -msgstr "Klass \"CvsIgnoreList\" ut \"Cervisia\"" - -#. +> trunk -#: main.cpp:181 -msgid "Andre Woebbeking" -msgstr "Andre Woebbeking" - -#. +> trunk -#: main.cpp:181 -msgid "Class StringMatcher" -msgstr "Klass \"StringMatcher\"" - -#. +> trunk -#: main.cpp:182 -msgid "Michael Denio" -msgstr "Michael Denio" - -#. +> trunk -#: main.cpp:182 -msgid "Directory Equality-Coloring patch" -msgstr "Kodeplaster för Orner-Liekheitklören" - -#. +> trunk -#: main.cpp:183 -msgid "Manfred Koehler" -msgstr "Manfred Koehler" - -#. +> trunk -#: main.cpp:183 -msgid "Fix for slow startup on Windows" -msgstr "Richten vun langsam Start op Windows" - -#. +> trunk -#: main.cpp:184 -msgid "Sergey Zorin" -msgstr "Sergey Zorin" - -#. +> trunk -#: main.cpp:184 -msgid "Diff Ext for Windows" -msgstr "Extern Diff för Windows" - -#. +> trunk -#: main.cpp:185 -msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" - -#. +> trunk -#: main.cpp:185 -msgid "GNU-Diffutils" -msgstr "GNU-Diffutils" - -#. +> trunk -#: main.cpp:186 -msgid "Tino Boellsterling, Timothy Mee" -msgstr "Tino Boellsterling, Timothy Mee" - -#. +> trunk -#: main.cpp:186 -msgid "Intensive test, use and feedback" -msgstr "Deegt Proberen, Bruuk un Resonanz" - -#. +> trunk -#: main.cpp:187 -msgid "Michael Schmidt" -msgstr "Michael Schmidt" - -#. +> trunk -#: main.cpp:187 -msgid "Mac support" -msgstr "Mac-Ünnerstütten" - -#. +> trunk -#: main.cpp:188 -msgid "Valentin Rusu" -msgstr "Valentin Rusu" - -#. +> trunk -#: main.cpp:188 main.cpp:189 -msgid "KDE4 porting" -msgstr "Porteren na KDE4" - -#. +> trunk -#: main.cpp:189 -msgid "Albert Astals Cid" -msgstr "Albert Astals Cid" - -#. +> trunk -#: main.cpp:190 -msgid "Silvan Scherrer" -msgstr "Silvan Scherrer" - -#. +> trunk -#: main.cpp:190 -msgid "OS2 port" -msgstr "Porteren na OS2" - -#. +> trunk -#: main.cpp:192 -msgid "+ Many thanks to those who reported bugs and contributed ideas!" -msgstr "Un velen Dank to all de Lüüd, de Fehlerberichten schreven un Vörslääg maakt hebbt!" - -#. +> trunk -#: main.cpp:198 -msgid "Merge the input." -msgstr "De Ingaav tosamenföhren" - -#. +> trunk -#: main.cpp:199 -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Utspraken Basisdatei. För de Kompatibiliteet mit anner Warktüüch." - -#. +> trunk -#: main.cpp:200 -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Utgaavdatei. Slutt \"-m\" in. Bispill: -o niegdatei.txt" - -#. +> trunk -#: main.cpp:201 -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Utgaavdatei, nochmaal. (För de Kompatibiliteet mit anner Warktüüch.)" - -#. +> trunk -#: main.cpp:202 -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "Keen Böversiet, wenn sik all Konflikten automaatsch oplösen laat (\"-o Utgaavdatei\" nödig)" - -#. +> trunk -#: main.cpp:203 -msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "Konflikt nich automaatsch oplösen. (För de Kompatibiliteet...)" - -#. +> trunk -#: main.cpp:204 -msgid "Visible name replacement for input file 1 (base)." -msgstr "Sichtbor Tuuschnaam för Ingaavdatei 1 (Grundlaag)." - -#. +> trunk -#: main.cpp:205 -msgid "Visible name replacement for input file 2." -msgstr "Sichtbor Tuuschnaam för Ingaavdatei 2." - -#. +> trunk -#: main.cpp:206 -msgid "Visible name replacement for input file 3." -msgstr "Sichtbor Tuuschnaam för Ingaavdatei 3." - -#. +> trunk -#: main.cpp:207 -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Anner sichtbor Tuuschnaam. Eenmaal för elkeen Ingaavdatei angeven." - -#. +> trunk -#: main.cpp:208 -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "En Instellen överschrieven. Eenmaal för elkeen Instellen bruken, a.B.: »--cs \"AutoAdvance=1\"«" - -#. +> trunk -#: main.cpp:209 -msgid "Show list of config settings and current values." -msgstr "List vun Instellenoptschonen un Weerten wiesen" - -#. +> trunk -#: main.cpp:210 -msgid "Use a different config file." -msgstr "En anner Instellendatei bruken" - -#. +> trunk -#: main.cpp:213 -msgid "file1 to open (base, if not specified via --base)" -msgstr "Eerste Datei, de Du opmaken wullt (Grundlaag, wenn nich mit \"--base\" angeven)" - -#. +> trunk -#: main.cpp:214 -msgid "file2 to open" -msgstr "Twete Datei, de Du opmaken wullt" - -#. +> trunk -#: main.cpp:215 -msgid "file3 to open" -msgstr "Drüdde Datei, de Du opmaken wullt" - -#. +> trunk -#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976 -#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002 -#: mergeresultwindow.cpp:1014 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Tall vun överbleven nich oplööst Konflikten: %1 (dor sünd %2 vun Freeruum-Konflikten)" - -#. +> trunk -#: mergeresultwindow.cpp:303 -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Du hest de Utgaav ännert.\n" -"Maakst Du wieder, kaamt Dien Ännern weg." - -#. +> trunk -#: mergeresultwindow.cpp:834 pdiff.cpp:532 -msgid "All input files are binary equal." -msgstr "All Ingaavdateien sünd bineer liek." - -#. +> trunk -#: mergeresultwindow.cpp:836 -msgid "All input files contain the same text." -msgstr "All Ingaavdateien bargt den sülven Text." - -#. +> trunk -#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840 -#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "De Dateien %1 un %2 sünd bineer liek.\n" - -#. +> trunk -#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841 -#: mergeresultwindow.cpp:843 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "De Dateien %1 un %2 bargt den sülven Text.\n" - -#. +> trunk -#: mergeresultwindow.cpp:849 -msgid "Total number of conflicts: " -msgstr "Heel Tall vun Konflikt: " - -#. +> trunk -#: mergeresultwindow.cpp:850 -msgid "" -"\n" -"Nr of automatically solved conflicts: " -msgstr "" -"\n" -"Tall vun automaatsch oplööst Konflikten: " - -#. +> trunk -#: mergeresultwindow.cpp:851 -msgid "" -"\n" -"Nr of unsolved conflicts: " -msgstr "" -"\n" -"Tall vun nich oplööst Konflikten: " - -#. +> trunk -#: mergeresultwindow.cpp:853 -msgid "Conflicts" -msgstr "Konflikten" - -#. +> trunk -#: mergeresultwindow.cpp:1728 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1736 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517 -msgid "" -msgstr "" - -#. +> trunk -#: mergeresultwindow.cpp:2725 -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" -msgstr "" -"Noch sünd nich all Konflikten oplööst.\n" -"Datei nich sekert.\n" - -#. +> trunk -#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736 -msgid "Conflicts Left" -msgstr "Konflikten na" - -#. +> trunk -#: mergeresultwindow.cpp:2734 -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" -msgstr "" -"Dat giffft en Konflikt mit de Reegennen. Söök bitte den Reegenn-Stil vun Hand ut.\n" -"Datei nich sekert.\n" - -#. +> trunk -#: mergeresultwindow.cpp:2748 -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Sekerheitkopie lett sik nich opstellen. Datei nich sekert." - -#. +> trunk -#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792 -msgid "File Save Error" -msgstr "Fehler bi't Sekern" - -#. +> trunk -#: mergeresultwindow.cpp:2792 -msgid "Error while writing." -msgstr "Fehler bi't Schrieven" - -#. +> trunk -#: mergeresultwindow.cpp:3122 -msgid "Output" -msgstr "Utgaav" - -#. +> trunk -#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314 -msgid "[Modified]" -msgstr "[Ännert]" - -#. +> trunk -#: mergeresultwindow.cpp:3141 -msgid "Encoding for saving" -msgstr "Koderen bi't Sekern" - -#. +> trunk -#: mergeresultwindow.cpp:3229 -msgid "Conflict" -msgstr "Konflikt" - -#. +> trunk -#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263 -#: mergeresultwindow.cpp:3265 -msgid "Codec from" -msgstr "Koderen vun" - -#. +> trunk -#: optiondialog.cpp:367 -msgid "Unicode, 8 bit" -msgstr "Unicode, 8 Bit" - -#. +> trunk -#: optiondialog.cpp:368 -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk -#: optiondialog.cpp:369 -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk -#: optiondialog.cpp:388 -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Änner dit, wenn Tekens buten dat ASCII-Rebeet nich propper wiest warrt." - -#. +> trunk -#: optiondialog.cpp:465 -msgid "Configure" -msgstr "Instellen" - -#. +> trunk -#: optiondialog.cpp:531 -msgid "Font" -msgstr "Schriftoort" - -#. +> trunk -#: optiondialog.cpp:532 -msgid "Editor & Diff Output Font" -msgstr "Editor- un Verscheel-Schriftoort" - -#. +> trunk -#: optiondialog.cpp:556 -msgid "Italic font for deltas" -msgstr "Kursievschrift för Verschelen" - -#. +> trunk -#: optiondialog.cpp:559 -msgid "" -"Selects the italic version of the font for differences.\n" -"If the font doesn't support italic characters, then this does nothing." -msgstr "" -"Bruukt för Verschelen de Schriftoort in kursiev.\n" -"Gifft dat för de Schriftoort keen kursive Tekens, deit disse Optschoon nix." - -#. +> trunk -#: optiondialog.cpp:568 -msgid "Color" -msgstr "Klöör" - -#. +> trunk -#: optiondialog.cpp:569 -msgid "Colors Settings" -msgstr "Klören instellen" - -#. +> trunk -#: optiondialog.cpp:588 -msgid "Editor and Diff Views:" -msgstr "Editor- un Verscheel-Ansichten:" - -#. +> trunk -#: optiondialog.cpp:596 -msgid "Foreground color:" -msgstr "Vörgrundklöör:" - -#. +> trunk -#: optiondialog.cpp:603 -msgid "Background color:" -msgstr "Achtergrundklöör:" - -#. +> trunk -#: optiondialog.cpp:612 -msgid "Diff background color:" -msgstr "Verscheel-Achtergrundklöör:" - -#. +> trunk -#: optiondialog.cpp:620 -msgid "Color A:" -msgstr "Klöör A:" - -#. +> trunk -#: optiondialog.cpp:628 -msgid "Color B:" -msgstr "Klöör B:" - -#. +> trunk -#: optiondialog.cpp:636 -msgid "Color C:" -msgstr "Klöör C:" - -#. +> trunk -#: optiondialog.cpp:643 -msgid "Conflict color:" -msgstr "Konflikt-Klöör:" - -#. +> trunk -#: optiondialog.cpp:651 -msgid "Current range background color:" -msgstr "Achtergrundklöör för aktuell Rebeet:" - -#. +> trunk -#: optiondialog.cpp:659 -msgid "Current range diff background color:" -msgstr "Verscheel-Achtergrundklöör för aktuell Rebeet:" - -#. +> trunk -#: optiondialog.cpp:666 -msgid "Color for manually aligned difference ranges:" -msgstr "Klöör för vun Hand utricht Verscheelrebeden:" - -#. +> trunk -#: optiondialog.cpp:672 -msgid "Directory Comparison View:" -msgstr "Ornerverscheel-Ansicht:" - -#. +> trunk -#: optiondialog.cpp:678 -msgid "Newest file color:" -msgstr "Klöör för niegst Datei:" - -#. +> trunk -#: optiondialog.cpp:682 -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Ännern an disse Klöör warrt eerst bi't nakamen Verglieken vun Ornern bruukt." - -#. +> trunk -#: optiondialog.cpp:687 -msgid "Oldest file color:" -msgstr "Klöör för öllst Datei:" - -#. +> trunk -#: optiondialog.cpp:695 -msgid "Middle age file color:" -msgstr "Klöör för en middeloolt Datei:" - -#. +> trunk -#: optiondialog.cpp:703 -msgid "Color for missing files:" -msgstr "Klöör för fehlen Dateien:" - -#. +> trunk -#: optiondialog.cpp:717 -msgid "Editor" -msgstr "Editor" - -#. +> trunk -#: optiondialog.cpp:718 -msgid "Editor Behavior" -msgstr "Editor-Bedregen" - -#. +> trunk -#: optiondialog.cpp:732 -msgid "Tab inserts spaces" -msgstr "Tabtast föögt Freetekens in" - -#. +> trunk -#: optiondialog.cpp:735 -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"An: De Tabtast föögt en propper Tall vun Freetekens in.\n" -"Ut: De Tabtast föögt en Tabteken in." - -#. +> trunk -#: optiondialog.cpp:741 -msgid "Tab size:" -msgstr "Tab-Breed:" - -#. +> trunk -#: optiondialog.cpp:747 -msgid "Auto indentation" -msgstr "Autom. inrücken" - -#. +> trunk -#: optiondialog.cpp:750 -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "An: De Inrückdeepde ut de verleden Reeg warrt för de niege bruukt.\n" - -#. +> trunk -#: optiondialog.cpp:754 -msgid "Auto copy selection" -msgstr "Köör autom. koperen" - -#. +> trunk -#: optiondialog.cpp:757 -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"An: All Kören warrt fuurts na de Twischenaflaag kopeert.\n" -"Ut: Du muttst dat Koperen sülven maken, a.B. mit Strg+C." - -#. +> trunk -#: optiondialog.cpp:772 -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Leggt de Tekens fast, de bi't Sekern för Reegennen bruukt warrt.\n" -"DOS/Windows: CR+LF, UNIX: LF (CR = 0D, LF = 0A)" - -#. +> trunk -#: optiondialog.cpp:784 -msgid "Diff" -msgstr "Verscheel" - -#. +> trunk -#: optiondialog.cpp:785 -msgid "Diff Settings" -msgstr "Verscheel-Instellen" - -#. +> trunk -#: optiondialog.cpp:809 -msgid "Treat as white space." -msgstr "As Freeruum hanteren" - -#. +> trunk -#: optiondialog.cpp:811 -msgid "Ignore numbers" -msgstr "Tallen övergahn" - -#. +> trunk -#: optiondialog.cpp:814 -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Talltekens bi't Regenutrichten övergahn (liek to \"Freerüüm övergahn\").\n" -"Mag bi't Verglieken vun Dateien mit Tallen beter Resultaten geven." - -#. +> trunk -#: optiondialog.cpp:819 -msgid "Ignore C/C++ comments" -msgstr "C/C++-Kommentaren övergahn" - -#. +> trunk -#: optiondialog.cpp:821 -msgid "Treat C/C++ comments like white space." -msgstr "C/C++-Kommentaren liek as Freerüüm hanteren." - -#. +> trunk -#: optiondialog.cpp:825 -msgid "Ignore case" -msgstr "Groot-/Lüttschrieven övergahn" - -#. +> trunk -#: optiondialog.cpp:828 -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Verschelen in Groot- un Lüttschrieven liek as Freerüüm-Verschelen hanteren." - -#. +> trunk -#: optiondialog.cpp:832 -msgid "Preprocessor command:" -msgstr "Vörverarbeid-Befehl:" - -#. +> trunk -#: optiondialog.cpp:836 -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "Vun Bruker fastleggt Vörverarbeiden (Enkelheiten binnen de Dokmentatschoon)." - -#. +> trunk -#: optiondialog.cpp:839 -msgid "Line-matching preprocessor command:" -msgstr "Vörverarbeid-Befehl för't Regenutrichten:" - -#. +> trunk -#: optiondialog.cpp:843 -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Disse Vörverarbeiden warrt bloots bi't Regenutrichten bruukt.\n" -"(Enkelheiten binnen de Dokmentatschoon)" - -#. +> trunk -#: optiondialog.cpp:846 -msgid "Try hard (slower)" -msgstr "In't Tüüch leggen (langsamer)" - -#. +> trunk -#: optiondialog.cpp:849 -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Bruukt de Optschoon \"--minimal\" vun't Diff-Programm.\n" -"Dat Dörkieken vun groot Dateien warrt denn bannig wat langsamer." - -#. +> trunk -#: optiondialog.cpp:854 -msgid "Align B and C for 3 input files" -msgstr "B un C för 3 Ingaavdateien utrichten" - -#. +> trunk -#: optiondialog.cpp:857 -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"B un C bi't Verglieken oder Tosamenföhren vun 3 Ingaavdateien toenanner utrichten.\n" -"Bi't Tosamenföhren nich anraadt, dat mag to vigeliensch warrn.\n" -"(Standard is Ut.)" - -#. +> trunk -#: optiondialog.cpp:870 -msgid "Merge Settings" -msgstr "Tosamenföhr-Instellen" - -#. +> trunk -#: optiondialog.cpp:885 -msgid "Auto advance delay (ms):" -msgstr "Töövtiet för't autom. Wiedergahn (ms):" - -#. +> trunk -#: optiondialog.cpp:890 -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 "" -"Is dat Automaatsche Wiedergahn anmaakt, warrt dat Resultaat vun de aktuelle Köör\n" -"för de angeven Tiet wiest, ehr dat Programm na den nakamen Konflikt jumpt. Weerten: 0 - 2000 ms." - -#. +> trunk -#: optiondialog.cpp:895 -msgid "Show info dialogs" -msgstr "Infodialogen wiesen" - -#. +> trunk -#: optiondialog.cpp:897 -msgid "Show a dialog with information about the number of conflicts." -msgstr "En Dialoog mit de Tall vun Konflikten wiesen" - -#. +> trunk -#: optiondialog.cpp:900 -msgid "White space 2-file merge default:" -msgstr "Freeruum-Standard bi 2-Dateien-Tosamenföhren:" - -#. +> trunk -#: optiondialog.cpp:904 optiondialog.cpp:917 -msgid "Manual Choice" -msgstr "Köör vun Hand" - -#. +> trunk -#: optiondialog.cpp:908 optiondialog.cpp:922 -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "Den Tosamenföhr-Algoritmus bi Freeruum-Konflikten automaatsch en Born utsöken laten" - -#. +> trunk -#: optiondialog.cpp:913 -msgid "White space 3-file merge default:" -msgstr "Freeruum-Standard bi 3-Dateien-Tosamenföhren:" - -#. +> trunk -#: optiondialog.cpp:927 -msgid "Automatic Merge Regular Expression" -msgstr "Reguleer Utdruck för't autom. Tosamenföhren" - -#. +> trunk -#: optiondialog.cpp:936 smalldialogs.cpp:414 -msgid "Auto merge regular expression:" -msgstr "Reguleer Utdruck för't autom. Tosamenföhren:" - -#. +> trunk -#: optiondialog.cpp:940 -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" -"Reguleer Utdruck för Regen, bi de KDiff3 automaatsch een Born utsöken schall.\n" -"Passt de Utdruck op en Reeg mit en Konflikt, warrt - wenn verföögbor - de Reeg\n" -"ut Born C, sünst de Reeg ut Born B bruukt." - -#. +> trunk -#: optiondialog.cpp:946 -msgid "Run regular expression auto merge on merge start" -msgstr "Bi't Starten vun't Tosamenföhren automaatsch na reguleer Utdruck tosamenföhren" - -#. +> trunk -#: optiondialog.cpp:948 -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Dat automaatsche Tosamenföhren langs de reguleren\n" -"Utdrück för't automaatsche Tosamenföhren direktemang\n" -"utföhren, wenn dat Tosamenföhren anfangt.\n" - -#. +> trunk -#: optiondialog.cpp:953 -msgid "Version Control History Merging" -msgstr "Tosamenföhren mit Verschoonkuntrull-Vörgeschicht" - -#. +> trunk -#: optiondialog.cpp:962 smalldialogs.cpp:441 -msgid "History start regular expression:" -msgstr "Reguleer Utdruck för Vörgeschicht-Anfang:" - -#. +> trunk -#: optiondialog.cpp:966 -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Reguleer Utdruck för den Anfang vun den Verschoonkuntrull-Vörgeschichtindrag.\n" -"Normalerwies bargt disse Reeg dat Slötelwoort \"$Log$\".\n" -"Standardweert: \".*\\$Log.*\\$.*\"" - -#. +> trunk -#: optiondialog.cpp:972 smalldialogs.cpp:469 -msgid "History entry start regular expression:" -msgstr "Reguleer Utdruck för Vörgeschichtindrag-Anfang:" - -#. +> trunk -#: optiondialog.cpp:984 -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"En Verschoonkuntrull-Vörgeschichtindrag geiht över mehr Regen.\n" -"Hier kannst Du den reguleren Utdruck angeven, mit den sik de eerste Reeg kennen lett (ahn den vöranstellten Kommentar).\n" -"Mit Klemmen kannst Du Slötels för't Sorteren tosamenkoppeln.\n" -"Lettst Du dat leddig, nimmt KDiff3 an, dat leddig Regen twischen Vörgeschichtindrääg staht.\n" -"De Enkelheiten staht binnen de Dokmentatschoon." - -#. +> trunk -#: optiondialog.cpp:992 -msgid "History merge sorting" -msgstr "Sorteren bi Vörgeschicht-Tosamenföhren" - -#. +> trunk -#: optiondialog.cpp:994 -msgid "Sort version control history by a key." -msgstr "Verschoonkuntrull-Vörgeschicht na Slötel sorteren" - -#. +> trunk -#: optiondialog.cpp:1004 -msgid "History entry start sort key order:" -msgstr "Sorteerreeg för Vörgeschichtindrag-Anfang:" - -#. +> trunk -#: optiondialog.cpp:1008 -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Elkeen Klemmenpoor binnen den reguleren Utdruck för den Vörgeschichtindrag-Anfang\n" -"koppelt en Slötel tosamen, de sik bi't Sorteren bruken lett.\n" -"Hier kannst Du de Reeg för de Slötels över ehr Nummern angeven\n" -"(fangt bi 1 an, nummereert na de Reeg, in de se in den reguleren Utdruck staht).\n" -"Bruuk Kommas (\",\") as Trennteken (a.B.: \"4,5,6,1,2,3,7\").\n" -"Lettst Du dat leddig, warrt nich sorteert.\n" -"De Enkelheiten staht binnen de Dokmentatschoon." - -#. +> trunk -#: optiondialog.cpp:1019 -msgid "Merge version control history on merge start" -msgstr "Verschoonkuntrull-Vörgeschicht bi't Starten vun't Tosamenföhren tosamenföhren" - -#. +> trunk -#: optiondialog.cpp:1021 -msgid "Run version control history automerge on merge start." -msgstr "Bi't Starten vun't Tosamenföhren automaatsch Verschoonkuntrull-Vörgeschicht tosamenföhren" - -#. +> trunk -#: optiondialog.cpp:1025 -msgid "Max number of history entries:" -msgstr "Hööchsttall vun Vörgeschichtindrääg:" - -#. +> trunk -#: optiondialog.cpp:1028 -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Na angeven Tall ophollen. Bi -1 nich ophollen." - -#. +> trunk -#: optiondialog.cpp:1032 -msgid "Test your regular expressions" -msgstr "Regulere Utdrück utproberen" - -#. +> trunk -#: optiondialog.cpp:1037 -msgid "Irrelevant merge command:" -msgstr "Tosamenföhr-Befehl bi fehlen Ännern:" - -#. +> trunk -#: optiondialog.cpp:1041 -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Wenn angeven, warrt dit Skript na't automaatsche\n" -"Tosamenföhren opropen, wenn dat sünst keen Ännern geven hett.\n" -"Warrt mit disse Parameters opropen: Dateinaam1 Dateinaam2 Dateinaam3" - -#. +> trunk -#: optiondialog.cpp:1047 -msgid "Auto save and quit on merge without conflicts" -msgstr "Na't Tosamenföhren ahn Konflikten autom. sekern un utmaken" - -#. +> trunk -#: optiondialog.cpp:1050 -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Wenn KDiff3 för't Tosamenföhren vun Dateien opropen warrt un sik all\n" -"Konflikten oplösen laat un de Bruker nix bidregen mutt, denn\n" -"dat Resultaat automaatsch sekern un dat Programm utmaken.\n" -"(Liek to de Befehlsreegoptschoon \"--auto\".)" - -#. +> trunk -#: optiondialog.cpp:1061 optiondialog.cpp:1062 -msgid "Directory" -msgstr "Orner" - -#. +> trunk -#: optiondialog.cpp:1075 -msgid "Recursive directories" -msgstr "Rekursiev" - -#. +> trunk -#: optiondialog.cpp:1077 -msgid "Whether to analyze subdirectories or not." -msgstr "Leggt fast, wat ok Ünnerornern dörkeken warrt." - -#. +> trunk -#: optiondialog.cpp:1079 -msgid "File pattern(s):" -msgstr "Dateimuster(n):" - -#. +> trunk -#: optiondialog.cpp:1084 -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Muster(n) vun Dateien, de Du bekieken wullt.\n" -"Platzholltekens: \"*\" un \"?\"\n" -"Trennteken twischen Mustern: \";\"" - -#. +> trunk -#: optiondialog.cpp:1090 -msgid "File-anti-pattern(s):" -msgstr "Datei-Utsluutmuster(n):" - -#. +> trunk -#: optiondialog.cpp:1095 -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Muster(n) för Dateien, de Du vun't Bekieken utsluten wullt.\n" -"Platzholltekens: \"*\" un \"?\"\n" -"Trennteken twischen Mustern: \";\"" - -#. +> trunk -#: optiondialog.cpp:1101 -msgid "Dir-anti-pattern(s):" -msgstr "Orner-Utsluutmuster(n):" - -#. +> trunk -#: optiondialog.cpp:1106 -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Muster(n) för Ornern, de Du vun't Bekieken utsluten wullt.\n" -"Platzholltekens: \"*\" un \"?\"\n" -"Trennteken twischen Mustern: \";\"" - -#. +> trunk -#: optiondialog.cpp:1112 -msgid "Use .cvsignore" -msgstr "\".cvsignore\" bruken" - -#. +> trunk -#: optiondialog.cpp:1115 -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Verwiedert dat Utsluutmuster op allens, wat CVS övergahn dee.\n" -"Bi lokaal \".cvsignore\"-Dateien kann dat vun den Orner afhangen." - -#. +> trunk -#: optiondialog.cpp:1120 -msgid "Find hidden files and directories" -msgstr "Versteken Dateien un Ornern bekieken" - -#. +> trunk -#: optiondialog.cpp:1123 -msgid "Finds files and directories with the hidden attribute." -msgstr "Ok Ornern un Dateien mit dat \"Versteken\"-Attribut bekieken" - -#. +> trunk -#: optiondialog.cpp:1125 -msgid "Finds files and directories starting with '.'." -msgstr "Ok Dateien un Ornern bekieken, de mit en Punkt anfangt" - -#. +> trunk -#: optiondialog.cpp:1129 -msgid "Follow file links" -msgstr "Dateilinks nagahn" - -#. +> trunk -#: optiondialog.cpp:1132 -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"An: De Datei verglieken, op de de Link wiest.\n" -"Ut: De Links verglieken." - -#. +> trunk -#: optiondialog.cpp:1137 -msgid "Follow directory links" -msgstr "Ornerlinks nagahn" - -#. +> trunk -#: optiondialog.cpp:1140 -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"An: Den Orner verglieken, op den de Link wiest.\n" -"Ut: De Links verglieken." - -#. +> trunk -#: optiondialog.cpp:1156 -msgid "Case sensitive filename comparison" -msgstr "Bi Dateinaam-Vergliek op Groot- un Lüttschrieven kieken" - -#. +> trunk -#: optiondialog.cpp:1159 -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" -"De Ornervergliek vergliekt Dateien oder Ornern, wenn ehr Naams liek sünd.\n" -"Maakt dit an, wenn de Groot-/Lüttschrieven liek wesen mutt. (Op Windows standardwies ut, sünst an)." - -#. +> trunk -#: optiondialog.cpp:1163 -msgid "File Comparison Mode" -msgstr "Dateivergliek-Bedriefoort" - -#. +> trunk -#: optiondialog.cpp:1169 -msgid "Binary comparison" -msgstr "Bineervergliek" - -#. +> trunk -#: optiondialog.cpp:1170 -msgid "Binary comparison of each file. (Default)" -msgstr "Bineervergliek bi all Dateien (Standard)" - -#. +> trunk -#: optiondialog.cpp:1173 -msgid "Full analysis" -msgstr "Heel Dörkiek" - -#. +> trunk -#: optiondialog.cpp:1174 -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"En heel Dörkiek doon un bito Statistik binnen besünner Striepen wiesen.\n" -"(Langsamer as en Bineervergliek, veel langsamer bi Bineerdateien.)" - -#. +> trunk -#: optiondialog.cpp:1178 -msgid "Trust the size and modification date (unsafe)" -msgstr "Grött un Ännerdatum bruken (nich seker)" - -#. +> trunk -#: optiondialog.cpp:1179 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Dateien mit liek Ännerdatum un Längde as liek hanteren.\n" -"Dateien mit liek Inholt, man verscheden Ännerdatum warrt as verscheden wiest.\n" -"Goot bi groot Ornern oder binnen langsam Nettwarken." - -#. +> trunk -#: optiondialog.cpp:1184 -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Grött un Ännerdatum bruken, man bi nich liek Datum bineer verglieken (nich seker)" - -#. +> trunk -#: optiondialog.cpp:1185 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Dateien mit liek Ännerdatum un Längde as liek hanteren.\n" -"Is de Grött liek, man dat Datum nich, de Dateien bineer verglieken.\n" -"Goot bi groot Ornern oder binnen langsam Nettwarken." - -#. +> trunk -#: optiondialog.cpp:1190 -msgid "Trust the size (unsafe)" -msgstr "Grött bruken (nich seker)" - -#. +> trunk -#: optiondialog.cpp:1191 -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 "" -"Dateien mit liek Längde as liek hanteren.\n" -"Goot bi groot Ornern oder binnen langsam Nettwarken, wenn sik dat Datum bi't Daalladen ännert." - -#. +> trunk -#: optiondialog.cpp:1199 -msgid "Synchronize directories" -msgstr "Ornern synkroniseren" - -#. +> trunk -#: optiondialog.cpp:1202 -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 "" -"Dateien ut un na beed Ornern so koperen, dat\n" -"se achteran liek sünd.\n" -"Funkscheneert bloots bi't Verglieken vun twee Ornern, un wenn keen Teel angeven is." - -#. +> trunk -#: optiondialog.cpp:1208 -msgid "White space differences considered equal" -msgstr "Freeruum-Verschelen as liek hanteren" - -#. +> trunk -#: optiondialog.cpp:1211 -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Dateien as liek hanteren, wenn se bloots in de Freerüüm verscheden sünd.\n" -"Dit is bloots anmaakt, wenn Du \"Heel Dörkiek\" utsöcht hest." - -#. +> trunk -#: optiondialog.cpp:1217 -msgid "Copy newer instead of merging (unsafe)" -msgstr "Nieger Datei koperen, nich tosamenföhren (nich seker)" - -#. +> trunk -#: optiondialog.cpp:1220 -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 "" -"Inholt nich bekieken, eenfach de niegere Datei nehmen.\n" -"(Bruuk dit bloots, wenn Du nau weetst, wat Du dor deist!)\n" -"Funkscheneert bloots bi't Verglieken vun twee Ornern." - -#. +> trunk -#: optiondialog.cpp:1225 -msgid "Backup files (.orig)" -msgstr "Sekerheitkopie (.orig) opstellen" - -#. +> trunk -#: optiondialog.cpp:1228 -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Schull en Datei över en öller Datei schreven warrn, denn warrt de\n" -"öllere Datei ümnöömt un \".orig\" na ehr Naam anhangt." - -#. +> trunk -#: optiondialog.cpp:1301 optiondialog.cpp:1302 -msgid "Regional Settings" -msgstr "Regiooninstellen" - -#. +> trunk -#: optiondialog.cpp:1405 -msgid "Language (restart required)" -msgstr "Spraak (Niegstart nödig)" - -#. +> trunk -#: optiondialog.cpp:1448 -msgid "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." -msgstr "" -"Hier kannst Du de Spraak för de Böversiet utsöken, oder \"Auto\".\n" -"Ännerst Du de Spraak, muttst Du KDiff3 utmaken un nieg opropen, ehr de Ännern övernahmen warrt." - -#. +> trunk -#: optiondialog.cpp:1466 -msgid "Use the same encoding for everything:" -msgstr "De sülve Koderen för allens bruken:" - -#. +> trunk -#: optiondialog.cpp:1469 -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Is dit anmaakt, kannst Du all Koderen över de eerste ännern.\n" -"Maak dit ut, wenn verscheden Instellen för de Dateien nödig sünd." - -#. +> trunk -#: optiondialog.cpp:1474 -msgid "Note: Local Encoding is " -msgstr "Beacht: De lokale Koderen is " - -#. +> trunk -#: optiondialog.cpp:1478 -msgid "File Encoding for A:" -msgstr "Koderen för Datei A:" - -#. +> trunk -#: optiondialog.cpp:1484 -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Is dit anmaakt, warrt Unicode (UTF-8 oder UTF-16) as Koderen opdeckt.\n" -"Is de Datei nich in Unicode, warrt de utsöchte Koderen bruukt.\n" -"(Dat Opdecken vun Unicode hangt vun de eersten Bytes vun en Datei af.)" - -#. +> trunk -#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506 -msgid "Auto Detect Unicode" -msgstr "Unicode automaatsch opdecken" - -#. +> trunk -#: optiondialog.cpp:1493 -msgid "File Encoding for B:" -msgstr "Koderen för Datei B:" - -#. +> trunk -#: optiondialog.cpp:1502 -msgid "File Encoding for C:" -msgstr "Koderen för Datei C:" - -#. +> trunk -#: optiondialog.cpp:1511 -msgid "File Encoding for Merge Output and Saving:" -msgstr "Koderen för't Tosamenföhren un Sekern:" - -#. +> trunk -#: optiondialog.cpp:1515 -msgid "Auto Select" -msgstr "Autom. Köör" - -#. +> trunk -#: optiondialog.cpp:1518 -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Wenn anmaakt, warrt de Koderen vun de Ingaavdateien bruukt.\n" -"Is dat nich eenkennig, warrt de Bruker na de Koderen för't Sekern fraagt." - -#. +> trunk -#: optiondialog.cpp:1522 -msgid "File Encoding for Preprocessor Files:" -msgstr "Koderen för de Vörverarbeid-Dateien:" - -#. +> trunk -#: optiondialog.cpp:1533 -msgid "Right To Left Language" -msgstr "Rechts-Na-Links-Spraak" - -#. +> trunk -#: optiondialog.cpp:1536 -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"En Reeg Schriften warrt vun rechts na links leest.\n" -"Disse Optschoon passt dor de Ansicht un den Editor op to." - -#. +> trunk -#: optiondialog.cpp:1551 -msgid "Integration" -msgstr "Inbinnen" - -#. +> trunk -#: optiondialog.cpp:1552 -msgid "Integration Settings" -msgstr "Inbinnen instellen" - -#. +> trunk -#: optiondialog.cpp:1566 -msgid "Command line options to ignore:" -msgstr "Befehlsreeg-Optschonen, de övergahn warrt:" - -#. +> trunk -#: optiondialog.cpp:1571 -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"List vun Befehlsreeg-Optschonen, de övergahn warrt, wenn anner Programmen KDiff3 oproopt.\n" -"Du kannst mehr Weerten angeven, wenn dor twischen en \";\" steiht.\n" -"Dit verhöödt den \"Nich begäng Optschoon\"-Fehler." - -#. +> trunk -#: optiondialog.cpp:1578 -msgid "Quit also via Escape key" -msgstr "Ok mit ESC-Tast utmaken" - -#. +> trunk -#: optiondialog.cpp:1581 -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Gau Metood för't Utmaken.\n" -"För de Lüüd, de de ESC-Tast anworrn sünd." - -#. +> trunk -#: optiondialog.cpp:1586 -msgid "Integrate with ClearCase" -msgstr "Na \"ClearCase\" inbinnen" - -#. +> trunk -#: optiondialog.cpp:1589 -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"Na \"Rational ClearCase\" vun IBM inbinnen.\n" -"Ännert de Datei \"map\" binnen den ClearCase-Ünnerorner \"lib/mgrs\".\n" -"(Funkscheneert bloots, wenn sik de ClearCase-Orner \"bin\" över de PATH-Ümgevenvariabel finnen lett.)" - -#. +> trunk -#: optiondialog.cpp:1595 -msgid "Remove ClearCase Integration" -msgstr "Inbinnen na ClearCase lösen" - -#. +> trunk -#: optiondialog.cpp:1598 -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "De ole \"map\"-Datei ut de Tiet vör't Inbinnen na ClearCase wedderherstellen" - -#. +> trunk -#: optiondialog.cpp:1683 -msgid "Incompatible Font" -msgstr "Inkompatibel Schriftoort" - -#. +> trunk -#: optiondialog.cpp:1684 -msgid "Continue at Own Risk" -msgstr "Op egen Riskanz wiedermaken" - -#. +> trunk -#: optiondialog.cpp:1685 -msgid "Select Another Font" -msgstr "Anner Schriftoort utsöken" - -#. +> trunk -#: optiondialog.cpp:1720 -msgid "This resets all options. Not only those of the current topic." -msgstr "Disse Funkschoon sett all Optschonen torüch, nich bloots de för't aktuelle Thema." - -#. +> trunk -#: pdiff.cpp:260 -msgid "PreprocessorCmd: " -msgstr "Vörverarbeid-Befehl: " - -#. +> trunk -#: pdiff.cpp:265 -msgid "The following option(s) you selected might change data:\n" -msgstr "Disse vun Di utsöchten Optschonen köönt Daten ännern:\n" - -#. +> trunk -#: pdiff.cpp:266 -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Dat will Een normalerwies bi't Tosamenföhren nich hebben.\n" -"Wullt Du disse Instellen ut- oder dor mit wiedermaken?" - -#. +> trunk -#: pdiff.cpp:268 -msgid "Option Unsafe for Merging" -msgstr "Optschoon för't Tosamenföhren nich seker" - -#. +> trunk -#: pdiff.cpp:269 -msgid "Use These Options During Merge" -msgstr "Disse Optschonen bruken" - -#. +> trunk -#: pdiff.cpp:270 -msgid "Disable Unsafe Options" -msgstr "Nich seker Optschonen utmaken" - -#. +> trunk -#: pdiff.cpp:300 -msgid "Loading A" -msgstr "A warrt laadt" - -#. +> trunk -#: pdiff.cpp:304 -msgid "Loading B" -msgstr "B warrt laadt" - -#. +> trunk -#: pdiff.cpp:321 pdiff.cpp:347 -msgid "Diff: A <-> B" -msgstr "Verscheel: A <-> B" - -#. +> trunk -#: pdiff.cpp:327 pdiff.cpp:372 -msgid "Linediff: A <-> B" -msgstr "Reegverscheel: A <-> B" - -#. +> trunk -#: pdiff.cpp:338 -msgid "Loading C" -msgstr "C warrt laadt" - -#. +> trunk -#: pdiff.cpp:350 -msgid "Diff: B <-> C" -msgstr "Verscheel: B <-> C" - -#. +> trunk -#: pdiff.cpp:353 -msgid "Diff: A <-> C" -msgstr "Verscheel: A <-> C" - -#. +> trunk -#: pdiff.cpp:375 -msgid "Linediff: B <-> C" -msgstr "Reegverscheel: B <-> C" - -#. +> trunk -#: pdiff.cpp:378 -msgid "Linediff: A <-> C" -msgstr "Reegverscheel: A <-> C" - -#. +> trunk -#: pdiff.cpp:534 -msgid "All input files contain the same text, but are not binary equal." -msgstr "All Ingaavdateien bargt den sülven Text, man sünd bineer nich liek." - -#. +> trunk -#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "De Dateien %1 un %2 bargt den sülven Text, man sünd bineer nich liek.\n" - -#. +> trunk -#: pdiff.cpp:551 -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 "" -"As't lett sünd nich all Ingaavdateien reen Textdateien.\n" -"Beacht, KDiff3 is nich för't Tosamenföhren vun Bineerdaten maakt.\n" -"Maak man op Dien egen Riskanz wieder." - -#. +> trunk -#: pdiff.cpp:566 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Don't save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"En Reeg vun Tekens laat sik nich na gellen Unikode wanneln.\n" -"Villicht is Dien bruukt Koderen nich richtig, (a.B. UTF-8 för Dateien in en anner Koderen as UTF-8).\n" -"Büst Du nich seker, denn spieker dat Resultaat beter nich af. Du kannst op Dien egen Riskanz wiedermaken.\n" -"De bedrapen Ingaavdateien liggt in %1." - -#. +> trunk -#: pdiff.cpp:1080 -msgid "Abort" -msgstr "Afbreken" - -#. +> trunk -#: pdiff.cpp:1087 pdiff.cpp:1175 -msgid "Opening files..." -msgstr "Dateien warrt opmaakt..." - -#. +> trunk -#: pdiff.cpp:1152 pdiff.cpp:1223 -msgid "File open error" -msgstr "Fehler bi't Datei-Opmaken" - -#. +> trunk -#: pdiff.cpp:1255 -msgid "Cutting selection..." -msgstr "Köör warrt knippt..." - -#. +> trunk -#: pdiff.cpp:1276 -msgid "Copying selection to clipboard..." -msgstr "Köör warrt na de Twischenaflaag kopeert..." - -#. +> trunk -#: pdiff.cpp:1292 -msgid "Inserting clipboard contents..." -msgstr "Twischenaflaag-Inholt warrt inföögt..." - -#. +> trunk -#: pdiff.cpp:1814 -msgid "Save && Continue" -msgstr "Sekern un wiedermaken" - -#. +> trunk -#: pdiff.cpp:1815 -msgid "Continue Without Saving" -msgstr "Ahn Sekern wiedermaken" - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search complete." -msgstr "Söök afslaten." - -#. +> trunk -#: pdiff.cpp:2018 -msgid "Search Complete" -msgstr "Söök afslaten" - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Nothing is selected in either diff input window." -msgstr "Binnen keen Verscheel-Ingaavfinster is wat utsöcht." - -#. +> trunk -#: pdiff.cpp:2252 -msgid "Error while adding manual diff range" -msgstr "Fehler bi't Tofögen vun en Verscheelrebeet vun Hand" - -#. +> trunk -#: smalldialogs.cpp:58 -msgid "A (Base):" -msgstr "A (Basis):" - -#. +> trunk -#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 -#: smalldialogs.cpp:142 -msgid "File..." -msgstr "Datei..." - -#. +> trunk -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:144 -msgid "Dir..." -msgstr "Orner..." - -#. +> trunk -#: smalldialogs.cpp:93 -msgid "C (Optional):" -msgstr "C (köörwies):" - -#. +> trunk -#: smalldialogs.cpp:116 -msgid "Swap/Copy Names ..." -msgstr "Naams tuschen/koperen..." - -#. +> trunk -#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 -#, kde-format -msgid "Swap %1<->%2" -msgstr "%1<->%2 tuschen" - -#. +> trunk -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 -#, kde-format -msgid "Copy %1->Output" -msgstr "%1 -> Utgaav koperen" - -#. +> trunk -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 -#, kde-format -msgid "Swap %1<->Output" -msgstr "%1 <-> Utgaav tuschen" - -#. +> trunk -#: smalldialogs.cpp:136 -msgid "Output (optional):" -msgstr "Utgaav (köörwies):" - -#. +> trunk -#: smalldialogs.cpp:168 -msgid "Configure..." -msgstr "Instellen..." - -#. +> trunk -#: smalldialogs.cpp:174 -msgid "&OK" -msgstr "&OK" - -#. +> trunk -#: smalldialogs.cpp:362 -msgid "Search text:" -msgstr "Sööktext:" - -#. +> trunk -#: smalldialogs.cpp:369 -msgid "Case sensitive" -msgstr "Op Groot-/Lüttschrieven kieken" - -#. +> trunk -#: smalldialogs.cpp:372 -msgid "Search A" -msgstr "A dörkieken" - -#. +> trunk -#: smalldialogs.cpp:377 -msgid "Search B" -msgstr "B dörkieken" - -#. +> trunk -#: smalldialogs.cpp:382 -msgid "Search C" -msgstr "C dörkieken" - -#. +> trunk -#: smalldialogs.cpp:387 -msgid "Search output" -msgstr "Utgaav dörkieken" - -#. +> trunk -#: smalldialogs.cpp:392 -msgid "&Search" -msgstr "&Söken" - -#. +> trunk -#: smalldialogs.cpp:409 -msgid "Regular Expression Tester" -msgstr "Reguleer Utdrück utproberen" - -#. +> trunk -#: smalldialogs.cpp:422 -msgid "Example auto merge line:" -msgstr "Bispillreeg för't autom. Tosamenföhren:" - -#. +> trunk -#: smalldialogs.cpp:424 -msgid "To test auto merge, copy a line as used in your files." -msgstr "Kopeer en Reeg, as se binnen Dien Dateien vörkamen kann, wenn Du dat autom. Tosamenföhren utproberen wullt." - -#. +> trunk -#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494 -msgid "Match result:" -msgstr "Passen Resultaat:" - -#. +> trunk -#: smalldialogs.cpp:449 -msgid "Example history start line (with leading comment):" -msgstr "Bispillreeg för en Vörgeschicht-Anfang (mit vöranstellt Kommentar):" - -#. +> trunk -#: smalldialogs.cpp:451 -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" -"Kopeer en Vörgeschicht-Anfangreeg, as se binnen\n" -"Dien Dateien vörkamen kann, un ok den vöranstellten\n" -"Kommentar." - -#. +> trunk -#: smalldialogs.cpp:477 -msgid "History sort key order:" -msgstr "Vörgeschicht-Sorteerreeg:" - -#. +> trunk -#: smalldialogs.cpp:485 -msgid "Example history entry start line (without leading comment):" -msgstr "Bispillreeg för en Vörgeschichtindrag-Anfang (ahn vöranstellt Kommentar):" - -#. +> trunk -#: smalldialogs.cpp:487 -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" -"Kopeer en Vörgeschichtindrag-Anfangreeg, as se\n" -"binnen Dien Dateien vörkamen kann, man nich den\n" -"vöranstellten Kommentar." - -#. +> trunk -#: smalldialogs.cpp:501 -msgid "Sort key result:" -msgstr "Sorteerresultaat:" - -#. +> trunk -#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583 -msgid "Match success." -msgstr "Dreper funnen." - -#. +> trunk -#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589 -msgid "Match failed." -msgstr "Keen Dreper funnen." - -#. +> trunk -#: smalldialogs.cpp:574 -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Binnen den reguleren Utdruck passt de linken un rechten Klemmen nich tosamen." - -#~ msgid "Ok" -#~ msgstr "OK" - -#, fuzzy -#~| msgid "&Window" -#~ msgid "Dos/Windows" -#~ msgstr "&Finster" - -#, fuzzy -#~| msgid "Auto Select" -#~ msgid "Autodetect" -#~ msgstr "Autom. Köör" - -#~ msgid "Directory Merge" -#~ msgstr "Orner-Tosamenföhren" - -#~ msgid "C&ontinue" -#~ msgstr "Wieder&maken" Index: trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,59 +0,0 @@ -# Sönke Dibbern , 2007, 2008. -# Manfred Wiese , 2011. -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-07-26 09:01+0200\n" -"PO-Revision-Date: 2011-05-07 06:16+0200\n" -"Last-Translator: Manfred Wiese \n" -"Language-Team: Low Saxon \n" -"Language: nds\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:4 -#: kdiff3plugin/kdiff3plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "Verglieken Tosamenföhren vun Dateien/Ornern mit KDiff3" - -#. +> trunk -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.desktop:51 -msgctxt "X-KDE-Submenu" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: kdiff3plugin/kdiff3_plugin.desktop:4 -msgctxt "Name" -msgid "Compare/Merge Files/Directories" -msgstr "Verglieken/Tosamenföhren Dateien Ornern" - -#. +> trunk -#: src/kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk -#: src/kdiff3.desktop:52 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Böversiet för \"diff\" un \"patch\"" - -#. +> trunk -#: src/kdiff3.desktop:105 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "En Warktüüch för't Verglieken un Tosamenföhren vun Dateien un Ornern" - -#. +> trunk -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" Index: trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/nds/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,103 +0,0 @@ -# translation of kdiff3fileitemactionplugin.po to Low Saxon -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Manfred Wiese , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2011-08-02 08:55+0200\n" -"PO-Revision-Date: 2011-09-21 07:00+0200\n" -"Last-Translator: Manfred Wiese \n" -"Language-Team: Low Saxon \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: nds\n" - -#. +> trunk -#: kdiff3fileitemaction.cpp:94 -msgid "KDiff3 ..." -msgstr "KDiff3…" - -#. +> trunk -#: kdiff3fileitemaction.cpp:125 -#, kde-format -msgid "Compare with %1" -msgstr "Mit \"%1\" verglieken" - -#. +> trunk -#: kdiff3fileitemaction.cpp:131 -#, kde-format -msgid "Merge with %1" -msgstr "Mit \"%1\" tosamenföhren" - -#. +> trunk -#: kdiff3fileitemaction.cpp:137 -#, kde-format -msgid "Save '%1' for later" -msgstr "\"%1\" för later sekern" - -#. +> trunk -#: kdiff3fileitemaction.cpp:143 -msgid "3-way merge with base" -msgstr "3-Weeg-Tosamenföhren mit Grundlaag" - -#. +> trunk -#: kdiff3fileitemaction.cpp:150 -msgid "Compare with ..." -msgstr "Verglieken mit..." - -#. +> trunk -#: kdiff3fileitemaction.cpp:162 -msgid "Clear list" -msgstr "List leddig maken" - -#. +> trunk -#: kdiff3fileitemaction.cpp:170 -msgid "Compare" -msgstr "Verglieken" - -#. +> trunk -#: kdiff3fileitemaction.cpp:176 -msgid "3 way comparison" -msgstr "3-Weeg-Verglieken" - -#. +> trunk -#: kdiff3fileitemaction.cpp:180 -msgid "About KDiff3 menu plugin ..." -msgstr "Över dat KDiff3-Menümoduul…" - -#. +> trunk -#: kdiff3fileitemaction.cpp:284 -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"KDiff3-Dateiindrag-Akschonenmoduul. Copyright © 2011 Joachim Eibl\n" -"KDiff3-Tohuussiet: http://kdiff3.sourceforge.net\n" -"\n" - -#. +> trunk -#: kdiff3fileitemaction.cpp:286 -msgid "" -"Using the contextmenu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"De Rechtsklickmenü-Verwiedern bruken:\n" -"Twee utsöcht Dateien laat sik eenfach mit »Verglieken« verglieken.\n" -"Is de anner Datei an en anner Steed, »Seker« de eerste Datei »för later«, se dukt denn in't Ünnermenü »Verglieken mit...« op, dat Du för de twete Datei opröppst.\n" -"Wullt Du Dateien tosamenföhren, »seker« toeerst de Grunddatei, denn den Telg, den Du tosamenföhren wullt, un för de drüdde Datei bruukst Du »3-Weeg-Tosamenföhren mit Grundlaag«, se warrt denn dat Teel.\n" -"Dat sülve gellt ok för't Verglieken un Tosamenföhren vun Ornern." - -#. +> trunk -#: kdiff3fileitemaction.cpp:294 -msgid "About KDiff3 File Item Action Plugin" -msgstr "Över dat KDiff3-Dateiindrag-Akschonenmoduul…" Index: trunk/l10n-support/nn/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nn/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/nn/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,45 @@ +# Translation of kdiff3._desktop_ to Norwegian Nynorsk +# +# Eirik U. Birkeland , 2008. +# Karl Ove Hufthammer , 2008, 2016. +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2016-11-19 18:44+0100\n" +"Last-Translator: Karl Ove Hufthammer \n" +"Language-Team: Norwegian Nynorsk \n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 2.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Motor for diff- og patch-filer" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Eit program for samanlikning og fletting av filer og mapper" Index: trunk/l10n-support/nn/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/nn/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/nn/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,3944 @@ +# Translation of kdiff3 to Norwegian Nynorsk +# +msgid "" +msgstr "" +"Project-Id-Version: KDE 4\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-08-07 09:31+0200\n" +"PO-Revision-Date: 2008-11-26 17:46+0100\n" +"Last-Translator: Karl Ove Hufthammer \n" +"Language-Team: Norwegian Nynorsk \n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#. +> trunk5 +#, fuzzy, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Karl Ove Hufthammer" + +#. +> trunk5 +#, fuzzy, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "karl@huftis.org" + +#. +> trunk5 +#: diff.cpp:258 +#, fuzzy, kde-format +#| msgid "Printing to file failed" +msgid "Writing clipboard data to temp file failed." +msgstr "Klarte ikkje skriva ut til fil" + +#. +> trunk5 +#: diff.cpp:262 +#, fuzzy, kde-format +#| msgctxt "@title:menu create a new document from data in the the clipboard" +#| msgid "From Clipboard" +msgid "From Clipboard" +msgstr "&Kopier til utklippstavla" + +#. +> trunk5 +#: diff.cpp:563 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "" + +#. +> trunk5 +#: diff.cpp:566 +#, kde-format +msgid "Not matching apostrophs." +msgstr "" + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "" + +#. +> trunk5 +#: diff.cpp:595 +#, fuzzy, kde-format +#| msgid "No program defined" +msgid "No program specified." +msgstr "Inkje program definert" + +#. +> trunk5 +#: diff.cpp:710 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" + +#. +> trunk5 +#: diff.cpp:757 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" + +#. +> trunk5 +#: diff.cpp:784 +#, kde-format +msgid "File %1 too large to process. Skipping." +msgstr "" + +#. +> trunk5 +#: difftextwindow.cpp:414 +#, fuzzy, kde-format +msgid "File %1: Line %2" +msgstr "ikkje tilgjengeleg" + +#. +> trunk5 +#: difftextwindow.cpp:416 +#, fuzzy, kde-format +msgid "File %1: Line not available" +msgstr "ikkje tilgjengeleg" + +#. +> trunk5 +#: difftextwindow.cpp:1828 +#, fuzzy, kde-format +msgid "Encoding:" +msgstr "Teiknkoding:" + +#. +> trunk5 +#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 +#, fuzzy, kde-format +#| msgid "Line style:" +msgid "Line end style:" +msgstr "Linjestil:" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 +#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 +#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 +#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 +#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 +#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 +#: smalldialogs.cpp:126 smalldialogs.cpp:129 +#, fuzzy, kde-format +msgid "A" +msgstr "A" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 +#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 +#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 +#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 +#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 +#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 +#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 +#: smalldialogs.cpp:127 smalldialogs.cpp:130 +#, fuzzy, kde-format +msgid "B" +msgstr "B" + +#. +> trunk5 +#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 +#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 +#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 +#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 +#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 +#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 +#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 +#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 +#: smalldialogs.cpp:131 +#, fuzzy, kde-format +msgid "C" +msgstr "C" + +#. +> trunk5 +#: difftextwindow.cpp:1858 +#, fuzzy, kde-format +#| msgid "Base" +msgid "A (Base)" +msgstr "Base" + +#. +> trunk5 +#: difftextwindow.cpp:1860 +#, fuzzy, kde-format +msgid "Encoding: %1" +msgstr "Teiknkoding:" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 +#, fuzzy, kde-format +msgid "Unix" +msgstr "Unix" + +#. +> trunk5 +#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 +#, fuzzy, kde-format +msgid "DOS" +msgstr "DOS" + +#. +> trunk5 +#: difftextwindow.cpp:1861 +#, fuzzy, kde-format +#| msgid "Line style:" +msgid "Line end style: %1" +msgstr "Linjestil:" + +#. +> trunk5 +#: difftextwindow.cpp:1883 kdiff3.cpp:869 +#, fuzzy, kde-format +#| msgid " line" +#| msgid_plural " lines" +msgid "Top line" +msgstr " linje" + +#. +> trunk5 +#: difftextwindow.cpp:1893 +#, fuzzy, kde-format +msgid "End" +msgstr "End" + +#. +> trunk5 +#: difftextwindow.cpp:1968 smalldialogs.cpp:234 +#, kde-format +msgid "Open File" +msgstr "Opna fil" + +#. +> trunk5 +#: difftextwindow.cpp:2016 optiondialog.cpp:508 +#, fuzzy, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode" + +#. +> trunk5 +#: difftextwindow.cpp:2031 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Other" +msgid "Other" +msgstr "Anna" + +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, fuzzy, kde-format +#| msgctxt "board solved" +#| msgid "Solved" +msgid "Solved" +msgstr "Løyst" + +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, fuzzy, kde-format +#| msgid "white" +msgid "Nonwhite" +msgstr "kvit" + +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, fuzzy, kde-format +msgid "White" +msgstr "Kvit" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 +#, fuzzy, kde-format +#| msgid "Copy to %1" +msgid "Copy A to B" +msgstr "Kopier til %1" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 +#, fuzzy, kde-format +#| msgid "Copy to %1" +msgid "Copy B to A" +msgstr "Kopier til %1" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 +#, fuzzy, kde-format +#| msgid "Delete All" +msgid "Delete A" +msgstr "Slett alle" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 +#, fuzzy, kde-format +#| msgctxt "@item:inmenu undo delete" +#| msgid "Delete" +msgid "Delete B" +msgstr "Slett" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, fuzzy, kde-format +#| msgid "Delete A&ll" +msgid "Delete A & B" +msgstr "Slett a&lle" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 +#, fuzzy, kde-format +#| msgid "Merge into ODF" +msgid "Merge to A" +msgstr "Flett saman til ODF" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 +#, fuzzy, kde-format +#| msgid "Merge into ODF" +msgid "Merge to B" +msgstr "Flett saman til ODF" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 +#, fuzzy, kde-format +#| msgid "Delete List" +msgid "Delete (if exists)" +msgstr "Slett liste" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 +#, fuzzy, kde-format +msgid "Merge" +msgstr "Slå saman" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, fuzzy, kde-format +#| msgid "Error Deleting Files" +msgid "Error: Conflicting File Types" +msgstr "Feil ved sletting av lag" + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgctxt "@title:window" +#| msgid "Done" +msgid "Done" +msgstr "Fullført" + +#. +> trunk5 +#: directorymergewindow.cpp:606 +#, fuzzy, kde-format +msgid "Error" +msgstr "Feil" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, fuzzy, kde-format +#| msgid "Skipped" +msgid "Skipped." +msgstr "Hoppa over" + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, fuzzy, kde-format +#| msgid "In progress" +msgid "In progress..." +msgstr "I gang" + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, fuzzy, kde-format +msgid "Name" +msgstr "Namn" + +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, fuzzy, kde-format +msgid "Operation" +msgstr "Handling" + +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, fuzzy, kde-format +msgid "Status" +msgstr "Status" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, fuzzy, kde-format +msgid "Link: " +msgstr "Lenkje: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, fuzzy, kde-format +msgid "Error reading from %1" +msgstr "Feil ved lesing frå «%1»" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 +#, fuzzy, kde-format +msgid "Warning" +msgstr "Åtvaring" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 +#, fuzzy, kde-format +msgid "Rescan" +msgstr "Sjekk på nytt" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1030 +#, kde-format +msgid "Continue Merging" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, fuzzy, kde-format +#| msgid "Opening file failed." +msgid "Opening of directories failed:" +msgstr "Klarte ikkje opna fila." + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, fuzzy, kde-format +#| msgid "Print Warning" +msgid "Parameter Warning" +msgstr "Utskriftsåtvaring" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, fuzzy, kde-format +msgid "Scanning directories..." +msgstr "Ser gjennom mappa %1 …" + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 +#: pdiff.cpp:1226 pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 +#, fuzzy, kde-format +msgid "Ready." +msgstr "Klar." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1299 +#, fuzzy, kde-format +#| msgid "Number of nucleons: %1" +msgid "Number of manual merges: %1" +msgstr "Tal på nukleon: %1" + +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "This affects all merge operations." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:1492 +#, fuzzy, kde-format +#| msgid "File Operations" +msgid "Changing All Merge Operations" +msgstr "Filoperasjonar" + +#. +> trunk5 +#: directorymergewindow.cpp:1888 +#, fuzzy, kde-format +#| msgctxt "Job state" +#| msgid "Processing" +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "Handsamar" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 +#, kde-format +msgid "This operation is currently not possible." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 +#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 +#, fuzzy, kde-format +#| msgid "Certification Not Possible" +msgid "Operation Not Possible" +msgstr "Sertifisering ikkje mogleg" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 +#, fuzzy, kde-format +#| msgid "An error occurred while accessing '%1'" +msgid "An error occurred while copying." +msgstr "Det oppstod ein feil ved forsøk på tilgang til «%1»" + +#. +> trunk5 +#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 +#, kde-format +msgid "Merge Error" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2639 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2684 +#, fuzzy, kde-format +#| msgid "Unknown location" +msgid "Unknown merge operation." +msgstr "Ukjend plassering" + +#. +> trunk5 +#: directorymergewindow.cpp:2697 +#, kde-format +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 "" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Starting Merge" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, fuzzy, kde-format +msgid "Do It" +msgstr "Gjer det" + +#. +> trunk5 +#: directorymergewindow.cpp:2704 +#, fuzzy, kde-format +#| msgid "Simulate" +msgid "Simulate It" +msgstr "Simuler" + +#. +> trunk5 +#: directorymergewindow.cpp:2730 +#, kde-format +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2734 +#, kde-format +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2738 +#, kde-format +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2795 +#, kde-format +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:2853 +#, kde-format +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 "" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, fuzzy, kde-format +#| msgid "Continue on error." +msgid "Continue merge after an error" +msgstr "Hald fram med feil." + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, fuzzy, kde-format +#| msgid "Continue in Same" +msgid "Continue With Last Item" +msgstr "Hald fram i same" + +#. +> trunk5 +#: directorymergewindow.cpp:2857 +#, fuzzy, kde-format +#| msgid " Item" +#| msgid_plural " Items" +msgid "Skip Item" +msgstr " mediefiler" + +#. +> trunk5 +#: directorymergewindow.cpp:2953 +#, fuzzy, kde-format +#| msgctxt "@info:status" +#| msgid "Move operation completed." +msgid "Merge operation complete." +msgstr "Flyttinga er fullført." + +#. +> trunk5 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 +#, fuzzy, kde-format +#| msgid "Charge Complete" +msgid "Merge Complete" +msgstr "Fullført lading" + +#. +> trunk5 +#: directorymergewindow.cpp:2966 +#, kde-format +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3002 +#, kde-format +msgid "An error occurred. Press OK to see detailed information." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3035 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3042 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "delete( %1 )" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3059 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3078 +#, fuzzy, kde-format +#| msgid "Operation failed." +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Operasjonen mislukkast." + +#. +> trunk5 +#: directorymergewindow.cpp:3088 +#, fuzzy, kde-format +#| msgid "The requested operation has failed." +msgid "Error: delete operation failed." +msgstr "Klarte ikkje utføra den førespurde operasjonen." + +#. +> trunk5 +#: directorymergewindow.cpp:3114 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3117 +#, kde-format +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3142 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3151 +#, fuzzy, kde-format +#| msgid " %1 - %2 " +msgid "copyLink( %1 -> %2 )" +msgstr " %1 – %2 " + +#. +> trunk5 +#: directorymergewindow.cpp:3162 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3168 +#, kde-format +msgid "Error: copyLink failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3193 +#, fuzzy, kde-format +#| msgid " %1 - %2 " +msgid "copy( %1 -> %2 )" +msgstr " %1 – %2 " + +#. +> trunk5 +#: directorymergewindow.cpp:3219 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3226 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3235 +#, kde-format +msgid "Error: Rename failed." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3253 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3270 +#, kde-format +msgid "makeDir( %1 )" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3280 +#, kde-format +msgid "Error while creating directory." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 +#, kde-format +msgid "Dest" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 +#, fuzzy, kde-format +msgid "Dir" +msgstr "Emnekatalog" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, fuzzy, kde-format +msgid "Type" +msgstr "Type" + +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, fuzzy, kde-format +msgid "Size" +msgstr "Storleik" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, fuzzy, kde-format +msgid "Attr" +msgstr "Attributt" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, fuzzy, kde-format +msgid "Last Modification" +msgstr "Siste endring" + +#. +> trunk5 +#: directorymergewindow.cpp:3325 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Link Destination" +msgid "Link-Destination" +msgstr "Lenkjemål" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +msgid "File" +msgstr "Fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3354 +#, fuzzy, kde-format +#| msgid "Link" +msgid "-Link" +msgstr "Lenkje" + +#. +> trunk5 +#: directorymergewindow.cpp:3368 +#, fuzzy, kde-format +msgid "not available" +msgstr "ikkje tilgjengeleg" + +#. +> trunk5 +#: directorymergewindow.cpp:3386 +#, kde-format +msgid "A (Dest): " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3390 +#, kde-format +msgid "A (Base): " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3396 +#, kde-format +msgid "B (Dest): " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "C (Dest): " +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Dest: " +msgstr "" + +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3494 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, fuzzy, kde-format +msgid "Run Operation for Current Item" +msgstr "Konflikt" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, fuzzy, kde-format +#| msgid "Selected Files" +msgid "Compare Selected File" +msgstr "Valte filer" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, fuzzy, kde-format +#| msgid "Current File" +msgid "Merge Current File" +msgstr "Gjeldande fil" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, fuzzy, kde-format +msgid "" +"Merge\n" +"File" +msgstr "Slå saman" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, fuzzy, kde-format +#| msgid "Current Folder & All Subfolders" +msgid "Fold All Subdirs" +msgstr "Gjeldande mappe og alle undermapper" + +#. +> trunk5 +#: directorymergewindow.cpp:3635 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, fuzzy, kde-format +msgid "Choose A for All Items" +msgstr "Konflikt" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, fuzzy, kde-format +msgid "Choose B for All Items" +msgstr "Konflikt" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, fuzzy, kde-format +msgid "Choose C for All Items" +msgstr "Konflikt" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, fuzzy, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Konflikt" + +#. +> trunk5 +#: directorymergewindow.cpp:3643 +#, fuzzy, kde-format +msgid "No Operation for All Items" +msgstr "Konflikt" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, fuzzy, kde-format +#| msgid "Show Identities" +msgid "Show Identical Files" +msgstr "Vis identitetar" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, fuzzy, kde-format +#| msgid "Identities" +msgid "" +"Identical\n" +"Files" +msgstr "Identitetar" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, fuzzy, kde-format +#| msgid "Show Differences" +msgid "Show Different Files" +msgstr "Vis forskjellar" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in A" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in B" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "Show Files only in C" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3652 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3657 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 +#, fuzzy, kde-format +msgid "Do Nothing" +msgstr "Ikkje gjer noko" + +#. +> trunk5 +#: directorymergewindow.cpp:3671 +#, fuzzy, kde-format +#| msgid "Delete A&ll" +msgid "Delete A && B" +msgstr "Slett a&lle" + +#. +> trunk5 +#: directorymergewindow.cpp:3674 +#, kde-format +msgid "Merge to A && B" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:885 +#, kde-format +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:892 +#, kde-format +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:916 +#, fuzzy, kde-format +#| msgctxt "The role of the transaction, in present tense" +#| msgid "Getting file list" +msgid "Getting file status: %1" +msgstr "Hentar filoversikt" + +#. +> trunk5 +#: fileaccess.cpp:958 +#, kde-format +msgid "Reading file: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:996 +#, fuzzy, kde-format +#| msgid "Writing cue file to %1." +msgid "Writing file: %1" +msgstr "Skriv cue-fil til %1." + +#. +> trunk5 +#: fileaccess.cpp:1029 +#, fuzzy, kde-format +msgid "Out of memory" +msgstr "Ikkje nok minne" + +#. +> trunk5 +#: fileaccess.cpp:1064 +#, fuzzy, kde-format +#| msgid "Creating directory" +msgid "Making directory: %1" +msgstr "Lagar mappe" + +#. +> trunk5 +#: fileaccess.cpp:1084 +#, fuzzy, kde-format +#| msgid "Remove directory" +msgid "Removing directory: %1" +msgstr "Fjern mappe" + +#. +> trunk5 +#: fileaccess.cpp:1099 +#, fuzzy, kde-format +#| msgid "Removing Cue file %1" +msgid "Removing file: %1" +msgstr "Fjernar cue-fil %1" + +#. +> trunk5 +#: fileaccess.cpp:1115 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1143 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1175 +#, fuzzy, kde-format +#| msgid "" +msgid "Copying file: %1 -> %2" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1189 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1195 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1207 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1216 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "" + +#. +> trunk5 +#: fileaccess.cpp:1499 +#, fuzzy, kde-format +#| msgid "Creating directory" +msgid "Reading directory: %1" +msgstr "Lagar mappe" + +#. +> trunk5 +#: fileaccess.cpp:1618 +#, kde-format +msgid "Listing directory: %1" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, fuzzy, kde-format +#| msgid "Font Configuration" +msgid "Current Configuration:" +msgstr "Skriftoppsett" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:451 +#, fuzzy, kde-format +msgid "Saving failed." +msgstr "Lagrar fil …" + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 +#, fuzzy, kde-format +#| msgid "Opening file failed." +msgid "Opening of these files failed:" +msgstr "Klarte ikkje opna fila." + +#. +> trunk5 +#: kdiff3.cpp:495 +#, fuzzy, kde-format +#| msgid "File I/O Error" +msgid "File Open Error" +msgstr "Fil-I/U-feil" + +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:525 +#, fuzzy, kde-format +msgid "Reload" +msgstr "Last om att" + +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:530 +#, fuzzy, kde-format +#| msgid "Save the current document" +msgid "Saves the current document as..." +msgstr "Lagra dokumentet" + +#. +> trunk5 +#: kdiff3.cpp:533 +#, fuzzy, kde-format +#| msgid "%1 differences" +msgid "Print the differences" +msgstr "%1 skilnad(er)" + +#. +> trunk5 +#: kdiff3.cpp:536 +#, fuzzy, kde-format +msgid "Quits the application" +msgstr "Avsluttar programmet" + +#. +> trunk5 +#: kdiff3.cpp:538 +#, fuzzy, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Klipper ut den merkte delen til utklippstavla" + +#. +> trunk5 +#: kdiff3.cpp:540 +#, fuzzy, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Kopierer den merkte delen til utklippstavla" + +#. +> trunk5 +#: kdiff3.cpp:542 +#, fuzzy, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Limer innhaldet i utklippstavla til aktuell posisjon" + +#. +> trunk5 +#: kdiff3.cpp:544 +#, fuzzy, kde-format +#| msgid "Select the current day" +msgid "Select everything in current window" +msgstr "Hopp til dagen i dag" + +#. +> trunk5 +#: kdiff3.cpp:546 +#, fuzzy, kde-format +#| msgid "Search for User" +msgid "Search for a string" +msgstr "Søk etter brukar" + +#. +> trunk5 +#: kdiff3.cpp:548 +#, fuzzy, kde-format +#| msgid "Search for User" +msgid "Search again for the string" +msgstr "Søk etter brukar" + +#. +> trunk5 +#: kdiff3.cpp:553 +#, fuzzy, kde-format +msgid "Enables/disables the statusbar" +msgstr "Viser/gøymer statuslinja" + +#. +> trunk5 +#: kdiff3.cpp:557 +#, fuzzy, kde-format +#| msgid "Configure Kigo..." +msgid "Configure KDiff3..." +msgstr "Set opp Kigo …" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, fuzzy, kde-format +msgid "Go to Current Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, fuzzy, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, fuzzy, kde-format +msgid "Go to First Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, fuzzy, kde-format +msgid "" +"First\n" +"Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, fuzzy, kde-format +msgid "Go to Last Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, fuzzy, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, fuzzy, kde-format +#| msgid "&Go to Previous" +msgid "Go to Previous Delta" +msgstr "&Gå til førre" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, fuzzy, kde-format +#| msgctxt "greece_prefectures.kgm" +#| msgid "Preveza" +msgid "" +"Prev\n" +"Delta" +msgstr "Preveza" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, fuzzy, kde-format +msgid "Go to Next Delta" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, fuzzy, kde-format +msgid "Go to Previous Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, fuzzy, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, fuzzy, kde-format +msgid "Go to Next Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, fuzzy, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, fuzzy, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, fuzzy, kde-format +#| msgid "Resolved" +msgid "" +"Prev\n" +"Unsolved" +msgstr "Løyst" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, fuzzy, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, fuzzy, kde-format +#| msgid "Resolved" +msgid "" +"Next\n" +"Unsolved" +msgstr "Løyst" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, fuzzy, kde-format +#| msgid "Select &Line" +msgid "Select Line(s) From A" +msgstr "Vel &linje" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, fuzzy, kde-format +#| msgid "Choose" +msgid "" +"Choose\n" +"A" +msgstr "Vel" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, fuzzy, kde-format +#| msgid "Select &Line" +msgid "Select Line(s) From B" +msgstr "Vel &linje" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, fuzzy, kde-format +#| msgid "Choose" +msgid "" +"Choose\n" +"B" +msgstr "Vel" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, fuzzy, kde-format +#| msgid "Select &Line" +msgid "Select Line(s) From C" +msgstr "Vel &linje" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, fuzzy, kde-format +#| msgid "Choose" +msgid "" +"Choose\n" +"C" +msgstr "Vel" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, fuzzy, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, fuzzy, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "Autovalg" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Special Characters" +msgid "Show Space && Tabulator Characters" +msgstr "Spesialteikn" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Characters" +msgid "" +"White\n" +"Characters" +msgstr "Spesialteikn" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, fuzzy, kde-format +#| msgid "White Space" +msgid "Show White Space" +msgstr "Blankteikn" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, fuzzy, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, fuzzy, kde-format +#| msgid "Show &Line Numbers" +msgid "Show Line Numbers" +msgstr "Vis &linjenummer" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, fuzzy, kde-format +#| msgid "Line Numbers" +msgid "" +"Line\n" +"Numbers" +msgstr "Linjenummer" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, fuzzy, kde-format +#| msgid "They Are Everywhere!" +msgid "Choose A Everywhere" +msgstr "Dei er overalt!" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, fuzzy, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, fuzzy, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, fuzzy, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, fuzzy, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, fuzzy, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, fuzzy, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, fuzzy, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, fuzzy, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, fuzzy, kde-format +#| msgid "Regular Expression Editor" +msgid "Run Regular Expression Auto Merge" +msgstr "Redigeringsprogram for regulære uttrykk" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, fuzzy, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Konflikt" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, fuzzy, kde-format +#| msgid "Split Direction" +msgid "Split Diff At Selection" +msgstr "Del retning" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, fuzzy, kde-format +#| msgid "Parts Overview" +msgid "A vs. B Overview" +msgstr "Deloversikt" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, fuzzy, kde-format +#| msgid "Parts Overview" +msgid "A vs. C Overview" +msgstr "Deloversikt" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, fuzzy, kde-format +#| msgid "Parts Overview" +msgid "B vs. C Overview" +msgstr "Deloversikt" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, fuzzy, kde-format +#| msgid "Panel Alignment" +msgid "Add Manual Diff Alignment" +msgstr "Panelplassering" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, fuzzy, kde-format +#| msgid "Toggle Orientation" +msgid "Toggle Split Orientation" +msgstr "Ved retning" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, fuzzy, kde-format +#| msgid "Next Split View" +msgid "Dir && Text Split Screen View" +msgstr "Neste delte rute" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, fuzzy, kde-format +#| msgid "Open in &Text View" +msgid "Toggle Between Dir && Text View" +msgstr "Opna i skriftvisaren" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1928 +#, kde-format +msgid "The merge result has not been saved." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:694 +#, fuzzy, kde-format +#| msgid "Save &&& Exit" +msgid "Save && Quit" +msgstr "Lagra og &avslutt" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1939 +#, kde-format +msgid "Saving the merge result failed." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1027 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, fuzzy, kde-format +msgid "Saving file..." +msgstr "Lagrar fil …" + +#. +> trunk5 +#: kdiff3.cpp:754 +#, fuzzy, kde-format +msgid "Saving file with a new filename..." +msgstr "Lagrar fil med eit nytt filnamn …" + +#. +> trunk5 +#: kdiff3.cpp:756 +#, fuzzy, kde-format +msgid "Save As..." +msgstr "Lagra som …" + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:853 +#, fuzzy, kde-format +msgid "Printing..." +msgstr "Skriv ut …" + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, fuzzy, kde-format +msgid " (Selection)" +msgstr "Utval" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, fuzzy, kde-format +#| msgid "Printing Complete" +msgid "Printing completed." +msgstr "Utskrift fullført" + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, fuzzy, kde-format +#| msgid "Sending aborted." +msgid "Printing aborted." +msgstr "Sending avbroten." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, fuzzy, kde-format +msgid "Exiting..." +msgstr "Avsluttar …" + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, fuzzy, kde-format +msgid "Toggling toolbar..." +msgstr "Viser eller gøymer verktøylinja …" + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, fuzzy, kde-format +msgid "Toggle the statusbar..." +msgstr "Vis/gøym statuslinja …" + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgctxt "Name" +#| msgid "KDiff3Part" +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "Ein KPart for vising av SVG-bilete" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "© 2007 Aurélien Gâteau " + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, kde-format +msgid "Could not find files for comparison." +msgstr "" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, fuzzy, kde-format +msgid "&KDiff3" +msgstr "KDiff3" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 main.cpp:113 +#, fuzzy, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 +#, fuzzy, kde-format +msgid "&File" +msgstr "&Fil" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 +#, fuzzy, kde-format +msgid "&Directory" +msgstr "&Mappe" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 +#, fuzzy, kde-format +#| msgctxt "MainWindow|" +#| msgid "Movement" +msgid "M&ovement" +msgstr "Forflytting" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 +#, fuzzy, kde-format +msgid "M&erge" +msgstr "Slå saman" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 +#, fuzzy, kde-format +msgid "&Window" +msgstr "&Vindauge" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, fuzzy, kde-format +msgid "Main Toolbar" +msgstr "Hovudverktøylinje" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, fuzzy, kde-format +#| msgid "User defined" +msgid "Ignored. (User defined.)" +msgstr "Brukardefinert" + +#. +> trunk5 +#: main.cpp:117 +#, fuzzy, kde-format +#| msgid "64 bit" +msgid " (64 bit)" +msgstr "64 bit" + +#. +> trunk5 +#: main.cpp:119 +#, fuzzy, kde-format +#| msgid "32 bit" +msgid " (32 bit)" +msgstr "32 bit" + +#. +> trunk5 +#: main.cpp:120 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "" + +#. +> trunk5 +#: main.cpp:121 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:140 +#, kde-format +msgid "Merge the input." +msgstr "" + +#. +> trunk5 +#: main.cpp:141 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" + +#. +> trunk5 +#: main.cpp:142 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" + +#. +> trunk5 +#: main.cpp:143 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" + +#. +> trunk5 +#: main.cpp:144 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" + +#. +> trunk5 +#: main.cpp:145 +#, kde-format +msgid "Do not solve conflicts automatically." +msgstr "" + +#. +> trunk5 +#: main.cpp:146 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "" + +#. +> trunk5 +#: main.cpp:147 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "" + +#. +> trunk5 +#: main.cpp:148 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "" + +#. +> trunk5 +#: main.cpp:149 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" + +#. +> trunk5 +#: main.cpp:150 +#, kde-format +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "" + +#. +> trunk5 +#: main.cpp:151 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "" + +#. +> trunk5 +#: main.cpp:152 +#, kde-format +msgid "Use a different config file." +msgstr "" + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "" + +#. +> trunk5 +#: main.cpp:156 +#, fuzzy, kde-format +#| msgid "file to open" +msgid "file2 to open" +msgstr "Fil som skal opnast" + +#. +> trunk5 +#: main.cpp:157 +#, fuzzy, kde-format +#| msgid "file to open" +msgid "file3 to open" +msgstr "Fil som skal opnast" + +#. +> trunk5 +#: main.cpp:168 +#, kde-format +msgid "See kdiff3 --help for supported options." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:158 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:339 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:903 pdiff.cpp:771 +#, kde-format +msgid "All input files are binary equal." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:905 +#, kde-format +msgid "All input files contain the same text." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 +#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 +#: mergeresultwindow.cpp:919 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:925 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:931 +#, fuzzy, kde-format +msgid "Conflicts" +msgstr "Konfliktar" + +#. +> trunk5 +#: mergeresultwindow.cpp:1840 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1848 +#, kde-format +msgid "" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 +#, fuzzy, kde-format +#| msgid "Key Conflict" +msgid "" +msgstr "Tastekonflikt" + +#. +> trunk5 +#: mergeresultwindow.cpp:2934 +#, kde-format +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 +#, fuzzy, kde-format +msgid "Conflicts Left" +msgstr "Konfliktar" + +#. +> trunk5 +#: mergeresultwindow.cpp:2943 +#, kde-format +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved." +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 +#, fuzzy, kde-format +#| msgid "Create backup files" +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "Lag reservekopi" + +#. +> trunk5 +#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 +#, fuzzy, kde-format +msgid "File Save Error" +msgstr "Feil ved fillagring" + +#. +> trunk5 +#: mergeresultwindow.cpp:3005 +#, fuzzy, kde-format +#| msgid "Error while searching." +msgid "Error while writing." +msgstr "Feil ved søk." + +#. +> trunk5 +#: mergeresultwindow.cpp:3365 +#, fuzzy, kde-format +msgid "Output:" +msgstr "Utdata" + +#. +> trunk5 +#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 +#, fuzzy, kde-format +#| msgid "Modified" +msgid "[Modified]" +msgstr "Endra" + +#. +> trunk5 +#: mergeresultwindow.cpp:3384 +#, kde-format +msgid "Encoding for saving:" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:3484 +#, fuzzy, kde-format +msgid "Conflict" +msgstr "Konflikt" + +#. +> trunk5 +#: mergeresultwindow.cpp:3516 +#, kde-format +msgid "Codec from A: %1" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:3518 +#, kde-format +msgid "Codec from B: %1" +msgstr "" + +#. +> trunk5 +#: mergeresultwindow.cpp:3520 +#, kde-format +msgid "Codec from C: %1" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, fuzzy, kde-format +#| msgid "Change Font..." +msgid "Change Font" +msgstr "Endra skrift …" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, fuzzy, kde-format +msgid "Unicode" +msgstr "Unicode" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, fuzzy, kde-format +msgid "Latin1" +msgstr "Latin1" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:613 +#, fuzzy, kde-format +msgid "Configure" +msgstr "Set opp" + +#. +> trunk5 +#: optiondialog.cpp:690 +#, fuzzy, kde-format +msgid "Font" +msgstr "Skrift" + +#. +> trunk5 +#: optiondialog.cpp:692 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:710 +#, fuzzy, kde-format +#| msgctxt "QShortcut" +#| msgid "Application Left" +msgid "Application font" +msgstr "Program venstre" + +#. +> trunk5 +#: optiondialog.cpp:714 +#, fuzzy, kde-format +msgid "File view font" +msgstr "Feil ved fillagring" + +#. +> trunk5 +#: optiondialog.cpp:732 +#, fuzzy, kde-format +msgid "Color" +msgstr "Farge" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, fuzzy, kde-format +#| msgid "Color Settings" +msgid "Colors Settings" +msgstr "Fargeinnstillingar" + +#. +> trunk5 +#: optiondialog.cpp:750 +#, fuzzy, kde-format +#| msgid "Editor View" +msgid "Editor and Diff Views:" +msgstr "Skrivevising" + +#. +> trunk5 +#: optiondialog.cpp:758 +#, fuzzy, kde-format +msgid "Foreground color:" +msgstr "Framgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:765 +#, fuzzy, kde-format +msgid "Background color:" +msgstr "Bakgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:774 +#, fuzzy, kde-format +#| msgid "&View background color:" +msgid "Diff background color:" +msgstr "&Vis bakgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:782 +#, fuzzy, kde-format +#| msgid "Color:" +msgid "Color A:" +msgstr "Farge:" + +#. +> trunk5 +#: optiondialog.cpp:790 +#, fuzzy, kde-format +#| msgid "Color:" +msgid "Color B:" +msgstr "Farge:" + +#. +> trunk5 +#: optiondialog.cpp:798 +#, fuzzy, kde-format +#| msgid "Color:" +msgid "Color C:" +msgstr "Farge:" + +#. +> trunk5 +#: optiondialog.cpp:805 +#, fuzzy, kde-format +#| msgid "Font color:" +msgid "Conflict color:" +msgstr "Skriftfarge:" + +#. +> trunk5 +#: optiondialog.cpp:813 +#, fuzzy, kde-format +#| msgid "Change &background color:" +msgid "Current range background color:" +msgstr "Endra &bakgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:821 +#, fuzzy, kde-format +#| msgid "Change &background color:" +msgid "Current range diff background color:" +msgstr "Endra &bakgrunnsfarge:" + +#. +> trunk5 +#: optiondialog.cpp:828 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:834 +#, kde-format +msgid "Directory Comparison View:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:840 +#, kde-format +msgid "Newest file color:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:844 +#, kde-format +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:849 +#, kde-format +msgid "Oldest file color:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:857 +#, kde-format +msgid "Middle age file color:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:865 +#, kde-format +msgid "Color for missing files:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:878 +#, fuzzy, kde-format +msgid "Editor" +msgstr "Redaktør" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor Behavior" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:892 +#, kde-format +msgid "Tab inserts spaces" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:895 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:900 +#, fuzzy, kde-format +#| msgid "&Tab size:" +msgid "Tab size:" +msgstr "&Tabulatorbreidd:" + +#. +> trunk5 +#: optiondialog.cpp:906 +#, fuzzy, kde-format +msgid "Auto indentation" +msgstr "Automatiske innrykk" + +#. +> trunk5 +#: optiondialog.cpp:909 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:912 +#, kde-format +msgid "Auto copy selection" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:915 +#, kde-format +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:929 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:939 +#, fuzzy, kde-format +msgid "Diff" +msgstr "Diff" + +#. +> trunk5 +#: optiondialog.cpp:940 +#, fuzzy, kde-format +msgid "Diff Settings" +msgstr "Innstillingar for diff" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:964 +#, kde-format +msgid "Ignore numbers (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:971 +#, kde-format +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:973 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:976 +#, kde-format +msgid "Ignore case (treat as white space)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:982 +#, fuzzy, kde-format +#| msgid "Precommand:" +msgid "Preprocessor command:" +msgstr "Førkommando:" + +#. +> trunk5 +#: optiondialog.cpp:986 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:993 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:996 +#, fuzzy, kde-format +#| msgid "Smooth (slower)" +msgid "Try hard (slower)" +msgstr "Jamn (tregare)" + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1003 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1018 +#, fuzzy, kde-format +#| msgid "MergeSettings" +msgid "Merge Settings" +msgstr "Fletteinnstillingar" + +#. +> trunk5 +#: optiondialog.cpp:1032 +#, fuzzy, kde-format +#| msgid "Autosave delay:" +msgid "Auto advance delay (ms):" +msgstr "Tid mellom autolagringar:" + +#. +> trunk5 +#: optiondialog.cpp:1037 +#, kde-format +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 "" + +#. +> trunk5 +#: optiondialog.cpp:1041 +#, kde-format +msgid "Show info dialogs" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1043 +#, fuzzy, kde-format +#| msgid "Show information about the selected contact" +msgid "Show a dialog with information about the number of conflicts." +msgstr "Vis informasjon om den valde kontakten" + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1050 optiondialog.cpp:1062 +#, kde-format +msgid "Manual Choice" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1054 optiondialog.cpp:1067 +#, kde-format +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1058 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1071 +#, fuzzy, kde-format +#| msgid "Matches Regular Expression" +msgid "Automatic Merge Regular Expression" +msgstr "Passar regulært uttrykk" + +#. +> trunk5 +#: optiondialog.cpp:1079 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1083 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1089 +#, fuzzy, kde-format +#| msgid "Regular expression to match: " +msgid "Run regular expression auto merge on merge start" +msgstr "Regulært uttrykk: " + +#. +> trunk5 +#: optiondialog.cpp:1091 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1096 +#, kde-format +msgid "Version Control History Merging" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1104 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1114 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1126 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1134 +#, kde-format +msgid "History merge sorting" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1136 +#, kde-format +msgid "Sort version control history by a key." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1146 +#, kde-format +msgid "History entry start sort key order:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1150 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1161 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1163 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1167 +#, fuzzy, kde-format +#| msgid "Maximum number of history items per view" +msgid "Max number of history entries:" +msgstr "Høgste tal på historikkelement per vising" + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1174 +#, fuzzy, kde-format +#| msgid "Use regular expressions" +msgid "Test your regular expressions" +msgstr "Bruk regulære uttrykk" + +#. +> trunk5 +#: optiondialog.cpp:1179 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1183 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1188 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1202 optiondialog.cpp:1203 +#, fuzzy, kde-format +msgid "Directory" +msgstr "Mappe" + +#. +> trunk5 +#: optiondialog.cpp:1215 +#, kde-format +msgid "Recursive directories" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1217 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1219 +#, kde-format +msgid "File pattern(s):" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1224 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1229 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1234 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1239 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1244 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1249 +#, fuzzy, kde-format +#| msgid "No ignore" +msgid "Use .cvsignore" +msgstr "Ikkje ignorer" + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1256 +#, fuzzy, kde-format +#| msgctxt "Name" +#| msgid "Files and Directories" +msgid "Find hidden files and directories" +msgstr "Filer og mapper" + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1261 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1265 +#, fuzzy, kde-format +#| msgid "Follow &links" +msgid "Follow file links" +msgstr "Følg &lenkjer" + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1272 +#, fuzzy, kde-format +#| msgid "Follow directory symlinks" +msgid "Follow directory links" +msgstr "Følg symbolske lenkjer til mapper" + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1290 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1297 +#, kde-format +msgid "Unfold all subdirectories on load" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1304 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1311 +#, kde-format +msgid "File Comparison Mode" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1316 +#, fuzzy, kde-format +#| msgid "3 way comparison" +msgid "Binary comparison" +msgstr "Samanlikning med tre filer" + +#. +> trunk5 +#: optiondialog.cpp:1317 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, fuzzy, kde-format +#| msgctxt "Content type" +#| msgid "Analysis" +msgid "Full analysis" +msgstr "Analyse" + +#. +> trunk5 +#: optiondialog.cpp:1321 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1325 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1326 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1331 +#, kde-format +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1332 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1337 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1338 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1345 +#, fuzzy, kde-format +msgid "Synchronize directories" +msgstr "Ser gjennom mappa %1 …" + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1354 +#, kde-format +msgid "White space differences considered equal" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1363 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1366 +#, kde-format +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1371 +#, fuzzy, kde-format +#| msgid "Backup files:" +msgid "Backup files (.orig)" +msgstr "Reservekopier filer:" + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1450 optiondialog.cpp:1451 +#, fuzzy, kde-format +msgid "Regional Settings" +msgstr "Språk og land" + +#. +> trunk5 +#: optiondialog.cpp:1465 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1468 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1472 +#, kde-format +msgid "Note: Local Encoding is \"%1\"" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1476 +#, kde-format +msgid "File Encoding for A:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1482 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1490 +#, kde-format +msgid "File Encoding for B:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1499 +#, kde-format +msgid "File Encoding for C:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1508 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1512 +#, fuzzy, kde-format +msgid "Auto Select" +msgstr "Autovalg" + +#. +> trunk5 +#: optiondialog.cpp:1515 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1518 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1529 +#, fuzzy, kde-format +#| msgid "Right to Left" +msgid "Right To Left Language" +msgstr "Høgre til venstre" + +#. +> trunk5 +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1542 +#, fuzzy, kde-format +#| msgctxt "integration of KGet with other applications" +#| msgid "Integration" +msgid "Integration" +msgstr "Integrering" + +#. +> trunk5 +#: optiondialog.cpp:1543 +#, fuzzy, kde-format +#| msgctxt "Title for settings page" +#| msgid "Plasma Integration Settings" +msgid "Integration Settings" +msgstr "Innstillingar for Plasma-integrering" + +#. +> trunk5 +#: optiondialog.cpp:1556 +#, kde-format +msgid "Command line options to ignore:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1561 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1566 +#, kde-format +msgid "Quit also via Escape key" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1569 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:87 pdiff.cpp:101 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, fuzzy, kde-format +#| msgctxt "Name" +#| msgid "Server Internal Error" +msgid "Severe Internal Error" +msgstr "Internfeil på tenaren" + +#. +> trunk5 +#: pdiff.cpp:131 +#, fuzzy, kde-format +#| msgid "Processor:" +#| msgid_plural "Processors:" +msgid "PreprocessorCmd: " +msgstr "Prosessor:" + +#. +> trunk5 +#: pdiff.cpp:136 +#, fuzzy, kde-format +#| msgid "" +#| "The following options are enabled:\n" +#| "\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "" +"Dei følgjande vala er på:\n" +"\n" + +#. +> trunk5 +#: pdiff.cpp:137 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:140 +#, kde-format +msgid "Use These Options During Merge" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:170 +#, fuzzy, kde-format +#| msgid "Loading: " +msgid "Loading A" +msgstr "Opnar: " + +#. +> trunk5 +#: pdiff.cpp:177 +#, kde-format +msgid "Errors occurred during pre-processing of file A." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:181 +#, fuzzy, kde-format +#| msgid "Loading: " +msgid "Loading B" +msgstr "Opnar: " + +#. +> trunk5 +#: pdiff.cpp:188 +#, kde-format +msgid "Errors occurred during pre-processing of file B." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:205 pdiff.cpp:239 +#, kde-format +msgid "Diff: A <-> B" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:212 pdiff.cpp:267 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:223 +#, fuzzy, kde-format +#| msgid "Loading: " +msgid "Loading C" +msgstr "Opnar: " + +#. +> trunk5 +#: pdiff.cpp:230 +#, kde-format +msgid "Errors occurred during pre-processing of file C." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:243 +#, kde-format +msgid "Diff: B <-> C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:247 +#, kde-format +msgid "Diff: A <-> C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:270 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:273 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:773 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:797 +#, kde-format +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:807 +#, fuzzy, kde-format +#| msgid ", " +msgid ", B" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:809 +#, fuzzy, kde-format +#| msgid ", " +msgid ", C" +msgstr ", " + +#. +> trunk5 +#: pdiff.cpp:811 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1029 +#, fuzzy, kde-format +msgid "Abort" +msgstr "Avbryt" + +#. +> trunk5 +#: pdiff.cpp:1035 pdiff.cpp:1123 +#, fuzzy, kde-format +msgid "Opening files..." +msgstr "Opnar filer …" + +#. +> trunk5 +#: pdiff.cpp:1100 pdiff.cpp:1171 +#, fuzzy, kde-format +#| msgid "FITS file open error: %1" +msgid "File open error" +msgstr "Feil ved opning av FITS-fil: %1" + +#. +> trunk5 +#: pdiff.cpp:1210 +#, fuzzy, kde-format +msgid "Cutting selection..." +msgstr "Klipper ut utvalet …" + +#. +> trunk5 +#: pdiff.cpp:1231 +#, fuzzy, kde-format +msgid "Copying selection to clipboard..." +msgstr "Kopierer utvalet til utklippstavla …" + +#. +> trunk5 +#: pdiff.cpp:1247 +#, fuzzy, kde-format +msgid "Inserting clipboard contents..." +msgstr "Set inn innhaldet av utklippstavla …" + +#. +> trunk5 +#: pdiff.cpp:1718 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1719 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1930 +#, fuzzy, kde-format +#| msgid "Save && C&onnect" +msgid "Save && Continue" +msgstr "Lagra og &kopla til" + +#. +> trunk5 +#: pdiff.cpp:1931 +#, fuzzy, kde-format +#| msgctxt "QDialogButtonBox" +#| msgid "Close without Saving" +msgid "Continue Without Saving" +msgstr "Lukk utan å lagra" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, fuzzy, kde-format +#| msgid "Search Scope" +msgid "Search complete." +msgstr "Søkjeområde" + +#. +> trunk5 +#: pdiff.cpp:2143 +#, kde-format +msgid "Search Complete" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:2410 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, fuzzy, kde-format +msgid "&Cancel" +msgstr "&Avbryt" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, fuzzy, kde-format +#| msgid "Base" +msgid "A (Base):" +msgstr "Base" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, fuzzy, kde-format +msgid "File..." +msgstr "Fil …" + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, fuzzy, kde-format +msgid "Dir..." +msgstr "Emnekatalog" + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, fuzzy, kde-format +#| msgid "(optional)" +msgid "C (Optional):" +msgstr "(valfritt)" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, kde-format +msgid "Swap/Copy Names..." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, fuzzy, kde-format +#| msgid "Show Output" +msgid "Swap %1<->Output" +msgstr "Vis logg" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, fuzzy, kde-format +#| msgid "Caption (optional):" +msgid "Output (optional):" +msgstr "Bilettekst (valfritt):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, fuzzy, kde-format +msgid "Configure..." +msgstr "Set opp …" + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, kde-format +msgid "Open Directory" +msgstr "Opna mappe" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, fuzzy, kde-format +#| msgid "Use Output File" +msgid "Select Output File" +msgstr "Bruk utfil" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, fuzzy, kde-format +#| msgid "Search t&ext" +msgid "Search text:" +msgstr "Søk &tekst" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, fuzzy, kde-format +msgid "Case sensitive" +msgstr "Skil mellom store og små bokstavar" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, fuzzy, kde-format +#| msgctxt "before the TextField input of the filter" +#| msgid "Search: " +msgid "Search A" +msgstr "Søk: " + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, fuzzy, kde-format +#| msgid "Search Bar" +msgid "Search B" +msgstr "Søkjelinje" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, fuzzy, kde-format +#| msgctxt "before the TextField input of the filter" +#| msgid "Search: " +msgid "Search C" +msgstr "Søk: " + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, fuzzy, kde-format +#| msgid "Search Output..." +msgid "Search output" +msgstr "Søk i utdata …" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, fuzzy, kde-format +msgid "&Search" +msgstr "&Søk" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, fuzzy, kde-format +#| msgid "Save result" +msgid "Sort key result:" +msgstr "Lagra resultat" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "" + +#, fuzzy +#~ msgid "&Merge" +#~ msgstr "&Slå saman" Index: trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,3944 +0,0 @@ -# Translation of kdiff3 to Norwegian Nynorsk -# -msgid "" -msgstr "" -"Project-Id-Version: KDE 4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-07 09:31+0200\n" -"PO-Revision-Date: 2008-11-26 17:46+0100\n" -"Last-Translator: Karl Ove Hufthammer \n" -"Language-Team: Norwegian Nynorsk \n" -"Language: nn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" - -#. +> trunk5 -#, fuzzy, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Karl Ove Hufthammer" - -#. +> trunk5 -#, fuzzy, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "karl@huftis.org" - -#. +> trunk5 -#: diff.cpp:258 -#, fuzzy, kde-format -#| msgid "Printing to file failed" -msgid "Writing clipboard data to temp file failed." -msgstr "Klarte ikkje skriva ut til fil" - -#. +> trunk5 -#: diff.cpp:262 -#, fuzzy, kde-format -#| msgctxt "@title:menu create a new document from data in the the clipboard" -#| msgid "From Clipboard" -msgid "From Clipboard" -msgstr "&Kopier til utklippstavla" - -#. +> trunk5 -#: diff.cpp:563 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "" - -#. +> trunk5 -#: diff.cpp:566 -#, kde-format -msgid "Not matching apostrophs." -msgstr "" - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "" - -#. +> trunk5 -#: diff.cpp:595 -#, fuzzy, kde-format -#| msgid "No program defined" -msgid "No program specified." -msgstr "Inkje program definert" - -#. +> trunk5 -#: diff.cpp:710 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" - -#. +> trunk5 -#: diff.cpp:757 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" - -#. +> trunk5 -#: diff.cpp:784 -#, kde-format -msgid "File %1 too large to process. Skipping." -msgstr "" - -#. +> trunk5 -#: difftextwindow.cpp:414 -#, fuzzy, kde-format -msgid "File %1: Line %2" -msgstr "ikkje tilgjengeleg" - -#. +> trunk5 -#: difftextwindow.cpp:416 -#, fuzzy, kde-format -msgid "File %1: Line not available" -msgstr "ikkje tilgjengeleg" - -#. +> trunk5 -#: difftextwindow.cpp:1828 -#, fuzzy, kde-format -msgid "Encoding:" -msgstr "Teiknkoding:" - -#. +> trunk5 -#: difftextwindow.cpp:1830 mergeresultwindow.cpp:3392 optiondialog.cpp:919 -#, fuzzy, kde-format -#| msgid "Line style:" -msgid "Line end style:" -msgstr "Linjestil:" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:515 -#: directorymergewindow.cpp:566 directorymergewindow.cpp:657 -#: directorymergewindow.cpp:3298 directorymergewindow.cpp:3436 -#: directorymergewindow.cpp:3660 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:1781 -#: mergeresultwindow.cpp:3424 mergeresultwindow.cpp:3431 optiondialog.cpp:1051 -#: optiondialog.cpp:1063 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:805 smalldialogs.cpp:123 smalldialogs.cpp:125 -#: smalldialogs.cpp:126 smalldialogs.cpp:129 -#, fuzzy, kde-format -msgid "A" -msgstr "A" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:517 -#: directorymergewindow.cpp:569 directorymergewindow.cpp:659 -#: directorymergewindow.cpp:3304 directorymergewindow.cpp:3437 -#: directorymergewindow.cpp:3661 mergeresultwindow.cpp:909 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1783 -#: mergeresultwindow.cpp:3426 mergeresultwindow.cpp:3433 optiondialog.cpp:1052 -#: optiondialog.cpp:1064 pdiff.cpp:777 pdiff.cpp:779 pdiff.cpp:785 -#: pdiff.cpp:787 pdiff.cpp:807 smalldialogs.cpp:123 smalldialogs.cpp:124 -#: smalldialogs.cpp:127 smalldialogs.cpp:130 -#, fuzzy, kde-format -msgid "B" -msgstr "B" - -#. +> trunk5 -#: difftextwindow.cpp:1858 directorymergewindow.cpp:519 -#: directorymergewindow.cpp:572 directorymergewindow.cpp:661 -#: directorymergewindow.cpp:3310 directorymergewindow.cpp:3438 -#: directorymergewindow.cpp:3662 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:915 mergeresultwindow.cpp:917 -#: mergeresultwindow.cpp:919 mergeresultwindow.cpp:1785 -#: mergeresultwindow.cpp:3428 mergeresultwindow.cpp:3435 pdiff.cpp:781 -#: pdiff.cpp:783 pdiff.cpp:785 pdiff.cpp:787 pdiff.cpp:809 -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 -#, fuzzy, kde-format -msgid "C" -msgstr "C" - -#. +> trunk5 -#: difftextwindow.cpp:1858 -#, fuzzy, kde-format -#| msgid "Base" -msgid "A (Base)" -msgstr "Base" - -#. +> trunk5 -#: difftextwindow.cpp:1860 -#, fuzzy, kde-format -msgid "Encoding: %1" -msgstr "Teiknkoding:" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3437 -#, fuzzy, kde-format -msgid "Unix" -msgstr "Unix" - -#. +> trunk5 -#: difftextwindow.cpp:1861 mergeresultwindow.cpp:3438 -#, fuzzy, kde-format -msgid "DOS" -msgstr "DOS" - -#. +> trunk5 -#: difftextwindow.cpp:1861 -#, fuzzy, kde-format -#| msgid "Line style:" -msgid "Line end style: %1" -msgstr "Linjestil:" - -#. +> trunk5 -#: difftextwindow.cpp:1883 kdiff3.cpp:869 -#, fuzzy, kde-format -#| msgid " line" -#| msgid_plural " lines" -msgid "Top line" -msgstr " linje" - -#. +> trunk5 -#: difftextwindow.cpp:1893 -#, fuzzy, kde-format -msgid "End" -msgstr "End" - -#. +> trunk5 -#: difftextwindow.cpp:1968 smalldialogs.cpp:234 -#, kde-format -msgid "Open File" -msgstr "Opna fil" - -#. +> trunk5 -#: difftextwindow.cpp:2016 optiondialog.cpp:508 -#, fuzzy, kde-format -msgid "Unicode, 8 bit" -msgstr "Unicode" - -#. +> trunk5 -#: difftextwindow.cpp:2031 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Other" -msgid "Other" -msgstr "Anna" - -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, fuzzy, kde-format -#| msgctxt "board solved" -#| msgid "Solved" -msgid "Solved" -msgstr "Løyst" - -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, fuzzy, kde-format -#| msgid "white" -msgid "Nonwhite" -msgstr "kvit" - -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, fuzzy, kde-format -msgid "White" -msgstr "Kvit" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3667 -#, fuzzy, kde-format -#| msgid "Copy to %1" -msgid "Copy A to B" -msgstr "Kopier til %1" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3668 -#, fuzzy, kde-format -#| msgid "Copy to %1" -msgid "Copy B to A" -msgstr "Kopier til %1" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3669 -#, fuzzy, kde-format -#| msgid "Delete All" -msgid "Delete A" -msgstr "Slett alle" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3670 -#, fuzzy, kde-format -#| msgctxt "@item:inmenu undo delete" -#| msgid "Delete" -msgid "Delete B" -msgstr "Slett" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, fuzzy, kde-format -#| msgid "Delete A&ll" -msgid "Delete A & B" -msgstr "Slett a&lle" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3672 -#, fuzzy, kde-format -#| msgid "Merge into ODF" -msgid "Merge to A" -msgstr "Flett saman til ODF" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3673 -#, fuzzy, kde-format -#| msgid "Merge into ODF" -msgid "Merge to B" -msgstr "Flett saman til ODF" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3664 -#, fuzzy, kde-format -#| msgid "Delete List" -msgid "Delete (if exists)" -msgstr "Slett liste" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3663 optiondialog.cpp:1017 smalldialogs.cpp:112 -#, fuzzy, kde-format -msgid "Merge" -msgstr "Slå saman" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, fuzzy, kde-format -#| msgid "Error Deleting Files" -msgid "Error: Conflicting File Types" -msgstr "Feil ved sletting av lag" - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Done" -msgid "Done" -msgstr "Fullført" - -#. +> trunk5 -#: directorymergewindow.cpp:606 -#, fuzzy, kde-format -msgid "Error" -msgstr "Feil" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, fuzzy, kde-format -#| msgid "Skipped" -msgid "Skipped." -msgstr "Hoppa over" - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, fuzzy, kde-format -#| msgid "In progress" -msgid "In progress..." -msgstr "I gang" - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, fuzzy, kde-format -msgid "Name" -msgstr "Namn" - -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, fuzzy, kde-format -msgid "Operation" -msgstr "Handling" - -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, fuzzy, kde-format -msgid "Status" -msgstr "Status" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, fuzzy, kde-format -msgid "Link: " -msgstr "Lenkje: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, fuzzy, kde-format -msgid "Error reading from %1" -msgstr "Feil ved lesing frå «%1»" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:341 pdiff.cpp:1028 pdiff.cpp:1929 pdiff.cpp:1939 -#, fuzzy, kde-format -msgid "Warning" -msgstr "Åtvaring" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3636 -#, fuzzy, kde-format -msgid "Rescan" -msgstr "Sjekk på nytt" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1030 -#, kde-format -msgid "Continue Merging" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, fuzzy, kde-format -#| msgid "Opening file failed." -msgid "Opening of directories failed:" -msgstr "Klarte ikkje opna fila." - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, fuzzy, kde-format -#| msgid "Print Warning" -msgid "Parameter Warning" -msgstr "Utskriftsåtvaring" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, fuzzy, kde-format -msgid "Scanning directories..." -msgstr "Ser gjennom mappa %1 …" - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1109 pdiff.cpp:1181 -#: pdiff.cpp:1226 pdiff.cpp:1242 pdiff.cpp:1285 pdiff.cpp:1308 -#, fuzzy, kde-format -msgid "Ready." -msgstr "Klar." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1299 -#, fuzzy, kde-format -#| msgid "Number of nucleons: %1" -msgid "Number of manual merges: %1" -msgstr "Tal på nukleon: %1" - -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "This affects all merge operations." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:1492 -#, fuzzy, kde-format -#| msgid "File Operations" -msgid "Changing All Merge Operations" -msgstr "Filoperasjonar" - -#. +> trunk5 -#: directorymergewindow.cpp:1888 -#, fuzzy, kde-format -#| msgctxt "Job state" -#| msgid "Processing" -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "Handsamar" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 -#, kde-format -msgid "This operation is currently not possible." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2464 directorymergewindow.cpp:2489 -#: directorymergewindow.cpp:2513 directorymergewindow.cpp:2795 -#, fuzzy, kde-format -#| msgid "Certification Not Possible" -msgid "Operation Not Possible" -msgstr "Sertifisering ikkje mogleg" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 -#, fuzzy, kde-format -#| msgid "An error occurred while accessing '%1'" -msgid "An error occurred while copying." -msgstr "Det oppstod ein feil ved forsøk på tilgang til «%1»" - -#. +> trunk5 -#: directorymergewindow.cpp:2562 directorymergewindow.cpp:3003 -#, kde-format -msgid "Merge Error" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2639 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2684 -#, fuzzy, kde-format -#| msgid "Unknown location" -msgid "Unknown merge operation." -msgstr "Ukjend plassering" - -#. +> trunk5 -#: directorymergewindow.cpp:2697 -#, kde-format -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 "" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Starting Merge" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, fuzzy, kde-format -msgid "Do It" -msgstr "Gjer det" - -#. +> trunk5 -#: directorymergewindow.cpp:2704 -#, fuzzy, kde-format -#| msgid "Simulate" -msgid "Simulate It" -msgstr "Simuler" - -#. +> trunk5 -#: directorymergewindow.cpp:2730 -#, kde-format -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2734 -#, kde-format -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2738 -#, kde-format -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2795 -#, kde-format -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:2853 -#, kde-format -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 "" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, fuzzy, kde-format -#| msgid "Continue on error." -msgid "Continue merge after an error" -msgstr "Hald fram med feil." - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, fuzzy, kde-format -#| msgid "Continue in Same" -msgid "Continue With Last Item" -msgstr "Hald fram i same" - -#. +> trunk5 -#: directorymergewindow.cpp:2857 -#, fuzzy, kde-format -#| msgid " Item" -#| msgid_plural " Items" -msgid "Skip Item" -msgstr " mediefiler" - -#. +> trunk5 -#: directorymergewindow.cpp:2953 -#, fuzzy, kde-format -#| msgctxt "@info:status" -#| msgid "Move operation completed." -msgid "Merge operation complete." -msgstr "Flyttinga er fullført." - -#. +> trunk5 -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2956 -#, fuzzy, kde-format -#| msgid "Charge Complete" -msgid "Merge Complete" -msgstr "Fullført lading" - -#. +> trunk5 -#: directorymergewindow.cpp:2966 -#, kde-format -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3002 -#, kde-format -msgid "An error occurred. Press OK to see detailed information." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3035 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3042 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3044 -#, kde-format -msgid "delete( %1 )" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3059 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3078 -#, fuzzy, kde-format -#| msgid "Operation failed." -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Operasjonen mislukkast." - -#. +> trunk5 -#: directorymergewindow.cpp:3088 -#, fuzzy, kde-format -#| msgid "The requested operation has failed." -msgid "Error: delete operation failed." -msgstr "Klarte ikkje utføra den førespurde operasjonen." - -#. +> trunk5 -#: directorymergewindow.cpp:3114 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3117 -#, kde-format -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3142 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3151 -#, fuzzy, kde-format -#| msgid " %1 - %2 " -msgid "copyLink( %1 -> %2 )" -msgstr " %1 – %2 " - -#. +> trunk5 -#: directorymergewindow.cpp:3162 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3168 -#, kde-format -msgid "Error: copyLink failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3193 -#, fuzzy, kde-format -#| msgid " %1 - %2 " -msgid "copy( %1 -> %2 )" -msgstr " %1 – %2 " - -#. +> trunk5 -#: directorymergewindow.cpp:3219 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3226 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3235 -#, kde-format -msgid "Error: Rename failed." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3253 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3270 -#, kde-format -msgid "makeDir( %1 )" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3280 -#, kde-format -msgid "Error while creating directory." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3316 directorymergewindow.cpp:3442 -#, kde-format -msgid "Dest" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 directorymergewindow.cpp:3354 -#, fuzzy, kde-format -msgid "Dir" -msgstr "Emnekatalog" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, fuzzy, kde-format -msgid "Type" -msgstr "Type" - -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, fuzzy, kde-format -msgid "Size" -msgstr "Storleik" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, fuzzy, kde-format -msgid "Attr" -msgstr "Attributt" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, fuzzy, kde-format -msgid "Last Modification" -msgstr "Siste endring" - -#. +> trunk5 -#: directorymergewindow.cpp:3325 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Link Destination" -msgid "Link-Destination" -msgstr "Lenkjemål" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -msgid "File" -msgstr "Fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3354 -#, fuzzy, kde-format -#| msgid "Link" -msgid "-Link" -msgstr "Lenkje" - -#. +> trunk5 -#: directorymergewindow.cpp:3368 -#, fuzzy, kde-format -msgid "not available" -msgstr "ikkje tilgjengeleg" - -#. +> trunk5 -#: directorymergewindow.cpp:3386 -#, kde-format -msgid "A (Dest): " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "A (Base): " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "B (Dest): " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "C (Dest): " -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3412 -#, kde-format -msgid "Dest: " -msgstr "" - -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3494 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, fuzzy, kde-format -msgid "Run Operation for Current Item" -msgstr "Konflikt" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, fuzzy, kde-format -#| msgid "Selected Files" -msgid "Compare Selected File" -msgstr "Valte filer" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, fuzzy, kde-format -#| msgid "Current File" -msgid "Merge Current File" -msgstr "Gjeldande fil" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, fuzzy, kde-format -msgid "" -"Merge\n" -"File" -msgstr "Slå saman" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, fuzzy, kde-format -#| msgid "Current Folder & All Subfolders" -msgid "Fold All Subdirs" -msgstr "Gjeldande mappe og alle undermapper" - -#. +> trunk5 -#: directorymergewindow.cpp:3635 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, fuzzy, kde-format -msgid "Choose A for All Items" -msgstr "Konflikt" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, fuzzy, kde-format -msgid "Choose B for All Items" -msgstr "Konflikt" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, fuzzy, kde-format -msgid "Choose C for All Items" -msgstr "Konflikt" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, fuzzy, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Konflikt" - -#. +> trunk5 -#: directorymergewindow.cpp:3643 -#, fuzzy, kde-format -msgid "No Operation for All Items" -msgstr "Konflikt" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, fuzzy, kde-format -#| msgid "Show Identities" -msgid "Show Identical Files" -msgstr "Vis identitetar" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, fuzzy, kde-format -#| msgid "Identities" -msgid "" -"Identical\n" -"Files" -msgstr "Identitetar" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, fuzzy, kde-format -#| msgid "Show Differences" -msgid "Show Different Files" -msgstr "Vis forskjellar" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in A" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in B" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "Show Files only in C" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3652 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3657 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 directorymergewindow.cpp:3666 -#, fuzzy, kde-format -msgid "Do Nothing" -msgstr "Ikkje gjer noko" - -#. +> trunk5 -#: directorymergewindow.cpp:3671 -#, fuzzy, kde-format -#| msgid "Delete A&ll" -msgid "Delete A && B" -msgstr "Slett a&lle" - -#. +> trunk5 -#: directorymergewindow.cpp:3674 -#, kde-format -msgid "Merge to A && B" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:885 -#, kde-format -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:892 -#, kde-format -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:916 -#, fuzzy, kde-format -#| msgctxt "The role of the transaction, in present tense" -#| msgid "Getting file list" -msgid "Getting file status: %1" -msgstr "Hentar filoversikt" - -#. +> trunk5 -#: fileaccess.cpp:958 -#, kde-format -msgid "Reading file: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:996 -#, fuzzy, kde-format -#| msgid "Writing cue file to %1." -msgid "Writing file: %1" -msgstr "Skriv cue-fil til %1." - -#. +> trunk5 -#: fileaccess.cpp:1029 -#, fuzzy, kde-format -msgid "Out of memory" -msgstr "Ikkje nok minne" - -#. +> trunk5 -#: fileaccess.cpp:1064 -#, fuzzy, kde-format -#| msgid "Creating directory" -msgid "Making directory: %1" -msgstr "Lagar mappe" - -#. +> trunk5 -#: fileaccess.cpp:1084 -#, fuzzy, kde-format -#| msgid "Remove directory" -msgid "Removing directory: %1" -msgstr "Fjern mappe" - -#. +> trunk5 -#: fileaccess.cpp:1099 -#, fuzzy, kde-format -#| msgid "Removing Cue file %1" -msgid "Removing file: %1" -msgstr "Fjernar cue-fil %1" - -#. +> trunk5 -#: fileaccess.cpp:1115 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1143 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1175 -#, fuzzy, kde-format -#| msgid "" -msgid "Copying file: %1 -> %2" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1189 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1195 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1207 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1216 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" - -#. +> trunk5 -#: fileaccess.cpp:1499 -#, fuzzy, kde-format -#| msgid "Creating directory" -msgid "Reading directory: %1" -msgstr "Lagar mappe" - -#. +> trunk5 -#: fileaccess.cpp:1618 -#, kde-format -msgid "Listing directory: %1" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, fuzzy, kde-format -#| msgid "Font Configuration" -msgid "Current Configuration:" -msgstr "Skriftoppsett" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:451 -#, fuzzy, kde-format -msgid "Saving failed." -msgstr "Lagrar fil …" - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1091 pdiff.cpp:1162 -#, fuzzy, kde-format -#| msgid "Opening file failed." -msgid "Opening of these files failed:" -msgstr "Klarte ikkje opna fila." - -#. +> trunk5 -#: kdiff3.cpp:495 -#, fuzzy, kde-format -#| msgid "File I/O Error" -msgid "File Open Error" -msgstr "Fil-I/U-feil" - -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:525 -#, fuzzy, kde-format -msgid "Reload" -msgstr "Last om att" - -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:530 -#, fuzzy, kde-format -#| msgid "Save the current document" -msgid "Saves the current document as..." -msgstr "Lagra dokumentet" - -#. +> trunk5 -#: kdiff3.cpp:533 -#, fuzzy, kde-format -#| msgid "%1 differences" -msgid "Print the differences" -msgstr "%1 skilnad(er)" - -#. +> trunk5 -#: kdiff3.cpp:536 -#, fuzzy, kde-format -msgid "Quits the application" -msgstr "Avsluttar programmet" - -#. +> trunk5 -#: kdiff3.cpp:538 -#, fuzzy, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Klipper ut den merkte delen til utklippstavla" - -#. +> trunk5 -#: kdiff3.cpp:540 -#, fuzzy, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Kopierer den merkte delen til utklippstavla" - -#. +> trunk5 -#: kdiff3.cpp:542 -#, fuzzy, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Limer innhaldet i utklippstavla til aktuell posisjon" - -#. +> trunk5 -#: kdiff3.cpp:544 -#, fuzzy, kde-format -#| msgid "Select the current day" -msgid "Select everything in current window" -msgstr "Hopp til dagen i dag" - -#. +> trunk5 -#: kdiff3.cpp:546 -#, fuzzy, kde-format -#| msgid "Search for User" -msgid "Search for a string" -msgstr "Søk etter brukar" - -#. +> trunk5 -#: kdiff3.cpp:548 -#, fuzzy, kde-format -#| msgid "Search for User" -msgid "Search again for the string" -msgstr "Søk etter brukar" - -#. +> trunk5 -#: kdiff3.cpp:553 -#, fuzzy, kde-format -msgid "Enables/disables the statusbar" -msgstr "Viser/gøymer statuslinja" - -#. +> trunk5 -#: kdiff3.cpp:557 -#, fuzzy, kde-format -#| msgid "Configure Kigo..." -msgid "Configure KDiff3..." -msgstr "Set opp Kigo …" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, fuzzy, kde-format -msgid "Go to Current Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, fuzzy, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, fuzzy, kde-format -msgid "Go to First Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, fuzzy, kde-format -msgid "" -"First\n" -"Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, fuzzy, kde-format -msgid "Go to Last Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, fuzzy, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, fuzzy, kde-format -#| msgid "&Go to Previous" -msgid "Go to Previous Delta" -msgstr "&Gå til førre" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, fuzzy, kde-format -#| msgctxt "greece_prefectures.kgm" -#| msgid "Preveza" -msgid "" -"Prev\n" -"Delta" -msgstr "Preveza" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, fuzzy, kde-format -msgid "Go to Next Delta" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, fuzzy, kde-format -msgid "Go to Previous Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, fuzzy, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, fuzzy, kde-format -msgid "Go to Next Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, fuzzy, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, fuzzy, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, fuzzy, kde-format -#| msgid "Resolved" -msgid "" -"Prev\n" -"Unsolved" -msgstr "Løyst" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, fuzzy, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, fuzzy, kde-format -#| msgid "Resolved" -msgid "" -"Next\n" -"Unsolved" -msgstr "Løyst" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, fuzzy, kde-format -#| msgid "Select &Line" -msgid "Select Line(s) From A" -msgstr "Vel &linje" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, fuzzy, kde-format -#| msgid "Choose" -msgid "" -"Choose\n" -"A" -msgstr "Vel" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, fuzzy, kde-format -#| msgid "Select &Line" -msgid "Select Line(s) From B" -msgstr "Vel &linje" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, fuzzy, kde-format -#| msgid "Choose" -msgid "" -"Choose\n" -"B" -msgstr "Vel" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, fuzzy, kde-format -#| msgid "Select &Line" -msgid "Select Line(s) From C" -msgstr "Vel &linje" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, fuzzy, kde-format -#| msgid "Choose" -msgid "" -"Choose\n" -"C" -msgstr "Vel" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, fuzzy, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, fuzzy, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "Autovalg" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Special Characters" -msgid "Show Space && Tabulator Characters" -msgstr "Spesialteikn" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Characters" -msgid "" -"White\n" -"Characters" -msgstr "Spesialteikn" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, fuzzy, kde-format -#| msgid "White Space" -msgid "Show White Space" -msgstr "Blankteikn" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, fuzzy, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, fuzzy, kde-format -#| msgid "Show &Line Numbers" -msgid "Show Line Numbers" -msgstr "Vis &linjenummer" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, fuzzy, kde-format -#| msgid "Line Numbers" -msgid "" -"Line\n" -"Numbers" -msgstr "Linjenummer" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, fuzzy, kde-format -#| msgid "They Are Everywhere!" -msgid "Choose A Everywhere" -msgstr "Dei er overalt!" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, fuzzy, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, fuzzy, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, fuzzy, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, fuzzy, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, fuzzy, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, fuzzy, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, fuzzy, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, fuzzy, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, fuzzy, kde-format -#| msgid "Regular Expression Editor" -msgid "Run Regular Expression Auto Merge" -msgstr "Redigeringsprogram for regulære uttrykk" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, fuzzy, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Konflikt" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, fuzzy, kde-format -#| msgid "Split Direction" -msgid "Split Diff At Selection" -msgstr "Del retning" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, fuzzy, kde-format -#| msgid "Parts Overview" -msgid "A vs. B Overview" -msgstr "Deloversikt" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, fuzzy, kde-format -#| msgid "Parts Overview" -msgid "A vs. C Overview" -msgstr "Deloversikt" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, fuzzy, kde-format -#| msgid "Parts Overview" -msgid "B vs. C Overview" -msgstr "Deloversikt" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, fuzzy, kde-format -#| msgid "Panel Alignment" -msgid "Add Manual Diff Alignment" -msgstr "Panelplassering" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, fuzzy, kde-format -#| msgid "Toggle Orientation" -msgid "Toggle Split Orientation" -msgstr "Ved retning" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, fuzzy, kde-format -#| msgid "Next Split View" -msgid "Dir && Text Split Screen View" -msgstr "Neste delte rute" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, fuzzy, kde-format -#| msgid "Open in &Text View" -msgid "Toggle Between Dir && Text View" -msgstr "Opna i skriftvisaren" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1928 -#, kde-format -msgid "The merge result has not been saved." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:694 -#, fuzzy, kde-format -#| msgid "Save &&& Exit" -msgid "Save && Quit" -msgstr "Lagra og &avslutt" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1939 -#, kde-format -msgid "Saving the merge result failed." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1027 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, fuzzy, kde-format -msgid "Saving file..." -msgstr "Lagrar fil …" - -#. +> trunk5 -#: kdiff3.cpp:754 -#, fuzzy, kde-format -msgid "Saving file with a new filename..." -msgstr "Lagrar fil med eit nytt filnamn …" - -#. +> trunk5 -#: kdiff3.cpp:756 -#, fuzzy, kde-format -msgid "Save As..." -msgstr "Lagra som …" - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:853 -#, fuzzy, kde-format -msgid "Printing..." -msgstr "Skriv ut …" - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, fuzzy, kde-format -msgid " (Selection)" -msgstr "Utval" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, fuzzy, kde-format -#| msgid "Printing Complete" -msgid "Printing completed." -msgstr "Utskrift fullført" - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, fuzzy, kde-format -#| msgid "Sending aborted." -msgid "Printing aborted." -msgstr "Sending avbroten." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, fuzzy, kde-format -msgid "Exiting..." -msgstr "Avsluttar …" - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, fuzzy, kde-format -msgid "Toggling toolbar..." -msgstr "Viser eller gøymer verktøylinja …" - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, fuzzy, kde-format -msgid "Toggle the statusbar..." -msgstr "Vis/gøym statuslinja …" - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgctxt "Name" -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "Ein KPart for vising av SVG-bilete" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "© 2007 Aurélien Gâteau " - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, kde-format -msgid "Could not find files for comparison." -msgstr "" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, fuzzy, kde-format -msgid "&KDiff3" -msgstr "KDiff3" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 main.cpp:113 -#, fuzzy, kde-format -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 -#, fuzzy, kde-format -msgid "&File" -msgstr "&Fil" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 -#, fuzzy, kde-format -msgid "&Directory" -msgstr "&Mappe" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgctxt "MainWindow|" -#| msgid "Movement" -msgid "M&ovement" -msgstr "Forflytting" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -msgid "M&erge" -msgstr "Slå saman" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 -#, fuzzy, kde-format -msgid "&Window" -msgstr "&Vindauge" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, fuzzy, kde-format -msgid "Main Toolbar" -msgstr "Hovudverktøylinje" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, fuzzy, kde-format -#| msgid "User defined" -msgid "Ignored. (User defined.)" -msgstr "Brukardefinert" - -#. +> trunk5 -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "64 bit" -msgid " (64 bit)" -msgstr "64 bit" - -#. +> trunk5 -#: main.cpp:119 -#, fuzzy, kde-format -#| msgid "32 bit" -msgid " (32 bit)" -msgstr "32 bit" - -#. +> trunk5 -#: main.cpp:120 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" - -#. +> trunk5 -#: main.cpp:121 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:140 -#, kde-format -msgid "Merge the input." -msgstr "" - -#. +> trunk5 -#: main.cpp:141 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "" - -#. +> trunk5 -#: main.cpp:142 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" - -#. +> trunk5 -#: main.cpp:143 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "" - -#. +> trunk5 -#: main.cpp:144 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" - -#. +> trunk5 -#: main.cpp:145 -#, kde-format -msgid "Do not solve conflicts automatically." -msgstr "" - -#. +> trunk5 -#: main.cpp:146 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "" - -#. +> trunk5 -#: main.cpp:147 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "" - -#. +> trunk5 -#: main.cpp:148 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "" - -#. +> trunk5 -#: main.cpp:149 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" - -#. +> trunk5 -#: main.cpp:150 -#, kde-format -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "" - -#. +> trunk5 -#: main.cpp:151 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "" - -#. +> trunk5 -#: main.cpp:152 -#, kde-format -msgid "Use a different config file." -msgstr "" - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "" - -#. +> trunk5 -#: main.cpp:156 -#, fuzzy, kde-format -#| msgid "file to open" -msgid "file2 to open" -msgstr "Fil som skal opnast" - -#. +> trunk5 -#: main.cpp:157 -#, fuzzy, kde-format -#| msgid "file to open" -msgid "file3 to open" -msgstr "Fil som skal opnast" - -#. +> trunk5 -#: main.cpp:168 -#, kde-format -msgid "See kdiff3 --help for supported options." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:339 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:903 pdiff.cpp:771 -#, kde-format -msgid "All input files are binary equal." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:905 -#, kde-format -msgid "All input files contain the same text." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:909 mergeresultwindow.cpp:913 -#: mergeresultwindow.cpp:917 pdiff.cpp:777 pdiff.cpp:781 pdiff.cpp:785 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:911 mergeresultwindow.cpp:915 -#: mergeresultwindow.cpp:919 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:925 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:931 -#, fuzzy, kde-format -msgid "Conflicts" -msgstr "Konfliktar" - -#. +> trunk5 -#: mergeresultwindow.cpp:1840 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1848 -#, kde-format -msgid "" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:1850 mergeresultwindow.cpp:2722 -#, fuzzy, kde-format -#| msgid "Key Conflict" -msgid "" -msgstr "Tastekonflikt" - -#. +> trunk5 -#: mergeresultwindow.cpp:2934 -#, kde-format -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2936 mergeresultwindow.cpp:2945 -#, fuzzy, kde-format -msgid "Conflicts Left" -msgstr "Konfliktar" - -#. +> trunk5 -#: mergeresultwindow.cpp:2943 -#, kde-format -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved." -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 -#, fuzzy, kde-format -#| msgid "Create backup files" -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "Lag reservekopi" - -#. +> trunk5 -#: mergeresultwindow.cpp:2957 mergeresultwindow.cpp:3005 -#, fuzzy, kde-format -msgid "File Save Error" -msgstr "Feil ved fillagring" - -#. +> trunk5 -#: mergeresultwindow.cpp:3005 -#, fuzzy, kde-format -#| msgid "Error while searching." -msgid "Error while writing." -msgstr "Feil ved søk." - -#. +> trunk5 -#: mergeresultwindow.cpp:3365 -#, fuzzy, kde-format -msgid "Output:" -msgstr "Utdata" - -#. +> trunk5 -#: mergeresultwindow.cpp:3377 mergeresultwindow.cpp:3569 -#, fuzzy, kde-format -#| msgid "Modified" -msgid "[Modified]" -msgstr "Endra" - -#. +> trunk5 -#: mergeresultwindow.cpp:3384 -#, kde-format -msgid "Encoding for saving:" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:3484 -#, fuzzy, kde-format -msgid "Conflict" -msgstr "Konflikt" - -#. +> trunk5 -#: mergeresultwindow.cpp:3516 -#, kde-format -msgid "Codec from A: %1" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:3518 -#, kde-format -msgid "Codec from B: %1" -msgstr "" - -#. +> trunk5 -#: mergeresultwindow.cpp:3520 -#, kde-format -msgid "Codec from C: %1" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, fuzzy, kde-format -#| msgid "Change Font..." -msgid "Change Font" -msgstr "Endra skrift …" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, fuzzy, kde-format -msgid "Unicode" -msgstr "Unicode" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, fuzzy, kde-format -msgid "Latin1" -msgstr "Latin1" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:613 -#, fuzzy, kde-format -msgid "Configure" -msgstr "Set opp" - -#. +> trunk5 -#: optiondialog.cpp:690 -#, fuzzy, kde-format -msgid "Font" -msgstr "Skrift" - -#. +> trunk5 -#: optiondialog.cpp:692 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:710 -#, fuzzy, kde-format -#| msgctxt "QShortcut" -#| msgid "Application Left" -msgid "Application font" -msgstr "Program venstre" - -#. +> trunk5 -#: optiondialog.cpp:714 -#, fuzzy, kde-format -msgid "File view font" -msgstr "Feil ved fillagring" - -#. +> trunk5 -#: optiondialog.cpp:732 -#, fuzzy, kde-format -msgid "Color" -msgstr "Farge" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, fuzzy, kde-format -#| msgid "Color Settings" -msgid "Colors Settings" -msgstr "Fargeinnstillingar" - -#. +> trunk5 -#: optiondialog.cpp:750 -#, fuzzy, kde-format -#| msgid "Editor View" -msgid "Editor and Diff Views:" -msgstr "Skrivevising" - -#. +> trunk5 -#: optiondialog.cpp:758 -#, fuzzy, kde-format -msgid "Foreground color:" -msgstr "Framgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:765 -#, fuzzy, kde-format -msgid "Background color:" -msgstr "Bakgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:774 -#, fuzzy, kde-format -#| msgid "&View background color:" -msgid "Diff background color:" -msgstr "&Vis bakgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:782 -#, fuzzy, kde-format -#| msgid "Color:" -msgid "Color A:" -msgstr "Farge:" - -#. +> trunk5 -#: optiondialog.cpp:790 -#, fuzzy, kde-format -#| msgid "Color:" -msgid "Color B:" -msgstr "Farge:" - -#. +> trunk5 -#: optiondialog.cpp:798 -#, fuzzy, kde-format -#| msgid "Color:" -msgid "Color C:" -msgstr "Farge:" - -#. +> trunk5 -#: optiondialog.cpp:805 -#, fuzzy, kde-format -#| msgid "Font color:" -msgid "Conflict color:" -msgstr "Skriftfarge:" - -#. +> trunk5 -#: optiondialog.cpp:813 -#, fuzzy, kde-format -#| msgid "Change &background color:" -msgid "Current range background color:" -msgstr "Endra &bakgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:821 -#, fuzzy, kde-format -#| msgid "Change &background color:" -msgid "Current range diff background color:" -msgstr "Endra &bakgrunnsfarge:" - -#. +> trunk5 -#: optiondialog.cpp:828 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:834 -#, kde-format -msgid "Directory Comparison View:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:840 -#, kde-format -msgid "Newest file color:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:844 -#, kde-format -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:849 -#, kde-format -msgid "Oldest file color:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:857 -#, kde-format -msgid "Middle age file color:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:865 -#, kde-format -msgid "Color for missing files:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:878 -#, fuzzy, kde-format -msgid "Editor" -msgstr "Redaktør" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor Behavior" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:892 -#, kde-format -msgid "Tab inserts spaces" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:895 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:900 -#, fuzzy, kde-format -#| msgid "&Tab size:" -msgid "Tab size:" -msgstr "&Tabulatorbreidd:" - -#. +> trunk5 -#: optiondialog.cpp:906 -#, fuzzy, kde-format -msgid "Auto indentation" -msgstr "Automatiske innrykk" - -#. +> trunk5 -#: optiondialog.cpp:909 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:912 -#, kde-format -msgid "Auto copy selection" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:915 -#, kde-format -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:929 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:939 -#, fuzzy, kde-format -msgid "Diff" -msgstr "Diff" - -#. +> trunk5 -#: optiondialog.cpp:940 -#, fuzzy, kde-format -msgid "Diff Settings" -msgstr "Innstillingar for diff" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:964 -#, kde-format -msgid "Ignore numbers (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:971 -#, kde-format -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:973 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:976 -#, kde-format -msgid "Ignore case (treat as white space)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:982 -#, fuzzy, kde-format -#| msgid "Precommand:" -msgid "Preprocessor command:" -msgstr "Førkommando:" - -#. +> trunk5 -#: optiondialog.cpp:986 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:993 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:996 -#, fuzzy, kde-format -#| msgid "Smooth (slower)" -msgid "Try hard (slower)" -msgstr "Jamn (tregare)" - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1003 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1018 -#, fuzzy, kde-format -#| msgid "MergeSettings" -msgid "Merge Settings" -msgstr "Fletteinnstillingar" - -#. +> trunk5 -#: optiondialog.cpp:1032 -#, fuzzy, kde-format -#| msgid "Autosave delay:" -msgid "Auto advance delay (ms):" -msgstr "Tid mellom autolagringar:" - -#. +> trunk5 -#: optiondialog.cpp:1037 -#, kde-format -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 "" - -#. +> trunk5 -#: optiondialog.cpp:1041 -#, kde-format -msgid "Show info dialogs" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1043 -#, fuzzy, kde-format -#| msgid "Show information about the selected contact" -msgid "Show a dialog with information about the number of conflicts." -msgstr "Vis informasjon om den valde kontakten" - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1050 optiondialog.cpp:1062 -#, kde-format -msgid "Manual Choice" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1054 optiondialog.cpp:1067 -#, kde-format -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1058 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1071 -#, fuzzy, kde-format -#| msgid "Matches Regular Expression" -msgid "Automatic Merge Regular Expression" -msgstr "Passar regulært uttrykk" - -#. +> trunk5 -#: optiondialog.cpp:1079 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1083 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1089 -#, fuzzy, kde-format -#| msgid "Regular expression to match: " -msgid "Run regular expression auto merge on merge start" -msgstr "Regulært uttrykk: " - -#. +> trunk5 -#: optiondialog.cpp:1091 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1096 -#, kde-format -msgid "Version Control History Merging" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1104 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1108 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1114 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1126 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1134 -#, kde-format -msgid "History merge sorting" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1136 -#, kde-format -msgid "Sort version control history by a key." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1146 -#, kde-format -msgid "History entry start sort key order:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1150 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1161 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1163 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1167 -#, fuzzy, kde-format -#| msgid "Maximum number of history items per view" -msgid "Max number of history entries:" -msgstr "Høgste tal på historikkelement per vising" - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1174 -#, fuzzy, kde-format -#| msgid "Use regular expressions" -msgid "Test your regular expressions" -msgstr "Bruk regulære uttrykk" - -#. +> trunk5 -#: optiondialog.cpp:1179 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1183 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1188 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1202 optiondialog.cpp:1203 -#, fuzzy, kde-format -msgid "Directory" -msgstr "Mappe" - -#. +> trunk5 -#: optiondialog.cpp:1215 -#, kde-format -msgid "Recursive directories" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1217 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1219 -#, kde-format -msgid "File pattern(s):" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1224 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1229 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1234 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1239 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1244 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1249 -#, fuzzy, kde-format -#| msgid "No ignore" -msgid "Use .cvsignore" -msgstr "Ikkje ignorer" - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1256 -#, fuzzy, kde-format -#| msgctxt "Name" -#| msgid "Files and Directories" -msgid "Find hidden files and directories" -msgstr "Filer og mapper" - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1261 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1265 -#, fuzzy, kde-format -#| msgid "Follow &links" -msgid "Follow file links" -msgstr "Følg &lenkjer" - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1272 -#, fuzzy, kde-format -#| msgid "Follow directory symlinks" -msgid "Follow directory links" -msgstr "Følg symbolske lenkjer til mapper" - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1290 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1297 -#, kde-format -msgid "Unfold all subdirectories on load" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1304 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1311 -#, kde-format -msgid "File Comparison Mode" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1316 -#, fuzzy, kde-format -#| msgid "3 way comparison" -msgid "Binary comparison" -msgstr "Samanlikning med tre filer" - -#. +> trunk5 -#: optiondialog.cpp:1317 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, fuzzy, kde-format -#| msgctxt "Content type" -#| msgid "Analysis" -msgid "Full analysis" -msgstr "Analyse" - -#. +> trunk5 -#: optiondialog.cpp:1321 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1325 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1326 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1331 -#, kde-format -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1332 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1337 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1338 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1345 -#, fuzzy, kde-format -msgid "Synchronize directories" -msgstr "Ser gjennom mappa %1 …" - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1354 -#, kde-format -msgid "White space differences considered equal" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1363 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1366 -#, kde-format -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1371 -#, fuzzy, kde-format -#| msgid "Backup files:" -msgid "Backup files (.orig)" -msgstr "Reservekopier filer:" - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1450 optiondialog.cpp:1451 -#, fuzzy, kde-format -msgid "Regional Settings" -msgstr "Språk og land" - -#. +> trunk5 -#: optiondialog.cpp:1465 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1468 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1472 -#, kde-format -msgid "Note: Local Encoding is \"%1\"" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1476 -#, kde-format -msgid "File Encoding for A:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1482 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1490 -#, kde-format -msgid "File Encoding for B:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1499 -#, kde-format -msgid "File Encoding for C:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1508 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1512 -#, fuzzy, kde-format -msgid "Auto Select" -msgstr "Autovalg" - -#. +> trunk5 -#: optiondialog.cpp:1515 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1518 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1529 -#, fuzzy, kde-format -#| msgid "Right to Left" -msgid "Right To Left Language" -msgstr "Høgre til venstre" - -#. +> trunk5 -#: optiondialog.cpp:1532 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1542 -#, fuzzy, kde-format -#| msgctxt "integration of KGet with other applications" -#| msgid "Integration" -msgid "Integration" -msgstr "Integrering" - -#. +> trunk5 -#: optiondialog.cpp:1543 -#, fuzzy, kde-format -#| msgctxt "Title for settings page" -#| msgid "Plasma Integration Settings" -msgid "Integration Settings" -msgstr "Innstillingar for Plasma-integrering" - -#. +> trunk5 -#: optiondialog.cpp:1556 -#, kde-format -msgid "Command line options to ignore:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1561 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1566 -#, kde-format -msgid "Quit also via Escape key" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1569 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1653 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:87 pdiff.cpp:101 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, fuzzy, kde-format -#| msgctxt "Name" -#| msgid "Server Internal Error" -msgid "Severe Internal Error" -msgstr "Internfeil på tenaren" - -#. +> trunk5 -#: pdiff.cpp:131 -#, fuzzy, kde-format -#| msgid "Processor:" -#| msgid_plural "Processors:" -msgid "PreprocessorCmd: " -msgstr "Prosessor:" - -#. +> trunk5 -#: pdiff.cpp:136 -#, fuzzy, kde-format -#| msgid "" -#| "The following options are enabled:\n" -#| "\n" -msgid "The following option(s) you selected might change data:\n" -msgstr "" -"Dei følgjande vala er på:\n" -"\n" - -#. +> trunk5 -#: pdiff.cpp:137 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:140 -#, kde-format -msgid "Use These Options During Merge" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:170 -#, fuzzy, kde-format -#| msgid "Loading: " -msgid "Loading A" -msgstr "Opnar: " - -#. +> trunk5 -#: pdiff.cpp:177 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:181 -#, fuzzy, kde-format -#| msgid "Loading: " -msgid "Loading B" -msgstr "Opnar: " - -#. +> trunk5 -#: pdiff.cpp:188 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:205 pdiff.cpp:239 -#, kde-format -msgid "Diff: A <-> B" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:212 pdiff.cpp:267 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:223 -#, fuzzy, kde-format -#| msgid "Loading: " -msgid "Loading C" -msgstr "Opnar: " - -#. +> trunk5 -#: pdiff.cpp:230 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:243 -#, kde-format -msgid "Diff: B <-> C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:247 -#, kde-format -msgid "Diff: A <-> C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:270 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:273 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:773 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:779 pdiff.cpp:783 pdiff.cpp:787 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:797 -#, kde-format -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:807 -#, fuzzy, kde-format -#| msgid ", " -msgid ", B" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:809 -#, fuzzy, kde-format -#| msgid ", " -msgid ", C" -msgstr ", " - -#. +> trunk5 -#: pdiff.cpp:811 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1029 -#, fuzzy, kde-format -msgid "Abort" -msgstr "Avbryt" - -#. +> trunk5 -#: pdiff.cpp:1035 pdiff.cpp:1123 -#, fuzzy, kde-format -msgid "Opening files..." -msgstr "Opnar filer …" - -#. +> trunk5 -#: pdiff.cpp:1100 pdiff.cpp:1171 -#, fuzzy, kde-format -#| msgid "FITS file open error: %1" -msgid "File open error" -msgstr "Feil ved opning av FITS-fil: %1" - -#. +> trunk5 -#: pdiff.cpp:1210 -#, fuzzy, kde-format -msgid "Cutting selection..." -msgstr "Klipper ut utvalet …" - -#. +> trunk5 -#: pdiff.cpp:1231 -#, fuzzy, kde-format -msgid "Copying selection to clipboard..." -msgstr "Kopierer utvalet til utklippstavla …" - -#. +> trunk5 -#: pdiff.cpp:1247 -#, fuzzy, kde-format -msgid "Inserting clipboard contents..." -msgstr "Set inn innhaldet av utklippstavla …" - -#. +> trunk5 -#: pdiff.cpp:1718 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1719 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1930 -#, fuzzy, kde-format -#| msgid "Save && C&onnect" -msgid "Save && Continue" -msgstr "Lagra og &kopla til" - -#. +> trunk5 -#: pdiff.cpp:1931 -#, fuzzy, kde-format -#| msgctxt "QDialogButtonBox" -#| msgid "Close without Saving" -msgid "Continue Without Saving" -msgstr "Lukk utan å lagra" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, fuzzy, kde-format -#| msgid "Search Scope" -msgid "Search complete." -msgstr "Søkjeområde" - -#. +> trunk5 -#: pdiff.cpp:2143 -#, kde-format -msgid "Search Complete" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:2410 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, fuzzy, kde-format -msgid "&Cancel" -msgstr "&Avbryt" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, fuzzy, kde-format -#| msgid "Base" -msgid "A (Base):" -msgstr "Base" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, fuzzy, kde-format -msgid "File..." -msgstr "Fil …" - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, fuzzy, kde-format -msgid "Dir..." -msgstr "Emnekatalog" - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, fuzzy, kde-format -#| msgid "(optional)" -msgid "C (Optional):" -msgstr "(valfritt)" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, kde-format -msgid "Swap/Copy Names..." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, fuzzy, kde-format -#| msgid "Show Output" -msgid "Swap %1<->Output" -msgstr "Vis logg" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, fuzzy, kde-format -#| msgid "Caption (optional):" -msgid "Output (optional):" -msgstr "Bilettekst (valfritt):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, fuzzy, kde-format -msgid "Configure..." -msgstr "Set opp …" - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, kde-format -msgid "Open Directory" -msgstr "Opna mappe" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Use Output File" -msgid "Select Output File" -msgstr "Bruk utfil" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, fuzzy, kde-format -#| msgid "Search t&ext" -msgid "Search text:" -msgstr "Søk &tekst" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, fuzzy, kde-format -msgid "Case sensitive" -msgstr "Skil mellom store og små bokstavar" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, fuzzy, kde-format -#| msgctxt "before the TextField input of the filter" -#| msgid "Search: " -msgid "Search A" -msgstr "Søk: " - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, fuzzy, kde-format -#| msgid "Search Bar" -msgid "Search B" -msgstr "Søkjelinje" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, fuzzy, kde-format -#| msgctxt "before the TextField input of the filter" -#| msgid "Search: " -msgid "Search C" -msgstr "Søk: " - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, fuzzy, kde-format -#| msgid "Search Output..." -msgid "Search output" -msgstr "Søk i utdata …" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, fuzzy, kde-format -msgid "&Search" -msgstr "&Søk" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, fuzzy, kde-format -#| msgid "Save result" -msgid "Sort key result:" -msgstr "Lagra resultat" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "" - -#, fuzzy -#~ msgid "&Merge" -#~ msgstr "&Slå saman" Index: trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/nn/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,45 +0,0 @@ -# Translation of kdiff3._desktop_ to Norwegian Nynorsk -# -# Eirik U. Birkeland , 2008. -# Karl Ove Hufthammer , 2008, 2016. -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2016-11-19 18:44+0100\n" -"Last-Translator: Karl Ove Hufthammer \n" -"Language-Team: Norwegian Nynorsk \n" -"Language: nn\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "KDiff3Part" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "KDiff3" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Motor for diff- og patch-filer" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Eit program for samanlikning og fletting av filer og mapper" Index: trunk/l10n-support/scripts/process_orphans.txt =================================================================== --- trunk/l10n-support/scripts/process_orphans.txt (revision 1522186) +++ trunk/l10n-support/scripts/process_orphans.txt (revision 1522187) @@ -1,8064 +1,8071 @@ # Rule file for the process_orphans.sh script # Comments must start with the # character at first column with a space after it # Empty lines are allowed # Format: command origin [destination] [revision] [date] # Available commands: move copy delete merge mergekeep # Use only *one* space to separate data # Note: origin and destination must be PO files, not POT files delete summit/messages/kdepim/kabc2mutt.po # Summit catalogs left behind on 4.0->4.1 switch, 2008-07-10. #delete summit/messages/kdebase/kcmaccessibility.po #delete summit/messages/kdebase/krunner_searchrunner.po #delete summit/messages/kdebase/ktip.po delete summit/messages/kdegraphics/kscanplugin.po delete summit/messages/kdetoys/kfifteenapplet.po delete summit/messages/kdetoys/kmoon.po delete summit/messages/kdetoys/kworldclock.po delete summit/messages/kdeutils/kcmkvaio.po delete summit/messages/kdeutils/kcmthinkpad.po delete summit/messages/kdeutils/klaptopdaemon.po delete summit/messages/kdeutils/kmilo_asus.po delete summit/messages/kdeutils/kmilo_delli8k.po delete summit/messages/kdeutils/kmilo_generic.po delete summit/messages/kdeutils/kmilo_kvaio.po delete summit/messages/kdeutils/kmilo_powerbook.po delete summit/messages/kdeutils/kmilo_thinkpad.po delete summit/messages/kdeutils/kmilod.po delete summit/messages/kdeutils/ksim.po # kdeplasmoids -> kdeplasma-addons move, 2008-07-09 move summit/messages/kdeplasmoids/desktop_kdeplasmoids.po summit/messages/kdeplasma-addons/desktop_kdeplasmoids.po move summit/messages/kdeplasmoids/krunner_contacts.po summit/messages/kdeplasma-addons/krunner_contacts.po move summit/messages/kdeplasmoids/krunner_converterrunner.po summit/messages/kdeplasma-addons/krunner_converterrunner.po move summit/messages/kdeplasmoids/lancelot.po summit/messages/kdeplasma-addons/lancelot.po move summit/messages/kdeplasmoids/plasma_applet_binaryclock.po summit/messages/kdeplasma-addons/plasma_applet_binaryclock.po move summit/messages/kdeplasmoids/plasma_applet_calculator.po summit/messages/kdeplasma-addons/plasma_applet_calculator.po move summit/messages/kdeplasmoids/plasma_applet_comic.po summit/messages/kdeplasma-addons/plasma_applet_comic.po move summit/messages/kdeplasmoids/plasma_applet_dict.po summit/messages/kdeplasma-addons/plasma_applet_dict.po move summit/messages/kdeplasmoids/plasma_applet_fifteenPuzzle.po summit/messages/kdeplasma-addons/plasma_applet_fifteenPuzzle.po move summit/messages/kdeplasmoids/plasma_applet_fileWatcher.po summit/messages/kdeplasma-addons/plasma_applet_fileWatcher.po move summit/messages/kdeplasmoids/plasma_applet_frame.po summit/messages/kdeplasma-addons/plasma_applet_frame.po move summit/messages/kdeplasmoids/plasma_applet_fuzzy_clock.po summit/messages/kdeplasma-addons/plasma_applet_fuzzy_clock.po move summit/messages/kdeplasmoids/plasma_applet_kolourpicker.po summit/messages/kdeplasma-addons/plasma_applet_kolourpicker.po move summit/messages/kdeplasmoids/plasma_applet_luna.po summit/messages/kdeplasma-addons/plasma_applet_luna.po move summit/messages/kdeplasmoids/plasma_applet_notes.po summit/messages/kdeplasma-addons/plasma_applet_notes.po move summit/messages/kdeplasmoids/plasma_applet_nowplaying.po summit/messages/kdeplasma-addons/plasma_applet_nowplaying.po move summit/messages/kdeplasmoids/plasma_applet_twitter.po summit/messages/kdeplasma-addons/plasma_applet_twitter.po move summit/messages/kdeplasmoids/desktop_kdeplasmoids.po summit/messages/kdeplasma-addons/desktop_kdeplasma-addons.po move summit/messages/kdeplasma-addons/desktop_kdeplasmoids.po summit/messages/kdeplasma-addons/desktop_kdeplasma-addons.po # moved 2008-07-15 move summit/messages/playground-devtools/kdiff3.po summit/messages/extragear-utils/kdiff3.po move summit/docmessages/playground-devtools/kdiff3.po summit/docmessages/extragear-utils/kdiff3.po # Stale on 2008-07-15 delete summit/messages/extragear-base/konqsidebar_news.po delete summit/messages/kdeaccessibility/libKTTSD.po delete summit/messages/kdepim/kcmkontactnt.po delete summit/messages/kdepim/kfile_vcf.po delete summit/messages/kdeutils/kcharselectapplet.po delete summit/messages/playground-utils/kfile-chemical.po move summit/messages/playground-base/plasma_applet_timer.po summit/messages/kdereview/plasma_applet_timer.po move summit/messages/kdereview/plasma_applet_charselect.po summit/messages/kdeplasma-addons/plasma_applet_charselect.po move summit/docmessages/kdebase-runtime/kcontrol_windowmanagement.po summit/docmessages/kdebase-workspace/kcontrol_windowspecific.po delete summit/messages/extragear-network/kopete_bonjour.po delete summit/messages/kdenetwork/kopete_bonjour.po move summit/messages/playground-ioslaves/kio_perldoc.po summit/messages/kdesdk/kio_perldoc.po move summit/messages/kdereview/plasma_applet_timer.po summit/messages/kdeplasma-addons/plasma_applet_timer.po move summit/messages/playground-base/krunner_spellcheckrunner.po summit/messages/kdereview/krunner_spellcheckrunner.po #move summit/messages/kdebase/phonon-xine.po summit/messages/qt/phonon-xine.po move summit/messages/kdegraphics/kgamma.po summit/messages/kdegraphics/kcmkgamma.po move summit/messages/kdereview/krunner_spellcheckrunner.po summit/messages/kdeplasma-addons/krunner_spellcheckrunner.po delete summit/messages/playground-base/kdesktop.po move summit/messages/kdeadmin/knetworkconf.po summit/messages/kdeadmin/knetworkconfmodule.po move summit/messages/playground-utils/powerdevil.po summit/messages/kdereview/powerdevil.po move summit/messages/playground-ioslaves/kio_bookmarks.po summit/messages/kdereview/kio_bookmarks.po delete summit/messages/kdeplasma-addons/krunner_browserhistoryrunner.po delete summit/messages/playground-base/krunner_amarok.po delete summit/messages/playground-base/krunner_konquerorsessions.po delete summit/messages/playground-base/krunner_konsolesessions.po delete summit/messages/playground-base/krunner_pythonevalrunner.po move summit/docmessages/kdeadmin/knetworkconf.po summit/docmessages/kdeadmin/kcontrol_knetworkconf.po move summit/messages/playground-base/nepomuksearch.po summit/messages/kdereview/nepomuksearch.po move summit/messages/playground-base/plasma_applet_paste.po summit/messages/kdereview/plasma_applet_paste.po move summit/messages/playground-base/plasma_applet_news.po summit/messages/kdereview/plasma_applet_news.po move summit/messages/playground-base/plasma_applet_weatherstation.po summit/messages/kdereview/plasma_applet_weatherstation.po move summit/messages/kdereview/system-config-printer-kde.po summit/messages/kdeadmin/system-config-printer-kde.po move summit/messages/kdereview/kdeasciiquarium.po summit/messages/kdeartwork/kdeasciiquarium.po delete summit/messages/koffice/koshell.po delete summit/messages/koffice/kugar.po #move summit/messages/kdebase/kcmtaskbar.po summit/messages/playground-base/kcmtaskbar.po #copy summit/messages/kdereview/powerdevil.po summit/messages/kdebase/krunner_powerdevil.po #move summit/messages/kdereview/powerdevil.po summit/messages/kdebase/powerdevil.po move summit/docmessages/kdereview/powerdevil.po summit/docmessages/kdebase-workspace/kcontrol_powerdevil.po #move summit/messages/kdereview/nepomuksearch.po summit/messages/kdebase/nepomuksearch.po move summit/messages/playground-base/kio_nepomuksearch.po summit/messages/kdereview/kio_nepomuksearch.po move summit/messages/playground-graphics/kldraw.po summit/messages/playground-graphics/klotz.po move summit/messages/playground-devtools/kate-ctags-plugin.po summit/messages/kdereview/kate-ctags-plugin.po delete summit/messages/playground-base/plasma_applet_systembar.po move summit/messages/playground-base/krunner_katesessions.po summit/messages/kdereview/krunner_katesessions.po move summit/messages/playground-base/krunner_recentdocuments.po summit/messages/kdereview/krunner_recentdocuments.po move summit/docmessages/kdebase-runtime/kcontrol_kcmsmserver.po summit/docmessages/kdebase-workspace/kcontrol_kcmsmserver.po #move summit/messages/kdereview/kio_nepomuksearch.po summit/messages/kdebase/kio_nepomuksearch.po move summit/messages/playground-devtools/katebuild-plugin.po summit/messages/kdereview/katebuild-plugin.po move summit/messages/playground-base/plasma_applet_leavemsg.po summit/messages/kdereview/plasma_applet_leavemsg.po #move summit/messages/kdereview/kio_bookmarks.po summit/messages/kdebase/kio_bookmarks.po move summit/messages/playground-games/kapman.po summit/messages/kdereview/kapman.po #move summit/messages/playground-base/plasma_applet_qedje.po summit/messages/kdebase/plasma_appletscript_qedje.po #move summit/messages/kdereview/plasma_engine_rss.po summit/messages/kdebase/plasma_engine_rss.po move summit/messages/kdereview/plasma_applet_news.po summit/messages/kdeplasma-addons/plasma_applet_news.po move summit/messages/kdereview/plasma_applet_weatherstation.po summit/messages/kdeplasma-addons/plasma_applet_weatherstation.po delete summit/messages/playground-base/plasma_applet_fortune_teller.po delete summit/messages/playground-base/plasma_applet_welcome.po delete summit/messages/playground-base/plasma_applet_knet.po delete summit/messages/playground-base/plasma_applet_rot13.po delete summit/messages/playground-base/plasma_applet_notify.po move summit/messages/playground-games/killbots.po summit/messages/kdereview/killbots.po move summit/docmessages/playground-games/killbots.po summit/docmessages/kdereview/killbots.po move summit/messages/playground-base/plasma_applet_bball.po summit/messages/kdereview/plasma_applet_bball.po move summit/messages/playground-base/plasma_applet_pastebin.po summit/messages/kdereview/plasma_applet_pastebin.po move summit/messages/playground-base/plasma_applet_previewer.po summit/messages/kdereview/plasma_applet_previewer.po move summit/messages/playground-base/plasma_applet_rssnow.po summit/messages/kdereview/plasma_applet_rssnow.po move summit/messages/playground-base/plasma_applet_systemtray.po summit/messages/kdereview/plasma_applet_systemtray.po move summit/messages/kdereview/plasma_applet_paste.po summit/messages/kdeplasma-addons/plasma_applet_paste.po move summit/messages/playground-base/plasma_applet_hdd.po summit/messages/kdereview/plasma_applet_hdd.po move summit/messages/playground-base/plasma_applet_weather.po summit/messages/kdereview/plasma_applet_weather.po move summit/messages/playground-base/plasma_engine_systemmonitor.po summit/messages/kdereview/plasma_engine_systemmonitor.po move summit/messages/kdereview/kapman.po summit/messages/kdegames/kapman.po move move summit/docmessages/kdereview/kapman.po summit/docmessages/kdegames/kapman.po move move summit/docmessages/kdereview/kbreakout.po summit/docmessages/kdegames/kbreakout.po move summit/messages/kdereview/kate-ctags-plugin.po summit/messages/kdesdk/katebuild-plugin.po move summit/messages/kdereview/kate-ctags-plugin.po summit/messages/kdesdk/kate-ctags-plugin.po delete summit/messages/kdereview/plasma_applet_hdd.po #move summit/messages/kdereview/kcm_desktopthemedetails.po summit/messages/kdebase/kcm_desktopthemedetails.po #move summit/messages/kdereview/plasma_applet_system-monitor.po summit/messages/kdebase/plasma_applet_system-monitor.po #move summit/messages/kdereview/plasma_applet_systemtray.po summit/messages/kdebase/plasma_applet_systemtray.po #move summit/messages/kdereview/plasma_applet_webbrowser.po summit/messages/kdebase/plasma_applet_webbrowser.po #move summit/messages/kdereview/plasma_engine_systemmonitor.po summit/messages/kdebase/plasma_engine_systemmonitor.po #move summit/messages/kdereview/krunner_recentdocuments.po summit/messages/kdebase/krunner_recentdocuments.po move summit/messages/kdereview/plasma_applet_previewer.po summit/messages/kdeplasma-addons/plasma_applet_previewer.po move summit/messages/kdereview/plasma_applet_bball.po summit/messages/kdeplasma-addons/plasma_applet_bball.po move summit/messages/kdereview/plasma_applet_pastebin.po summit/messages/kdeplasma-addons/plasma_applet_pastebin.po move summit/messages/kdereview/plasma_applet_rssnow.po summit/messages/kdeplasma-addons/plasma_applet_rssnow.po move summit/messages/kdereview/plasma_applet_leavemsg.po summit/messages/kdeplasma-addons/plasma_applet_leavemsg.po move summit/messages/kdereview/krunner_katesessions.po summit/messages/kdeplasma-addons/krunner_katesessions.po move summit/messages/playground-base/plasma_applet_life.po summit/messages/kdeplasma-addons/plasma_applet_life.po delete summit/messages/playground-utils/knetworkmanager.po move summit/docmessages/playground-games/bomber.po summit/docmessages/kdereview/bomber.po move summit/messages/playground-games/bomber.po summit/messages/kdereview/bomber.po move summit/messages/kdereview/killbots.po summit/messages/kdegames/killbots.po move summit/docmessages/kdereview/killbots.po summit/docmessages/kdegames/killbots.po delete summit/messages/playground-base/plasma_applet_scriptedimage.po move summit/messages/playground-base/krunner_nepomukrunner.po summit/messages/playground-base/krunner_nepomukannotationrunner.po #move summit/messages/kdebase/kio_settings.po summit/messages/kdebase/kio_applications.po move summit/messages/playground-sysadmin/partitionmanager.po summit/messages/kdereview/partitionmanager.po move summit/docmessages/playground-sysadmin/partitionmanager.po summit/docmessages/kdereview/partitionmanager.po move summit/docmessages/playground-sysadmin/partitionmanager_appendix.po summit/docmessages/kdereview/partitionmanager_appendix.po move summit/docmessages/playground-sysadmin/partitionmanager_copyhowto.po summit/docmessages/kdereview/partitionmanager_copyhowto.po move summit/docmessages/playground-sysadmin/partitionmanager_credits.po summit/docmessages/kdereview/partitionmanager_credits.po move summit/docmessages/playground-sysadmin/partitionmanager_faq.po summit/docmessages/kdereview/partitionmanager_faq.po move summit/docmessages/playground-sysadmin/partitionmanager_glossary.po summit/docmessages/kdereview/partitionmanager_glossary.po move summit/docmessages/playground-sysadmin/partitionmanager_installoshowto.po summit/docmessages/kdereview/partitionmanager_installoshowto.po move summit/docmessages/playground-sysadmin/partitionmanager_introduction.po summit/docmessages/kdereview/partitionmanager_introduction.po move summit/docmessages/playground-sysadmin/partitionmanager_referencemanual.po summit/docmessages/kdereview/partitionmanager_referencemanual.po move summit/docmessages/playground-sysadmin/partitionmanager_resizehowto.po summit/docmessages/kdereview/partitionmanager_resizehowto.po move summit/docmessages/playground-sysadmin/partitionmanager_usermanual.po summit/docmessages/kdereview/partitionmanager_usermanual.po #move summit/messages/kdebase/libplasma.po summit/messages/kdelibs/libplasma.po move summit/docmessages/kdebase-runtime/kioslave_http.po summit/docmessages/kdelibs/kioslave_http.po move summit/docmessages/kdebase-runtime/kioslave_pop3.po summit/docmessages/kdepimlibs/kioslave_pop3.po move summit/docmessages/kdebase-runtime/kioslave_mailto.po summit/docmessages/kdelibs/kioslave_mailto.po move summit/docmessages/kdebase-runtime/kioslave_telnet.po summit/docmessages/kdelibs/kioslave_telnet.po move summit/docmessages/kdebase-runtime/kioslave_news.po summit/docmessages/kdepim/kioslave_news.po move summit/docmessages/kdebase-runtime/kioslave_file.po summit/docmessages/kdelibs/kioslave_file.po move summit/docmessages/kdebase-runtime/kioslave_smtp.po summit/docmessages/kdepimlibs/kioslave_smtp.po move summit/docmessages/kdebase-runtime/kioslave_ftp.po summit/docmessages/kdelibs/kioslave_ftp.po move summit/docmessages/kdebase-runtime/kioslave_ldap.po summit/docmessages/kdepimlibs/kioslave_ldap.po move summit/docmessages/kdebase-runtime/kioslave_gopher.po summit/docmessages/extragear-network/kioslave_gopher.po move summit/docmessages/kdebase-runtime/kioslave_data.po summit/docmessages/kdelibs/kioslave_data.po move summit/docmessages/kdebase-runtime/kioslave_imap.po summit/docmessages/kdepimlibs/kioslave_imap.po move summit/docmessages/kdebase-runtime/kioslave_help.po summit/docmessages/kdelibs/kioslave_help.po move summit/docmessages/kdebase-runtime/kioslave_webdav.po summit/docmessages/kdelibs/kioslave_webdav.po move summit/docmessages/kdebase-runtime/kioslave_nntp.po summit/docmessages/kdepimlibs/kioslave_nntp.po move summit/docmessages/kdebase-runtime/kioslave_rlogin.po summit/docmessages/kdelibs/kioslave_rlogin.po delete summit/docmessages/koffice/koshell.po delete summit/docmessages/koffice/kugar.po delete summit/docmessages/koffice/kugar_datadtd.po delete summit/docmessages/koffice/kugar_dataref.po delete summit/docmessages/koffice/kugar_designer.po delete summit/docmessages/koffice/kugar_progguide.po delete summit/docmessages/koffice/kugar_starting.po delete summit/docmessages/koffice/kugar_template-elements.po delete summit/docmessages/koffice/kugar_template.po delete summit/docmessages/koffice/kugar_templatedtd.po delete summit/docmessages/koffice/kugar_tutorial.po #move summit/messages/playground-base/plasma_applet_quicklaunch.po summit/messages/kdebase/plasma_applet_quicklaunch.po move summit/messages/playground-games/kgo.po summit/messages/playground-games/kigo.po move summit/messages/kdereview/bomber.po summit/messages/kdegames/bomber.po move summit/docmessages/kdereview/bombermove summit/docmessages/kdegames/bomber.po move summit/messages/kdereview/partitionmanagermove summit/messages/extragear-sysadmin/partitionmanager.po move summit/docmessages/kdereview/partitionmanager_appendixmove summit/docmessages/extragear-sysadmin/partitionmanager_appendix.po move summit/docmessages/kdereview/partitionmanager_copyhowtomove summit/docmessages/extragear-sysadmin/partitionmanager_copyhowto.po move summit/docmessages/kdereview/partitionmanager_credits.po summit/docmessages/extragear-sysadmin/partitionmanager_credits.po move summit/docmessages/kdereview/partitionmanager_faq.po summit/docmessages/extragear-sysadmin/partitionmanager_faq.po move summit/docmessages/kdereview/partitionmanager_glossary.po summit/docmessages/extragear-sysadmin/partitionmanager_glossary.po move summit/docmessages/kdereview/partitionmanager_installoshowto.po summit/docmessages/extragear-sysadmin/partitionmanager_installoshowto.po move summit/docmessages/kdereview/partitionmanager_introduction.po summit/docmessages/extragear-sysadmin/partitionmanager_introduction.po move summit/docmessages/kdereview/partitionmanager.po summit/docmessages/extragear-sysadmin/partitionmanager.po move summit/docmessages/kdereview/partitionmanager_referencemanual.po summit/docmessages/extragear-sysadmin/partitionmanager_referencemanual.po move summit/docmessages/kdereview/partitionmanager_resizehowto.po summit/docmessages/extragear-sysadmin/partitionmanager_resizehowto.po move summit/docmessages/kdereview/partitionmanager_usermanual.po summit/docmessages/extragear-sysadmin/partitionmanager_usermanual.po #delete summit/messages/kdebase/plasma_engine_systemmonitor.po copy summit/messages/kdeedu/step.po summit/messages/kdeedu/step_qt.po delete summit/docmessages/playground-utils/ksupplicant.po delete summit/docmessages/playground-utils/kro.po move summit/messages/kdeplasma-addons/plasma_applet_leavemsg.po summit/messages/kdeplasma-addons/plasma_applet_leavenote.po copy summit/messages/kdeedu/marble.po summit/messages/kdeedu/marble_qt.po copy summit/messages/kdeedu/kalzium.po summit/messages/kdeedu/kalzium_qt.po move summit/messages/playground-base/polkit-kde-authorization.po summit/messages/kdereview/polkit-kde-authorization.po move summit/messages/playground-base/policykit-kde.po summit/messages/kdereview/policykit-kde.po move summit/docmessages/kdesdk/scripts_man-zonetab2pot.1.po summit/docmessages/kdesdk/scripts_man-zonetab2pot.py.1.po move summit/messages/extragear-graphics/kipiplugin_smugmug.po summit/messages/extragear-graphics/kipiplugin_smugexport.po move summit/messages/kdepim/kcm_akonadi_resources.po summit/messages/kdepim/kcm_akonadi.po #move summit/messages/kdebase/plasma-mid.po summit/messages/playground-base/plasma-mid.po move summit/messages/kdereview/polkit-kde-authorization.po summit/messages/extragear-base/polkit-kde-authorization.po move summit/messages/kdereview/policykit-kde.po summit/messages/extragear-base/policykit-kde.po move summit/messages/playground-base/plasma_applet_weather.po summit/messages/kdereview/plasma_applet_weather.po delete summit/docmessages/playground-edu/kedulaunch.po move summit/messages/extragear-graphics/kipiplugin_smugexport.po summit/messages/extragear-graphics/kipiplugin_smug.po #move summit/messages/kdebase/krunner_recentdocuments.po summit/messages/kdebase/plasma_runner_recentdocuments.po #move summit/messages/kdebase/krunner_webshortcutsrunner.po summit/messages/kdebase/plasma_runner_webshortcuts.po #move summit/messages/kdebase/krunner_sessions.po summit/messages/kdebase/plasma_runner_sessions.po #move summit/messages/kdebase/krunner_shellrunner.po summit/messages/kdebase/plasma_runner_shell.po #move summit/messages/kdebase/krunner_powerdevil.po summit/messages/kdebase/plasma_runner_powerdevil.po #move summit/messages/kdebase/krunner_nepomuksearchrunner.po summit/messages/kdebase/plasma_runner_nepomuksearchrunner.po #move summit/messages/kdebase/krunner_locationsrunner.po summit/messages/kdebase/plasma_runner_locations.po move summit/messages/kdeplasma-addons/krunner_converterrunner.po summit/messages/kdeplasma-addons/plasma_runner_converterrunner.po move summit/messages/kdeplasma-addons/krunner_contacts.po summit/messages/kdeplasma-addons/plasma_runner_contacts.po move summit/messages/kdeplasma-addons/krunner_katesessions.po summit/messages/kdeplasma-addons/plasma_runner_katesessions.po move summit/messages/kdeplasma-addons/krunner_spellcheckrunner.po summit/messages/kdeplasma-addons/plasma_runner_spellcheckrunner.po delete summit/messages/playground-base/qs.po move summit/messages/playground-base/krunner_mediaplayer.po summit/messages/playground-base/plasma_runner_mediaplayer.po move summit/messages/playground-base/krunner_windowmanager.po summit/messages/playground-base/plasma_runner_windowmanager.po move summit/messages/playground-base/krunner_nepomukannotationrunner.po summit/messages/playground-base/plasma_runner_nepomukannotation.po move summit/messages/playground-base/plasma-applet-rememberthemilk.po summit/messages/playground-base/plasma_applet_rtm.po move summit/messages/kdevelop/kdevappwizard.po summit/messages/kdevplatform/kdevappwizard.po move summit/messages/kdevplatform/kdevbazaar.po summit/messages/playground-devtools/kdevbazaar.po move summit/messages/kdevplatform/kdevduchainviewer.po summit/messages/playground-devtools/kdevduchainviewer.po move summit/messages/kdevplatform/kdevteamwork.po summit/messages/playground-devtools/kdevteamwork.po delete summit/messages/playground-base/kfile_txt.po move summit/messages/extragear-graphics/kipiplugin_fbexport.po summit/messages/extragear-graphics/kipiplugin_fb.po # Summit catalogs left behind on 4.1->4.2 switch, 2009-02-01. #delete summit/messages/kdebase/krunner_bookmarksrunner.po #delete summit/messages/kdebase/krunner_calculatorrunner.po #delete summit/messages/kdebase/krunner_xesam.po #delete summit/messages/kdebase/plasma_engine_dict.po delete summit/messages/kdeedu/kpercentage.po delete summit/messages/kdekiosk/desktop_kdekiosk.po delete summit/messages/kdenetwork/plasma_applet_knewsticker.po delete summit/messages/kdepim/ktnef.po delete summit/messages/kdesdk/katemake.po delete summit/docmessages/kdebase-runtime/kioslave.po delete summit/docmessages/kdebase-runtime/kioslave_bzip.po delete summit/docmessages/kdebase-runtime/kioslave_https.po delete summit/docmessages/kdebase-runtime/kioslave_imaps.po delete summit/docmessages/kdebase-runtime/kioslave_lan.po delete summit/docmessages/kdebase-runtime/kioslave_mac.po delete summit/docmessages/kdebase-runtime/kioslave_mrml.po delete summit/docmessages/kdebase-runtime/kioslave_pop3s.po delete summit/docmessages/kdebase-runtime/kioslave_rlan.po delete summit/docmessages/kdebase-runtime/kioslave_webdavs.po delete summit/docmessages/kdeedu/kpercentage.po delete summit/docmessages/kdeedu/kpercentage_commands.po delete summit/docmessages/kdeedu/kpercentage_credits.po delete summit/docmessages/kdeedu/kpercentage_devel.po delete summit/docmessages/kdeedu/kpercentage_faq.po delete summit/docmessages/kdeedu/kpercentage_install.po delete summit/docmessages/kdeedu/kpercentage_introduction.po delete summit/docmessages/kdeedu/kpercentage_using.po delete summit/docmessages/kdeedu/kstars_man-celestrongps.1.po delete summit/docmessages/kdeedu/kstars_man-indi_celestron_gps.1.po delete summit/docmessages/kdeedu/kstars_man-indi_fli_ccd.1.po delete summit/docmessages/kdeedu/kstars_man-indi_lx200_16.1.po delete summit/docmessages/kdeedu/kstars_man-indi_lx200autostar.1.po delete summit/docmessages/kdeedu/kstars_man-indi_lx200classic.1.po delete summit/docmessages/kdeedu/kstars_man-indi_lx200generic.1.po delete summit/docmessages/kdeedu/kstars_man-indi_temma.1.po delete summit/docmessages/kdeedu/kstars_man-indi_v4l_generic.1.po delete summit/docmessages/kdeedu/kstars_man-indi_v4l_philips.1.po delete summit/docmessages/kdeedu/kstars_man-indiserver.1.po delete summit/docmessages/kdegraphics/kamera.po delete summit/docmessages/kdenetwork/knewsticker.po delete summit/docmessages/kdepim/ktnef.po #move summit/messages/kdebase/plasma.po summit/messages/kdebase/plasma-desktop.po delete summit/messages/playground-games/geonames.po move summit/messages/playground-graphics/okular_mobi.po summit/messages/kdereview/okular_mobi.po move summit/messages/kdepim/libkholidays.po summit/messages/kdepimlibs/libkholidays.po move summit/messages/kdereview/plasma_applet_weather.po summit/messages/extragear-base/plasma_applet_weather.po #merge summit/messages/kdebase/kcmcss.po summit/messages/kdebase/kcmkonqhtml.po move summit/docmessages/kdesdk/scripts_man-demangle.1.po summit/docmessages/kdesdk/kmtrace_man-demangle.1.po move summit/docmessages/kdesdk/scripts_man-po2xml.1.po summit/docmessages/kdesdk/poxml_man-po2xml.1.po move summit/docmessages/kdesdk/scripts_man-split2po.1.po summit/docmessages/kdesdk/poxml_man-split2po.1.po move summit/docmessages/kdesdk/scripts_man-swappo.1.po summit/docmessages/kdesdk/poxml_man-swappo.1.po move summit/docmessages/kdesdk/scripts_man-xml2pot.1.po summit/docmessages/kdesdk/poxml_man-xml2pot.1.po #move summit/messages/kdebase/plasma.po summit/messages/kdebase/plasma-desktop.po move summit/messages/extragear-base/plasma_applet_weather.po summit/messages/kdeplasma-addons/plasma_applet_weather.po move summit/messages/playground-base/plasma_applet_unitconverter.po summit/messages/kdereview/plasma_applet_unitconverter.po move summit/messages/playground-games/ktron.po summit/messages/kdereview/ktron.po move summit/docmessages/playground-games/ktron.po summit/docmessages/kdereview/ktron.po #move summit/messages/playground-base/kcm_platform.po summit/messages/kdebase/kcm_platform.po move summit/messages/playground-base/kcm_solid_actions.po summit/messages/kdereview/kcm_solid_actions.po move summit/messages/kdevelop/kdevcppdebugger.po summit/messages/kdevelop/kdevgdb.po move summit/messages/extragear-graphics/kipiplugin_simpleviewerexport.po summit/messages/extragear-graphics/kipiplugin_flashexport.po move summit/messages/extragear-graphics/kipiplugin_slideshow.po summit/messages/extragear-graphics/kipiplugin_advancedslideshow.po move summit/messages/extragear-graphics/kipiplugin_fb.po summit/messages/extragear-graphics/kipiplugin_facebook.po move summit/messages/kdereview/okular_mobi.po summit/messages/kdegraphics/okular_mobi.po move summit/messages/playground-base/translatoid.po summit/messages/playground-base/plasma_applet_translatoid.po delete summit/messages/extragear-graphics/kipiplugin_printwizard.po move summit/messages/playground-devtools/kdevqthelp.po summit/messages/kdevelop/kdevqthelp.po move summit/messages/kdereview/ktron.po summit/messages/kdegames/ktron.po move summit/docmessages/kdereview/ktron.po summit/docmessages/kdegames/ktron.po #move summit/messages/kdereview/kcm_solid_actions.po summit/messages/kdebase/kcm_solid_actions.po move summit/docmessages/kdereview/solid-actions.po summit/docmessages/kdebase-workspace/kcontrol_solid-actions.po move summit/messages/kdepim/kmobiletools.po summit/messages/playground-pim/kmobiletools.po move summit/messages/kdepim/kmobiletools_at_engine.po summit/messages/playground-pim/kmobiletools_at_engine.po move summit/docmessages/kdepim/kmobiletools.po summit/docmessages/playground-pim/kmobiletools.po delete summit/messages/kdepim/korn.po delete summit/docmessages/kdepim/korn.po move summit/messages/kdereview/plasma_applet_unitconverter.po summit/messages/kdeplasma-addons/plasma_applet_unitconverter.po move summit/messages/kdepim/kode.po summit/messages/playground-pim/kode.po move summit/messages/kdepim/kxforms.po summit/messages/playground-pim/kxforms.po delete summit/messages/playground-multimedia/brainzscanner.po delete summit/messages/extragear-base/desktop_extragear-base_plasma.po merge summit/messages/kdereview/kopete_skype.po summit/messages/kdenetwork/kopete.po move summit/messages/kdereview/plasma_applet_systemloadviewer.po summit/messages/kdeplasma-addons/plasma_applet_systemloadviewer.po delete summit/messages/kdevplatform/kdevdocumentation.po delete summit/messages/playground-devtools/kdevdocumentation.po delete summit/messages/playground-devtools/kdevdocviewer.po move summit/messages/playground-base/plasma_applet_kphone.po summit/messages/playground-base/plasma_applet_webapp.po delete summit/messages/playground-base/plasma_applet_kimpanel.po move summit/messages/playground-network/choqok.po summit/messages/kdereview/choqok.po move summit/messages/playground-base/kimpanel.po summit/messages/kdereview/kimpanel.po move summit/messages/playground-base/plasma_applet_bubblemon.po summit/messages/kdereview/plasma_applet_bubblemon.po move summit/messages/playground-graphics/kreative3d.po summit/messages/playground-graphics/solidkreator.po #move summit/messages/extragear-base/policykit-kde.po summit/messages/kdebase/policykit-kde.po #move summit/messages/extragear-base/polkit-kde-authorization.po summit/messages/kdebase/polkit-kde-authorization.po delete summit/messages/extragear-base/desktop_extragear-base_PolicyKit-kde.po move summit/docmessages/extragear-base/PolicyKit-kde_authorizationagent.po summit/docmessages/kdebase-workspace/PolicyKit-kde_authorizationagent.po move summit/docmessages/extragear-base/PolicyKit-kde_authorization.po summit/docmessages/kdebase-workspace/PolicyKit-kde_authorization.po move summit/docmessages/extragear-base/PolicyKit-kde_howitworks.po summit/docmessages/kdebase-workspace/PolicyKit-kde_howitworks.po move summit/docmessages/extragear-base/PolicyKit-kde_introduction.po summit/docmessages/kdebase-workspace/PolicyKit-kde_introduction.po move summit/docmessages/extragear-base/PolicyKit-kde.po summit/docmessages/kdebase-workspace/PolicyKit-kde.po move summit/messages/kdereview/choqok.po summit/messages/extragear-network/choqok.po move summit/docmessages/kdereview/choqok.po summit/docmessages/extragear-network/choqok.po delete summit/messages/playground-base/plasma_applet_scriptedhtml.po move summit/messages/playground-base/plasma_wallpaper_pattern.po summit/messages/kdeplasma-addons/plasma_wallpaper_pattern.po move summit/messages/playground-base/plasma_applet_magnifique.po summit/messages/kdereview/plasma_applet_magnifique.po move summit/messages/playground-edu/Rocs.po summit/messages/playground-edu/rocs.po move summit/messages/playground-base/plasma_wallpaper_marble.po summit/messages/kdeplasma-addons/plasma_wallpaper_marble.po merge summit/messages/koffice/kspreadinsertcalendar.po summit/messages/koffice/kspread_plugin_tool_calendar.po move summit/messages/playground-pim/akonadi_microblog_resource.po summit/messages/kdepim/akonadi_microblog_resource.po delete summit/messages/playground-pim/akonadi_rss_resource.po move summit/messages/playground-devtools/kdevclassbrowser.po summit/messages/kdevplatform/kdevclassbrowser.po merge summit/messages/kdevplatform/kdevvcscommon.po summit/messages/kdevplatform/kdevplatform.po move summit/messages/playground-devtools/kdevdebugger.po summit/messages/kdevelop/kdevdebugger.po move summit/messages/kdeartwork/plasma_wallpaper_weather.po summit/messages/kdeplasma-addons/plasma_wallpaper_weather.po move summit/messages/playground-base/plasma_wallpaper_weather.po summit/messages/kdeplasma-addons/plasma_wallpaper_weather.po move summit/messages/playground-base/plasma_wallpaper_virus.po summit/messages/kdeplasma-addons/plasma_wallpaper_virus.po move summit/messages/kdereview/plasma_applet_bubblemon.po summit/messages/kdeplasma-addons/plasma_applet_bubblemon.po delete summit/messages/playground-base/plasma_engine_ciav.po merge summit/messages/kdevelop/kdevdebugger.po summit/messages/kdevelop/kdevgdb.po delete summit/messages/extragear-multimedia/kfile_k3b.po delete summit/docmessages/playground-base/kat.po move summit/messages/playground-base/kcontrol4.po summit/messages/kdereview/kcontrol4.po move summit/messages/playground-base/plasma_wallpaper_mandelbrot.po summit/messages/kdereview/plasma_wallpaper_mandelbrot.po move summit/messages/kdereview/katimon.po summit/messages/extragear-utils/katimon.po move summit/messages/kdepimlibs/libpimtextedit.po summit/messages/kdepimlibs/libkpimtextedit.po move summit/messages/koffice/kspread_plugin_tool_calendar.po summit/messages/koffice/CalendarTool.po move summit/messages/playground-pim/akonadi_googledata_resource.po summit/messages/kdereview/akonadi_googledata_resource.po move summit/messages/playground-base/plasma_engine_metadata.po summit/messages/kdereview/plasma_engine_metadata.po move summit/messages/playground-utils/kcmlirc.po summit/messages/kdereview/kcmlirc.po move summit/messages/playground-utils/kdelirc.po summit/messages/kdereview/kdelirc.po move summit/messages/playground-utils/irkick.po summit/messages/kdereview/irkick.po move summit/docmessages/playground-utils/kdelirc_irkick.po summit/docmessages/kdereview/kdelirc_irkick.po move summit/docmessages/playground-utils/kdelirc_kcmlirc.po summit/docmessages/kdereview/kdelirc_kcmlirc.po move summit/messages/playground-base/plasma_applet_windowslist.po summit/messages/playground-base/plasma_applet_windowlist.po delete summit/messages/playground-base/plasma_applet_runcommand.po move summit/messages/extragear-multimedia/kaffeine4.po summit/messages/extragear-multimedia/kaffeine.po move summit/messages/playground-base/plasma_engine_attica.po summit/messages/kdereview/plasma_engine_ocs.po move summit/messages/kdereview/akonadi_gcal_resource.po summit/messages/extragear-pim/akonadi_gcal_resource.po move summit/messages/kdereview/akonadi_googledata_resource.po summit/messages/extragear-pim/akonadi_googledata_resource.po move summit/messages/playground-base/plasma_applet_peer.po summit/messages/playground-base/plasma_applet_opendesktop.po #merge summit/messages/kdereview/kcontrol4.po summit/messages/kdebase/systemsettings.po #merge summit/messages/kdereview/drkonqi2.po summit/messages/kdebase/drkonqi.po #move summit/messages/kdereview/plasma_engine_metadata.po summit/messages/kdebase/plasma_engine_metadata.po move summit/messages/kdereview/plasma_wallpaper_mandelbrot.po summit/messages/kdeplasma-addons/plasma_wallpaper_mandelbrot.po move summit/messages/playground-base/plasma_applet_opendesktop.po summit/messages/kdereview/plasma_applet_opendesktop.po move summit/messages/kdereview/kcmlirc.po summit/messages/kdeutils/kcmlirc.po move summit/messages/kdereview/kdelirc.po summit/messages/kdeutils/kdelirc.po move summit/messages/kdereview/irkick.po summit/messages/kdeutils/irkick.po move summit/docmessages/kdereview/kdelirc_irkick.po summit/docmessages/kdeutils/kdelirc_irkick.po move summit/docmessages/kdereview/kdelirc_kcmlirc.po summit/docmessages/kdeutils/kdelirc_kcmlirc.po move summit/docmessages/kdereview/networkkio.po summit/docmessages/kdebase-runtime/kioslave_network.po move summit/messages/playground-base/plasma_applet_rtm.po summit/messages/kdeplasma-addons/plasma_applet_rtm.po merge summit/messages/kdereview/plasma_applet_rtm.po summit/messages/kdeplasma-addons/plasma_applet_rtm.po move summit/messages/kdereview/plasma_engine_ocs.po summit/messages/kdeplasma-addons/plasma_engine_ocs.po move summit/messages/kdereview/plasma_applet_opendesktop.po summit/messages/kdeplasma-addons/plasma_applet_opendesktop.po move summit/messages/kdereview/plasma_applet_magnifique.po summit/messages/kdeplasma-addons/plasma_applet_magnifique.po move summit/messages/kdeaccessibility/kbstateapplet.po summit/messages/playground-base/kbstateapplet.po move summit/messages/kdereview/kbstateapplet.po summit/messages/playground-base/kbstateapplet.po move summit/messages/playground-multimedia/mplayerthumbs.po summit/messages/kdereview/mplayerthumbs.po move summit/messages/kdereview/mplayerthumbs.po summit/messages/kdemultimedia/mplayerthumbs.po move summit/messages/kdereview/mplayerthumbsconfig.po summit/messages/kdemultimedia/mplayerthumbsconfig.po move summit/messages/playground-base/notificationicon.po summit/messages/extragear-libs/knotificationitem-1.po move summit/messages/extragear-libs/knotificationitem-1.po summit/messages/kdelibs/knotificationitem-1.po delete summit/docmessages/playground-edu/mathematik.po move summit/messages/playground-office/tellico.po summit/messages/kdereview/tellico.po move summit/docmessages/playground-office/tellico.po summit/docmessages/kdereview/tellico.po move summit/docmessages/playground-office/tellico_advanced.po summit/docmessages/kdereview/tellico_advanced.po move summit/docmessages/playground-office/tellico_configuration.po summit/docmessages/kdereview/tellico_configuration.po move summit/docmessages/playground-office/tellico_details.po summit/docmessages/kdereview/tellico_details.po move summit/docmessages/playground-office/tellico_faqs.po summit/docmessages/kdereview/tellico_faqs.po move summit/docmessages/playground-office/tellico_fundamentals.po summit/docmessages/kdereview/tellico_fundamentals.po move summit/docmessages/playground-office/tellico_hacking.po summit/docmessages/kdereview/tellico_hacking.po move summit/docmessages/playground-office/tellico_importing-exporting.po summit/docmessages/kdereview/tellico_importing-exporting.po move summit/docmessages/playground-office/tellico_menus.po summit/docmessages/kdereview/tellico_menus.po move summit/messages/kdereview/tellico.po summit/messages/extragear-office/tellico.po move summit/docmessages/kdereview/tellico.po summit/docmessages/extragear-office/tellico.po move summit/docmessages/kdereview/tellico_advanced.po summit/docmessages/extragear-office/tellico_advanced.po move summit/docmessages/kdereview/tellico_configuration.po summit/docmessages/extragear-office/tellico_configuration.po move summit/docmessages/kdereview/tellico_details.po summit/docmessages/extragear-office/tellico_details.po move summit/docmessages/kdereview/tellico_faqs.po summit/docmessages/extragear-office/tellico_faqs.po move summit/docmessages/kdereview/tellico_fundamentals.po summit/docmessages/extragear-office/tellico_fundamentals.po move summit/docmessages/kdereview/tellico_hacking.po summit/docmessages/extragear-office/tellico_hacking.po move summit/docmessages/kdereview/tellico_importing-exporting.po summit/docmessages/extragear-office/tellico_importing-exporting.po move summit/docmessages/kdereview/tellico_menus.po summit/docmessages/extragear-office/tellico_menus.po move summit/messages/kdevelop/kdevqmakebuilder.po summit/messages/playground-devtools/kdevqmakebuilder.po move summit/messages/kdevelop/kdevqmake.po summit/messages/playground-devtools/kdevqmake.po move summit/messages/kdevelop/kdevqtdesigner.po summit/messages/playground-devtools/kdevqtdesigner.po delete summit/messages/extragear-multimedia/kaffeinegl.po delete summit/messages/playground-pim/pinentry-qt4.po move summit/docmessages/kdebase-workspace/kcontrol_nepomuk.po summit/docmessages/kdebase-runtime/kcontrol_nepomuk.po delete summit/messages/playground-base/kded_nepomukfilewatch.po delete summit/messages/playground-pim/akonadi_maildispatcher_agent.po move summit/messages/playground-office/skrooge.po summit/messages/kdereview/skrooge.po move summit/docmessages/playground-office/skrooge.po summit/docmessages/kdereview/skrooge.po move summit/messages/kdereview/krusader.po summit/messages/extragear-utils/krusader.po move summit/docmessages/kdereview/krusader_advanced-functions.po summit/docmessages/extragear-utils/krusader_advanced-functions.po move summit/docmessages/kdereview/krusader_archives.po summit/docmessages/extragear-utils/krusader_archives.po move summit/docmessages/kdereview/krusader_basic-functions.po summit/docmessages/extragear-utils/krusader_basic-functions.po move summit/docmessages/kdereview/krusader_bookmarks.po summit/docmessages/extragear-utils/krusader_bookmarks.po move summit/docmessages/kdereview/krusader_checksum.po summit/docmessages/extragear-utils/krusader_checksum.po move summit/docmessages/kdereview/krusader_compare.po summit/docmessages/extragear-utils/krusader_compare.po move summit/docmessages/kdereview/krusader_configuration-files.po summit/docmessages/extragear-utils//krusader_configuration-files.po move summit/docmessages/kdereview/krusader_credits-and-license.po summit/docmessages/extragear-utils/krusader_credits-and-license.po move summit/docmessages/kdereview/krusader_diskusage.po summit/docmessages/extragear-utils/krusader_diskusage.po move summit/docmessages/kdereview/krusader_editors-note.po summit/docmessages/extragear-utils/krusader_editors-note.po move summit/docmessages/kdereview/krusader_faq.po summit/docmessages/extragear-utils/krusader_faq.po move summit/docmessages/kdereview/krusader_features.po summit/docmessages/extragear-utils/krusader_features.po move summit/docmessages/kdereview/krusader_glossary.po summit/docmessages/extragear-utils/krusader_glossary.po move summit/docmessages/kdereview/krusader_help.po summit/docmessages/extragear-utils/krusader_help.po move summit/docmessages/kdereview/krusader_installation.po summit/docmessages/extragear-utils/krusader_installation.po move summit/docmessages/kdereview/krusader_introduction.po summit/docmessages/extragear-utils/krusader_introduction.po move summit/docmessages/kdereview/krusader_java.po summit/docmessages/extragear-utils/krusader_java.po move summit/docmessages/kdereview/krusader_keyboard-commands.po summit/docmessages/extragear-utils/krusader_keyboard-commands.po move summit/docmessages/kdereview/krusader_konfigurator.po summit/docmessages/extragear-utils/krusader_konfigurator.po move summit/docmessages/kdereview/krusader_krusader-tools.po summit/docmessages/extragear-utils/krusader_krusader-tools.po move summit/docmessages/kdereview/krusader_locate.po summit/docmessages/extragear-utils/krusader_locate.po move summit/docmessages/kdereview/krusader_menu-commands.po summit/docmessages/extragear-utils/krusader_menu-commands.po move summit/docmessages/kdereview/krusader_mount.po summit/docmessages/extragear-utils/krusader_mount.po move summit/docmessages/kdereview/krusader_mouse-commands.po summit/docmessages/extragear-utils/krusader_mouse-commands.po move summit/docmessages/kdereview/krusader_occupied-space.po summit/docmessages/extragear-utils/krusader_occupied-space.po move summit/docmessages/kdereview/krusader.po summit/docmessages/extragear-utils/krusader.po move summit/docmessages/kdereview/krusader_profiles.po summit/docmessages/extragear-utils/krusader_profiles.po move summit/docmessages/kdereview/krusader_release-overview.po summit/docmessages/extragear-utils/krusader_release-overview.po move summit/docmessages/kdereview/krusader_remote-connections.po summit/docmessages/extragear-utils/krusader_remote-connections.po move summit/docmessages/kdereview/krusader_search.po summit/docmessages/extragear-utils/krusader_search.po move summit/docmessages/kdereview/krusader_splitter.po summit/docmessages/extragear-utils/krusader_splitter.po move summit/docmessages/kdereview/krusader_synchronizer.po summit/docmessages/extragear-utils/krusader_synchronizer.po move summit/docmessages/kdereview/krusader_useractions.po summit/docmessages/extragear-utils/krusader_useractions.po move summit/docmessages/kdereview/krusader_useraction-xml.po summit/docmessages/extragear-utils/krusader_useraction-xml.po move summit/docmessages/kdereview/krusader_user-interface.po summit/docmessages/extragear-utils/krusader_user-interface.po move summit/docmessages/kdereview/krusader_vfs.po summit/docmessages/extragear-utils/krusader_vfs.po move summit/docmessages/kdereview/krusader_viewer-editor.po summit/docmessages/extragear-utils/krusader_viewer-editor.po # Summit catalogs left behind on 4.2->4.3 switch, 2009-06-25. delete summit/messages/kdenetwork/kfile_torrent.po delete summit/messages/kdepim/kres_featureplan.po delete summit/messages/kdeplasma-addons/plasma_applet_bluemarble.po delete summit/messages/playground-games/ktank.po delete summit/messages/playground-base/nepomuktagcloud.po delete summit/messages/playground-base/nepomuk_filesannotationplugin.po delete summit/messages/playground-base/nepomuk_imageregionannotationplugin.po delete summit/messages/playground-base/nepomuk_projectannotationplugin.po delete summit/messages/playground-base/nepomuk_tagsannotationplugin.po delete summit/messages/playground-base/nepomuk_ncoannotationplugin.po delete summit/messages/playground-pim/akonadi_pop3_resource.po delete summit/messages/playground-base/kded_knetworkmanager.po move summit/messages/kdereview/skrooge.po summit/messages/extragear-office/skrooge.po move summit/docmessages/kdereview/skrooge.po summit/docmessages/extragear-office/skrooge.po #move summit/messages/kdebase/plasma_scriptengine_ggl.po summit/messages/kdebase/plasma_appletscriptengine_googlegadget.po #move summit/messages/kdebase/plasma_appletscript_qedje.po summit/messages/kdebase/plasma_appletscriptengine_qedjescripts.po #move summit/messages/kdebase/plasma_containment_saverdesktop.po summit/messages/kdebase/plasma_applet_saverdesktop.po move summit/messages/kdeplasma-addons/plasma_applet_konsoleprofiles.po summit/messages/kdeplasma-addons/plasma_applet_konsoleprofilesapplet.po move summit/messages/kdeplasma-addons/plasma_applet_charselect.po summit/messages/kdeplasma-addons/plasma_applet_CharSelectApplet.po move summit/messages/kdeplasma-addons/plasma_applet_twitter.po summit/messages/kdeplasma-addons/plasma_applet_microblog.po move summit/messages/kdeplasma-addons/plasma_applet_dict.po summit/messages/kdeplasma-addons/plasma_applet_qstardict.po move summit/messages/kdeplasma-addons/plasma_applet_konqprofiles.po summit/messages/kdeplasma-addons/plasma_applet_konqprofilesapplet.po move summit/messages/kdeplasma-addons/plasma_applet_bball.po summit/messages/kdeplasma-addons/plasma_applet_BbalL.po copy summit/messages/kdepim/akonadi_kabc_resource.po summit/messages/kdepim/akonadi_kresourceassistant.po delete summit/messages/playground-pim/mailreader.po delete summit/docmessages/kdevelop/kdevelop_adv-build-management.po delete summit/docmessages/kdevelop/kdevelop_app-changelog.po delete summit/docmessages/kdevelop/kdevelop_app-files.po delete summit/docmessages/kdevelop/kdevelop_applicationwizard.po delete summit/docmessages/kdevelop/kdevelop_app-menu.po delete summit/docmessages/kdevelop/kdevelop_app-misc-info.po delete summit/docmessages/kdevelop/kdevelop_app-uimodes-examples.po delete summit/docmessages/kdevelop/kdevelop_class-browsers.po delete summit/docmessages/kdevelop/kdevelop_commands.po delete summit/docmessages/kdevelop/kdevelop_credits.po delete summit/docmessages/kdevelop/kdevelop_cvs.po delete summit/docmessages/kdevelop/kdevelop_debugger.po delete summit/docmessages/kdevelop/kdevelop_documentation.po delete summit/docmessages/kdevelop/kdevelop_editing.po delete summit/docmessages/kdevelop/kdevelop_file-browsers.po delete summit/docmessages/kdevelop/kdevelop_getting-started.po delete summit/docmessages/kdevelop/kdevelop_kdevelop-install.po delete summit/docmessages/kdevelop/kdevelop_kdevelop-scripting.po delete summit/docmessages/kdevelop/kdevelop_kdevelop-survey.po delete summit/docmessages/kdevelop/kdevelop_nutshell.po delete summit/docmessages/kdevelop/kdevelop_plugin-tools.po delete summit/docmessages/kdevelop/kdevelop.po delete summit/docmessages/kdevelop/kdevelop_project-advanced.po delete summit/docmessages/kdevelop/kdevelop_project-management.po delete summit/docmessages/kdevelop/kdevelop_setup.po delete summit/docmessages/kdevelop/kdevelop_survey-manual.po delete summit/docmessages/kdevelop/kdevelop_unixdev.po delete summit/docmessages/playground-office/kmymoney_views-outbox.po merge summit/messages/koffice/kplatoui.po summit/messages/koffice/kplatolibs.po merge summit/messages/koffice/kplatokernel.po summit/messages/koffice/kplatolibs.po merge summit/messages/koffice/kplatomodels.po summit/messages/koffice/kplatolibs.po delete summit/messages/playground-pim/krss.po copy summit/messages/extragear-graphics/digikam.po summit/messages/kdegraphics/libkexiv2.po move summit/messages/kdeplasma-addons/libconversion.po summit/messages/kdereview/libconversion.po move summit/messages/playground-base/KNetworkManager.po summit/messages/playground-base/knetworkmanager.po delete summit/messages/playground-base/packagestructuregenerator.po delete summit/messages/playground-base/libplasmagik.po delete summit/messages/playground-base/plasmagik.po delete summit/messages/kdeutils/libkastencontroller.po delete summit/messages/kdeutils/libkastencore.po copy summit/messages/kdeutils/okteta.po summit/messages/kdeutils/libkasten.po copy summit/messages/kdeutils/okteta.po summit/messages/kdeutils/liboktetakasten.po move summit/messages/playground-base/plasma_applet_plasmaboard.po summit/messages/kdereview/plasma_applet_plasmaboard.po move summit/messages/playground-base/plasma_applet_knowledgebase.po summit/messages/kdereview/plasma_applet_knowledgebase.po move summit/messages/playground-base/kcm_device_automounter.po summit/messages/kdereview/kcm_device_automounter.po move summit/messages/kdeutils/kcmlirc.po summit/messages/kdeutils/kcm_lirc.po move summit/messages/kdereview/plasma_applet_plasmaboard.po summit/messages/kdeplasma-addons/plasma_applet_plasmaboard.po delete summit/docmessages/playground-office/kmymoney_views-accounts.po delete summit/docmessages/playground-office/kmymoney_views-categories.po delete summit/docmessages/playground-office/kmymoney_views-home.po delete summit/docmessages/playground-office/kmymoney_views-institutions.po delete summit/docmessages/playground-office/kmymoney_views-investments.po delete summit/docmessages/playground-office/kmymoney_views-ledgers.po delete summit/docmessages/playground-office/kmymoney_views-payees.po delete summit/docmessages/playground-office/kmymoney_views-reports.po delete summit/docmessages/playground-office/kmymoney_views-schedules.po delete summit/messages/playground-base/kcm_desktoptheme.po #move summit/messages/kdebase/kded_phononserver.po summit/messages/kdebase/phononserver.po move summit/messages/playground-base/plasma_applet_qalculate.po summit/messages/kdereview/plasma_applet_qalculate.po move summit/messages/kdepim/akonadicontact.po summit/messages/kdepimlibs/akonadicontact.po #move summit/messages/playground-base/plasma_applet_searchbox.po summit/messages/kdebase/plasma_applet_searchbox.po #move summit/messages/playground-base/plasma_applet_currentappcontrol.po summit/messages/kdebase/plasma_applet_currentappcontrol.po #move summit/messages/playground-base/plasma-netbook.po summit/messages/kdebase/plasma-netbook.po delete summit/messages/playground-base/plasma-mid-appletbrowser.po merge summit/messages/kdelibs/knotificationitem-1.po summit/messages/kdelibs/kdelibs4.po merge summit/messages/kdelibs/knotificationitem.po summit/messages/kdelibs/kdelibs4.po move summit/messages/kdeedu/gasCalculator.po summit/messages/kdeedu/plasma_applet_gasCalculator.po move summit/messages/kdeedu/concentrationCalculator.po summit/messages/kdeedu/plasma_applet_concentrationCalculator.po move summit/messages/kdeedu/nuclearCalculator.po summit/messages/kdeedu/plasma_applet_nuclearCalculator.po merge summit/messages/playground-base/networkmanagement_pptpui.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/networkmanagement_openvpnui.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/networkmanagement_vpncui.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/kcm_networkmanagement.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/libknmui.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/libknmservice.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/playground-base/libknminternals.po summit/messages/playground-base/libknetworkmanager.po merge summit/messages/koffice/kformdesigner.po summit/messages/koffice/kexi.po move summit/messages/kdereview/libconversion.po summit/messages/kdelibs/libkunitconversion.po merge summit/messages/playground-network/kbluetooth4-devicemanager.po summit/messages/playground-network/kbluetooth4.po merge summit/messages/playground-network/kbluetooth4-wizard.po summit/messages/playground-network/kbluetooth4.po move summit/messages/playground-network/kbluetooth4.po summit/messages/playground-network/kbluetooth.po #move summit/messages/kdebase/plasma-shells-common.po summit/messages/kdebase/plasmagenericshell.po #move summit/messages/kdebase/plasma_engine_applicationjobs.po summit/messages/kdebase/plasma_engine_kuiserver.po move summit/messages/kdepim/kontactinterfaces.po summit/messages/kdepimlibs/kontactinterfaces.po move summit/messages/kdereview/plasma_applet_knowledgebase.po summit/messages/kdeplasma-addons/plasma_applet_knowledgebase.po delete summit/docmessages/playground-office/kmymoney_details-transactions.po move summit/messages/playground-edu/mathematik.po summit/messages/kdereview/mathematik.po move summit/docmessages/playground-edu/mathematik.po summit/docmessages/kdereview/mathematik.po move summit/messages/playground-base/plasma_krunner_kopete.po summit/messages/kdereview/plasma_krunner_kopete.po move summit/messages/kdereview/mathematik.po summit/messages/kdereview/cantor.po move summit/docmessages/kdereview/mathematik.po summit/docmessages/kdereview/cantor.po move summit/messages/playground-pim/blogilo.po summit/messages/kdereview/blogilo.po move summit/messages/kdereview/blogilo.po summit/messages/kdepim/blogilo.po move summit/messages/extragear-utils/kcmbeagle.po summit/messages/extragear-utils/kcmkerry.po #move summit/messages/kdebase/plasma_containment_sal.po summit/messages/kdebase/plasma_applet_sal.po #move summit/messages/kdebase/plasma_containment_newspaper.po summit/messages/kdebase/plasma_applet_newspaper.po move summit/messages/kdereview/plasma_krunner_kopete.po summit/messages/kdereview/plasma_runner_kopete.po #move summit/messages/kdebase/plasma-runner-windows.po summit/messages/kdebase/plasma_runner_windows.po move summit/messages/playground-base/plasma_applet_windowlist.po summit/messages/kdereview/plasma_applet_windowlist.po move summit/messages/playground-base/plasma_applet_adjustableclock.po summit/messages/kdereview/plasma_applet_adjustableclock.po move summit/messages/playground-base/plasma_applet_spellcheck.po summit/messages/kdereview/plasma_applet_spellcheck.po move summit/messages/extragear-graphics/kipiplugin_kioexport.po summit/messages/extragear-graphics/kipiplugin_kioexportimport.po move summit/messages/kdereview/plasma_applet_qalculate.po summit/messages/kdeplasma-addons/plasma_applet_qalculate.po move summit/messages/kdereview/cantor.po summit/messages/kdeedu/cantor.po move summit/docmessages/kdereview/cantor.po summit/docmessages/kdeedu/cantor.po move summit/messages/playground-games/granatier.po summit/messages/kdereview/granatier.po move summit/messages/playground-base/plasma-runner-kill.po summit/messages/kdereview/plasma-runner-kill.po copy summit/messages/kdepim/kmail.po summit/messages/kdepim/libmessagelist.po copy summit/messages/kdepim/kmail.po summit/messages/kdepim/libmessageviewer.po move summit/messages/kdevelop/kdevdocumentview.po summit/messages/kdevplatform/kdevdocumentview.po move summit/messages/kdevelop/kdevxtest.po summit/messages/playground-devtools/kdevxtest.po move summit/messages/kdevplatform/kdevgit.po summit/messages/playground-devtools/kdevgit.po move summit/messages/kdevelop/kdevcoverage.po summit/messages/playground-devtools/kdevcoverage.po move summit/messages/kdereview/plasma-runner-kill.po summit/messages/kdereview/plasma_runner_kill.po move summit/messages/kdevelop/kdevgrepview.po summit/messages/kdevplatform/kdevgrepview.po move summit/messages/kdereview/plasma_runner_amarok.po summit/messages/kdereview/plasma_runner_audioplayercontrol.po delete summit/messages/kdereview/plasma_applet_container.po move summit/messages/playground-games/kigo.po summit/messages/kdereview/kigo.po move summit/docmessages/playground-games/kigo.po summit/docmessages/kdereview/kigo.po move summit/messages/playground-base/kio_timeline.po summit/messages/kdereview/kio_timeline.po move summit/messages/kdereview/granatier.po summit/messages/kdegames/granatier.po move summit/docmessages/kdereview/granatier.po summit/docmessages/kdegames/granatier.po #move summit/messages/kdereview/plasma_runner_kill.po summit/messages/kdebase/plasma_runner_kill.po #move summit/messages/kdereview/kio_timeline.po summit/messages/kdebase/kio_timeline.po move summit/messages/playground-base/plasma_runner_wikipedia.po summit/messages/playground-base/plasma_runner_mediawiki.po delete summit/messages/playground-games/paladesign.po move summit/messages/playground-edu/rocs.po summit/messages/kdereview/rocs.po move summit/messages/kdereview/kigo.po summit/messages/kdegames/kigo.po move summit/docmessages/kdereview/kigo.po summit/docmessages/kdegames/kigo.po delete summit/messages/playground-base/plasma_runner_firefoxbookmarkrunner.po move summit/messages/playground-office/kmymoney2.po summit/messages/playground-office/kmymoney.po move summit/messages/playground-games/palapeli.po summit/messages/kdereview/palapeli.po merge summit/messages/koffice/KarbonDockersPlugin.po summit/messages/koffice/koffice-dockers.po move summit/messages/kdereview/rocs.po summit/messages/kdeedu/rocs.po move summit/docmessages/kdereview/rocs.po summit/docmessages/kdeedu/rocs.po move summit/messages/playground-base/plasma_runner_mediawiki.po summit/messages/kdereview/plasma_runner_mediawiki.po move summit/messages/playground-base/plasma_applet_networkmanagement.po summit/messages/kdereview/plasma_applet_networkmanagement.po move summit/messages/playground-base/knetworkmanager.po summit/messages/kdereview/knetworkmanager.po move summit/messages/playground-base/libknetworkmanager.po summit/messages/kdereview/libknetworkmanager.po move summit/messages/playground-base/plasma_applet_kdeobservatory.po summit/messages/kdereview/plasma_applet_kdeobservatory.po delete summit/docmessages/koffice/kword_a11y.po delete summit/docmessages/koffice/kword_basics.po delete summit/docmessages/koffice/kword_bookmarks.po delete summit/docmessages/koffice/kword_chapnumb.po delete summit/docmessages/koffice/kword_columns.po delete summit/docmessages/koffice/kword_doccomments.po delete summit/docmessages/koffice/kword_doclinks.po delete summit/docmessages/koffice/kword_docstruct.po delete summit/docmessages/koffice/kword_docvariables.po delete summit/docmessages/koffice/kword_editing.po delete summit/docmessages/koffice/kword_expressions.po delete summit/docmessages/koffice/kword_footendnotes.po delete summit/docmessages/koffice/kword_formatchar.po delete summit/docmessages/koffice/kword_formatframes.po delete summit/docmessages/koffice/kword_formatpara.po delete summit/docmessages/koffice/kword_formulas.po delete summit/docmessages/koffice/kword_frames.po delete summit/docmessages/koffice/kword_fundimentals.po delete summit/docmessages/koffice/kword_graphics.po delete summit/docmessages/koffice/kword_headerfooter.po delete summit/docmessages/koffice/kword_insertfile.po delete summit/docmessages/koffice/kword_kparts.po delete summit/docmessages/koffice/kword_lists.po delete summit/docmessages/koffice/kword_mailmerge.po delete summit/docmessages/koffice/kword_mbtb.po delete summit/docmessages/koffice/kword_migrating.po delete summit/docmessages/koffice/kword_opt.po delete summit/docmessages/koffice/kword_pageformat.po delete summit/docmessages/koffice/kword.po delete summit/docmessages/koffice/kword_storeprint.po delete summit/docmessages/koffice/kword_styles.po delete summit/docmessages/koffice/kword_table.po delete summit/docmessages/koffice/kword_tabstops.po delete summit/docmessages/koffice/kword_techinfo.po delete summit/docmessages/koffice/kword_templatecreation.po delete summit/docmessages/koffice/kword_toc.po delete summit/docmessages/koffice/kword_tutorial.po move summit/messages/kdevplatform/kdevmercurial.po summit/messages/playground-devtools/kdevmercurial.po move summit/messages/kdevelop/kdevvalgrind.po summit/messages/playground-devtools/kdevvalgrind.po move summit/docmessages/kdegraphics/kgamma.po summit/docmessages/kdegraphics/kcontrol_kgamma.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_libkipi.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_fraqtive.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_kst.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_ligature.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_showimg.po delete summit/messages/extragear-multimedia/desktop_extragear-multimedia_kdetv.po delete summit/messages/extragear-multimedia/desktop_extragear-multimedia_klicker.po delete summit/messages/extragear-network/desktop_extragear-network_kallers.po delete summit/messages/extragear-network/desktop_extragear-network_kchat.po delete summit/messages/extragear-network/desktop_extragear-network_kmyfirewall.po delete summit/messages/extragear-network/desktop_extragear-network_knetstats.po delete summit/messages/extragear-network/desktop_extragear-network_knetworkmanager.po delete summit/messages/extragear-network/desktop_extragear-network_kopete-bonjour.po delete summit/messages/extragear-network/desktop_extragear-network_ksmssend.po delete summit/messages/extragear-office/desktop_extragear-office_datakiosk.po delete summit/messages/extragear-pim/desktop_extragear-pim_kdebluetooth.po delete summit/messages/extragear-pim/desktop_extragear-pim_kfile-plugins.po delete summit/messages/extragear-pim/desktop_extragear-pim_kontact.po delete summit/messages/extragear-pim/desktop_extragear-pim_kpilot.po delete summit/messages/extragear-toys/desktop_extragear-toys_kfortune.po delete summit/messages/extragear-utils/desktop_extragear-utils_filelight.po delete summit/messages/extragear-utils/desktop_extragear-utils_guidance.po delete summit/messages/extragear-utils/desktop_extragear-utils_katapult.po delete summit/messages/extragear-utils/desktop_extragear-utils_kcfgcreator.po delete summit/messages/extragear-utils/desktop_extragear-utils_kcpuload.po delete summit/messages/extragear-utils/desktop_extragear-utils_kedit.po delete summit/messages/extragear-utils/desktop_extragear-utils_knetload.po delete summit/messages/extragear-utils/desktop_extragear-utils_ktranslator.po move summit/docmessages/kdebase-runtime/kcontrol_desktop.po summit/docmessages/kdebase-workspace/kcontrol_desktop.po move summit/messages/kdereview/plasma_applet_translatoid.po summit/messages/playground-base/plasma_applet_translatoid.po #move summit/messages/playground-base/kio_nepomuk.po summit/messages/kdebase/kio_nepomuk.po move summit/messages/kdereview/palapeli.po summit/messages/kdegames/palapeli.po move summit/docmessages/kdereview/palapeli.po summit/docmessages/kdegames/palapeli.po move summit/messages/kdereview/plasma_applet_kdeobservatory.po summit/messages/kdeplasma-addons/plasma_applet_kdeobservatory.po #move summit/messages/kdereview/plasma_runner_solid.po summit/messages/kdebase/plasma_runner_solid.po #move summit/messages/kdereview/kcm_device_automounter.po summit/messages/kdebase/kcm_device_automounter.po #move summit/messages/kdereview/plasma_applet_windowlist.po summit/messages/kdebase/plasma_applet_windowlist.po move summit/messages/kdereview/kimpanel.po summit/messages/kdeplasma-addons/kimpanel.po move summit/messages/kdereview/plasma_applet_spellcheck.po summit/messages/kdeplasma-addons/plasma_applet_spellcheck.po move summit/messages/kdereview/plasma_applet_webslice.po summit/messages/kdeplasma-addons/plasma_applet_webslice.po move summit/messages/kdereview/plasma_runner_audioplayercontrol.po summit/messages/kdeplasma-addons/plasma_runner_audioplayercontrol.po move summit/messages/kdereview/plasma_runner_kopete.po summit/messages/kdeplasma-addons/plasma_runner_kopete.po move summit/messages/kdereview/plasma_runner_mediawiki.po summit/messages/kdeplasma-addons/plasma_runner_mediawiki.po delete summit/messages/kdereview/plasma_applet_indicatordisplay.po move summit/messages/kdereview/kdevcontrolflowgraph.po summit/messages/playground-devtools/kdevcontrolflowgraph.po move summit/messages/playground-pim/akonadi_kforum_resource_resource.po summit/messages/playground-pim/akonadi_kdeforum_resource.po move summit/messages/kdevelop/kdevcmakebuilder.po summit/messages/extragear-sdk/kdevcmakebuilder.po move summit/messages/kdevelop/kdevcpp.po summit/messages/extragear-sdk/kdevcpp.po move summit/messages/kdevelop/kdevelop.po summit/messages/extragear-sdk/kdevelop.po move summit/messages/kdevelop/kdevgdb.po summit/messages/extragear-sdk/kdevgdb.po move summit/messages/kdevelop/kdevqthelp.po summit/messages/extragear-sdk/kdevqthelp.po move summit/messages/kdevelop/kdevcmake.po summit/messages/extragear-sdk/kdevcmake.po move summit/messages/kdevelop/kdevcustommake.po summit/messages/extragear-sdk/kdevcustommake.po move summit/messages/kdevelop/kdevformatters.po summit/messages/extragear-sdk/kdevformatters.po move summit/messages/kdevelop/kdevmakebuilder.po summit/messages/extragear-sdk/kdevmakebuilder.po move summit/messages/kdevplatform/kdevcvs.po summit/messages/extragear-sdk/kdevcvs.po move summit/messages/kdevplatform/kdevfilemanager.po summit/messages/extragear-sdk/kdevfilemanager.po move summit/messages/kdevplatform/kdevpatchreview.po summit/messages/extragear-sdk/kdevpatchreview.po move summit/messages/kdevplatform/kdevquickopen.po summit/messages/extragear-sdk/kdevquickopen.po move summit/messages/kdevplatform/kdevsubversion.po summit/messages/extragear-sdk/kdevsubversion.po move summit/messages/kdevplatform/kdevappwizard.po summit/messages/extragear-sdk/kdevappwizard.po move summit/messages/kdevplatform/kdevdocumentswitcher.po summit/messages/extragear-sdk/kdevdocumentswitcher.po move summit/messages/kdevplatform/kdevgenericprojectmanager.po summit/messages/extragear-sdk/kdevgenericprojectmanager.po move summit/messages/kdevplatform/kdevplatform.po summit/messages/extragear-sdk/kdevplatform.po move summit/messages/kdevplatform/kdevsnippet.po summit/messages/extragear-sdk/kdevsnippet.po move summit/messages/kdevplatform/kdevclassbrowser.po summit/messages/extragear-sdk/kdevclassbrowser.po move summit/messages/kdevplatform/kdevdocumentview.po summit/messages/extragear-sdk/kdevdocumentview.po move summit/messages/kdevplatform/kdevgrepview.po summit/messages/extragear-sdk/kdevgrepview.po move summit/messages/kdevplatform/kdevproblemreporter.po summit/messages/extragear-sdk/kdevproblemreporter.po move summit/messages/kdevplatform/kdevcontextbrowser.po summit/messages/extragear-sdk/kdevcontextbrowser.po move summit/messages/kdevplatform/kdevexecute.po summit/messages/extragear-sdk/kdevexecute.po move summit/messages/kdevplatform/kdevkonsole.po summit/messages/extragear-sdk/kdevkonsole.po move summit/messages/kdevplatform/kdevprojectmanagerview.po summit/messages/extragear-sdk/kdevprojectmanagerview.po move summit/messages/kdevplatform/kdevstandardoutputview.po summit/messages/extragear-sdk/kdevstandardoutputview.po move summit/messages/kdewebdev/kxsldbg.po summit/messages/extragear-sdk/kxsldbg.po move summit/messages/kdewebdev/quanta.po summit/messages/extragear-sdk/quanta.po move summit/docmessages/kdewebdev/kxsldbg_callstack.po summit/docmessages/extragear-sdk/kxsldbg_callstack.po move summit/docmessages/kdewebdev/kxsldbg_entities.po summit/docmessages/extragear-sdk/kxsldbg_entities.po move summit/docmessages/kdewebdev/kxsldbg_kxsldbg_configure.po summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_configure.po move summit/docmessages/kdewebdev/kxsldbg_kxsldbg_mainwindow.po summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_mainwindow.po move summit/docmessages/kdewebdev/kxsldbg.po summit/docmessages/extragear-sdk/kxsldbg.po move summit/docmessages/kdewebdev/kxsldbg_templates.po summit/docmessages/extragear-sdk/kxsldbg_templates.po move summit/docmessages/kdewebdev/kxsldbg_credits.po summit/docmessages/extragear-sdk/kxsldbg_credits.po move summit/docmessages/kdewebdev/kxsldbg_glossary.po summit/docmessages/extragear-sdk/kxsldbg_glossary.po move summit/docmessages/kdewebdev/kxsldbg_kxsldbg_inspector.po summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_inspector.po move summit/docmessages/kdewebdev/kxsldbg_kxsldbg_tools.po summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_tools.po move summit/docmessages/kdewebdev/kxsldbg_sources.po summit/docmessages/extragear-sdk/kxsldbg_sources.po move summit/docmessages/kdewebdev/kxsldbg_variables.po summit/docmessages/extragear-sdk/kxsldbg_variables.po move summit/docmessages/kdewebdev/xsldbg_commands.po summit/docmessages/extragear-sdk/xsldbg_commands.po move summit/docmessages/kdewebdev/xsldbg_credits.po summit/docmessages/extragear-sdk/xsldbg_credits.po move summit/docmessages/kdewebdev/xsldbg_introduction.po summit/docmessages/extragear-sdk/xsldbg_introduction.po move summit/docmessages/kdewebdev/xsldbg_man-xsldbg.1.po summit/docmessages/extragear-sdk/xsldbg_man-xsldbg.1.po move summit/docmessages/kdewebdev/xsldbg.po summit/docmessages/extragear-sdk/xsldbg.po move summit/docmessages/kdewebdev/xsldbg_usage.po summit/docmessages/extragear-sdk/xsldbg_usage.po move summit/docmessages/kdewebdev/quanta_adv-quanta.po summit/docmessages/extragear-sdk/quanta_adv-quanta.po move summit/docmessages/kdewebdev/quanta_debugging-quanta.po summit/docmessages/extragear-sdk/quanta_debugging-quanta.po move summit/docmessages/kdewebdev/quanta_glossary.po summit/docmessages/extragear-sdk/quanta_glossary.po move summit/docmessages/kdewebdev/quanta_man-quanta.1.po summit/docmessages/extragear-sdk/quanta_man-quanta.1.po move summit/docmessages/kdewebdev/quanta_quanta-menus.po summit/docmessages/extragear-sdk/quanta_quanta-menus.po move summit/docmessages/kdewebdev/quanta_config-quanta.po summit/docmessages/extragear-sdk/quanta_config-quanta.po move summit/docmessages/kdewebdev/quanta_extending-quanta.po summit/docmessages/extragear-sdk/quanta_extending-quanta.po move summit/docmessages/kdewebdev/quanta_installation.po summit/docmessages/extragear-sdk/quanta_installation.po move summit/docmessages/kdewebdev/quanta.po summit/docmessages/extragear-sdk/quanta.po move summit/docmessages/kdewebdev/quanta_quanta-projects.po summit/docmessages/extragear-sdk/quanta_quanta-projects.po move summit/docmessages/kdewebdev/quanta_credits-license.po summit/docmessages/extragear-sdk/quanta_credits-license.po move summit/docmessages/kdewebdev/quanta_fundamentals.po summit/docmessages/extragear-sdk/quanta_fundamentals.po move summit/docmessages/kdewebdev/quanta_introduction.po summit/docmessages/extragear-sdk/quanta_introduction.po move summit/docmessages/kdewebdev/quanta_q-and-a.po summit/docmessages/extragear-sdk/quanta_q-and-a.po move summit/docmessages/kdewebdev/quanta_working-with-quanta.po summit/docmessages/extragear-sdk/quanta_working-with-quanta.po move summit/messages/kdevelop/desktop_kdevelop.po summit/messages/extragear-sdk/desktop_extragear-sdk_kdevelop.po move summit/messages/kdevplatform/desktop_kdevplatform.po summit/messages/extragear-sdk/desktop_extragear-sdk_kdevplatform.po delete summit/messages/playground-office/printcheck.po copy summit/docmessages/kdebase-runtime/kcontrol_khtml.po summit/docmessages/kdebase-runtime/kcontrol_khtml-adblock.po copy summit/docmessages/kdebase-runtime/kcontrol_khtml.po summit/docmessages/kdebase-runtime/kcontrol_khtml-behavior.po copy summit/docmessages/kdebase-runtime/kcontrol_khtml.po summit/docmessages/kdebase-runtime/kcontrol_khtml-java-js.po copy summit/docmessages/kdebase-runtime/kcontrol_khtml.po summit/docmessages/kdebase-runtime/kcontrol_khtml-plugins.po merge summit/docmessages/kdebase-runtime/kcontrol_khtml.po summit/docmessages/kdebase-runtime/kcontrol_kcmcss.po merge summit/docmessages/kdebase-runtime/kcontrol_khtml_nsplugin.po summit/docmessages/kdebase-runtime/kcontrol_khtml-plugins.po delete summit/messages/kdereview/polkit-qt-1_qt.po copy summit/messages/kdelibs/kdelibs4.po summit/messages/kdelibs/kdecalendarsystems.po delete summit/docmessages/koffice/krita.po delete summit/docmessages/koffice/krita_commands-dialogs.po delete summit/docmessages/koffice/krita_commands-menus.po delete summit/docmessages/koffice/krita_commands-palettes.po delete summit/docmessages/koffice/krita_commands-toolbars.po delete summit/docmessages/koffice/krita_commands.po delete summit/docmessages/koffice/krita_credits.po delete summit/docmessages/koffice/krita_developers-plugins.po delete summit/docmessages/koffice/krita_developers-scripting.po delete summit/docmessages/koffice/krita_developers.po delete summit/docmessages/koffice/krita_faq.po delete summit/docmessages/koffice/krita_installation.po delete summit/docmessages/koffice/krita_introduction.po delete summit/docmessages/koffice/krita_settings.po delete summit/docmessages/koffice/krita_tutorial-quick-starts.po delete summit/docmessages/koffice/krita_tutorial-select-layer.po delete summit/docmessages/koffice/krita_tutorial-starting.po delete summit/docmessages/koffice/krita_tutorial-tablet.po delete summit/docmessages/koffice/krita_tutorial.po delete summit/docmessages/koffice/krita_using-colorspaces.po delete summit/docmessages/koffice/krita_using-filters.po delete summit/docmessages/koffice/krita_using-images.po delete summit/docmessages/koffice/krita_using-layers.po delete summit/docmessages/koffice/krita_using-selections.po delete summit/docmessages/koffice/krita_using-views.po move summit/messages/kdepim/kitchensync.po summit/messages/playground-pim/kitchensync.po move summit/messages/kdepim/kres_tvanytime.po summit/messages/playground-pim/kres_tvanytime.po move summit/messages/playground-base/kded_susefreespacenotifier.po summit/messages/playground-base/freespacenotifier.po delete summit/messages/playground-graphics/skanliteinterfaces.po #move summit/messages/kdebase/plasma_plasma-desktop_shell.po summit/messages/kdebase/plasma_runner_plasma-desktop.po move summit/messages/playground-devtools/kdevphp.po summit/messages/kdereview/kdevphp.po #move summit/messages/kdebase/kcmremotewidgets.po summit/messages/playground-base/kcmremotewidgets.po delete summit/messages/extragear-security/desktop_extragear-security_pwmanager.po move summit/messages/kdereview/polkit-kde-authentication-agent-1.po summit/messages/extragear-base/polkit-kde-authentication-agent-1.po merge summit/messages/kdevplatform/kdevsourceformatter.po summit/messages/extragear-sdk/kdevplatform.po merge summit/messages/extragear-sdk/kdevsourceformatter.po summit/messages/extragear-sdk/kdevplatform.po move summit/messages/kdereview/kdevphp.po summit/messages/extragear-sdk/kdevphp.po move summit/messages/kdereview/kdevphpdocs.po summit/messages/extragear-sdk/kdevphpdocs.po move summit/messages/kdepim/kpilot.po summit/messages/playground-pim/kpilot.po move summit/docmessages/kdepim/kpilot.po summit/docmessages/playground-pim/kpilot.po move summit/docmessages/kdepim/kpilot_configuration.po summit/docmessages/playground-pim/kpilot_configuration.po move summit/docmessages/kdepim/kpilot_faq.po summit/docmessages/playground-pim/kpilot_faq.po move summit/docmessages/kdepim/kpilot_sync.po summit/docmessages/playground-pim/kpilot_sync.po move summit/docmessages/kdepim/kpilot_usage.po summit/docmessages/playground-pim/kpilot_usage.po move summit/messages/playground-games/kmj.po summit/messages/playground-games/kajongg.po move summit/docmessages/playground-games/kmj.po summit/docmessages/playground-games/kajongg.po #delete summit/messages/kdebase/plasma_containmentactions_zoom.po move summit/messages/playground-libs/webkitkde.po summit/messages/kdereview/kwebkitpart.po move summit/messages/playground-libs/kwebkitpart.po summit/messages/kdereview/kwebkitpart.po move summit/messages/kdereview/kcm_devinfo.po summit/messages/kdereview/kcmdevinfo.po move summit/messages/kdeplasma-addons/kimpanel.po summit/messages/kdeplasma-addons/plasma_applet_kimpanel.po move summit/messages/kdereview/plasma_applet_bookmarks.po summit/messages/kdeplasma-addons/plasma_applet_bookmarks.po move summit/messages/kdepim/kmail_text_calendar_plugin.po summit/messages/kdepim/messageviewer_text_calendar_plugin.po move summit/messages/kdepim/kmail_text_vcard_plugin.po summit/messages/kdepim/messageviewer_text_vcard_plugin.po move summit/messages/kdepim/kmail_text_xdiff_plugin.po summit/messages/kdepim/messageviewer_text_xdiff_plugin.po merge summit/messages/kdepim/kcontactmanager.po summit/messages/kdepim/kaddressbook.po # Summit catalogs left behind on 4.3->4.4 switch, 2010-02-08. delete summit/messages/kdeadmin/kpackage.po #delete summit/messages/kdebase/kcmenergy.po #delete summit/messages/kdebase/nepomuksearch.po #delete summit/messages/kdebase/plasma_applet_desktop.po #delete summit/messages/kdebase/plasma_appletscriptengine_googlegadget.po delete summit/messages/kdegraphics/kfile_dvi.po delete summit/messages/kdepim/akonadi_distlist_resource.po delete summit/messages/kdepim/kabcakonadi.po delete summit/messages/kdepim/kcmkabconfig.po delete summit/messages/kdepim/kres_scalix.po delete summit/messages/kdepim/kres_xmlrpc.po delete summit/messages/kdeplasma-addons/libocsclient.po delete summit/messages/kdeplasma-addons/plasma_engine_ocs.po delete summit/messages/kdeutils/kdessh.po delete summit/docmessages/kdeadmin/kpackage.po delete summit/docmessages/kdebase-runtime/kcontrol_background.po delete summit/docmessages/kdebase-runtime/kcontrol_crypto.po delete summit/docmessages/kdebase-runtime/kcontrol_desktopbehavior.po delete summit/docmessages/kdebase-runtime/kcontrol_email.po delete summit/docmessages/kdebase-runtime/kcontrol_kcmkonsole.po delete summit/docmessages/kdebase-runtime/kcontrol_kcmtaskbar.po delete summit/docmessages/kdebase-runtime/kcontrol_panelappearance.po delete summit/docmessages/kdebase-runtime/kcontrol_panel.po delete summit/docmessages/kdebase-runtime/kcontrol_passwords.po delete summit/docmessages/kdebase-runtime/kcontrol_proxy_socks.po delete summit/docmessages/kdebase-workspace/kcontrol_energy.po delete summit/docmessages/kdepim/kaddressbook.po delete summit/docmessages/playground-pim/kpilot_configuration.po delete summit/docmessages/playground-pim/kpilot_faq.po delete summit/docmessages/playground-pim/kpilot.po delete summit/docmessages/playground-pim/kpilot_sync.po delete summit/docmessages/playground-pim/kpilot_usage.po merge summit/docmessages/kdebase-runtime/kcontrol_kdm.po summit/docmessages/kdebase-workspace/kdm.po delete summit/docmessages/kdebase-apps/kinfocenter_pcmcia.po move summit/messages/playground-games/kajongg.po summit/messages/kdereview/kajongg.po move summit/docmessages/playground-games/kajongg.po summit/docmessages/kdereview/kajongg.po move summit/messages/playground-multimedia/kmid2.po summit/messages/kdereview/kmid2.po move summit/docmessages/playground-multimedia/kmid2.po summit/docmessages/kdereview/kmid2.po move summit/messages/kdereview/kwebkitpart.po summit/messages/extragear-base/kwebkitpart.po delete summit/messages/extragear-utils/guidance-power-manager.po move summit/docmessages/kdebase-apps/kinfocenter_devices.po summit/docmessages/kdebase-workspace/kinfocenter_devices.po move summit/docmessages/kdebase-apps/kinfocenter_dma.po summit/docmessages/kdebase-workspace/kinfocenter_dma.po move summit/docmessages/kdebase-apps/kinfocenter_interrupts.po summit/docmessages/kdebase-workspace/kinfocenter_interrupts.po move summit/docmessages/kdebase-apps/kinfocenter_ioports.po summit/docmessages/kdebase-workspace/kinfocenter_ioports.po move summit/docmessages/kdebase-apps/kinfocenter_memory.po summit/docmessages/kdebase-workspace/kinfocenter_memory.po move summit/docmessages/kdebase-apps/kinfocenter_nics.po summit/docmessages/kdebase-workspace/kinfocenter_nics.po move summit/docmessages/kdebase-apps/kinfocenter_opengl.po summit/docmessages/kdebase-workspace/kinfocenter_opengl.po move summit/docmessages/kdebase-apps/kinfocenter_partitions.po summit/docmessages/kdebase-workspace/kinfocenter_partitions.po move summit/docmessages/kdebase-apps/kinfocenter_pci.po summit/docmessages/kdebase-workspace/kinfocenter_pci.po move summit/docmessages/kdebase-apps/kinfocenter.po summit/docmessages/kdebase-workspace/kinfocenter.po move summit/docmessages/kdebase-apps/kinfocenter_processor.po summit/docmessages/kdebase-workspace/kinfocenter_processor.po move summit/docmessages/kdebase-apps/kinfocenter_protocols.po summit/docmessages/kdebase-workspace/kinfocenter_protocols.po move summit/docmessages/kdebase-apps/kinfocenter_samba.po summit/docmessages/kdebase-workspace/kinfocenter_samba.po move summit/docmessages/kdebase-apps/kinfocenter_scsi.po summit/docmessages/kdebase-workspace/kinfocenter_scsi.po move summit/docmessages/kdebase-apps/kinfocenter_sound.po summit/docmessages/kdebase-workspace/kinfocenter_sound.po move summit/docmessages/kdebase-apps/kinfocenter_usb.po summit/docmessages/kdebase-workspace/kinfocenter_usb.po move summit/docmessages/kdebase-apps/kinfocenter_view1394.po summit/docmessages/kdebase-workspace/kinfocenter_view1394.po move summit/docmessages/kdebase-apps/kinfocenter_xserver.po summit/docmessages/kdebase-workspace/kinfocenter_xserver.po merge summit/docmessages/kdesdk/kate-plugins.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_xmlcheck.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_filetemplates.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_insertcommand.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_htmltools.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_openheader.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_textfilter.po summit/docmessages/kdesdk/kate_plugins.po merge summit/docmessages/kdesdk/kate-plugins_xmltools.po summit/docmessages/kdesdk/kate_plugins.po delete summit/docmessages/kdeadmin/lilo-config.po delete summit/docmessages/kdeadmin/ksysv.po delete summit/docmessages/kdeadmin/kdat.po #copy summit/messages/kdebase/kcmkonq.po summit/messages/kdebase/kcm_desktoppaths.po move summit/docmessages/kdebase-runtime/kcontrol_paths.po summit/docmessages/kdebase-workspace/kcontrol_paths.po #move summit/messages/kdereview/kcmdevinfo.po summit/messages/kdebase/kcmdevinfo.po move summit/docmessages/kdereview/kcm_devinfo.po summit/docmessages/kdebase-workspace/kinfocenter_devinfo.po move summit/docmessages/kdemultimedia/kscd.po summit/docmessages/kdemultimedia/kcontrol_cddbretrieval.po delete summit/messages/extragear-pim/mailody.po delete summit/docmessages/extragear-pim/mailody.po delete summit/messages/kdeadmin/kcmlilo.po delete summit/messages/kdeadmin/ksysv.po delete summit/messages/kdeadmin/kdat.po move summit/docmessages/kdebase-workspace/plasma.po summit/docmessages/kdebase-workspace/plasma-desktop.po move summit/docmessages/kdebase-workspace/plasma_tools_man-plasmaengineexplorer.1.po summit/docmessages/kdebase-workspace/plasma-desktop_tools_man-plasmaengineexplorer.1.po delete summit/docmessages/kdebase-runtime/kcontrol.po move summit/messages/kdereview/filelight.po summit/messages/playground-utils/filelight.po move summit/docmessages/kdereview/filelight.po summit/docmessages/playground-utils/filelight.po delete summit/messages/extragear-pim/desktop_extragear-pim_mailody.po delete summit/messages/extragear-multimedia/desktop_extragear-multimedia_kmid.old.po move summit/messages/playground-base/tablet.po summit/messages/playground-base/wacomtablet.po merge summit/messages/kdereview/kmid2.po summit/messages/extragear-multimedia/kmid.po merge summit/docmessages/kdereview/kmid2.po summit/docmessages/extragear-multimedia/kmid.po merge summit/docmessages/kdeutils/okteta_basics.po summit/docmessages/kdeutils/okteta.po merge summit/docmessages/kdeutils/okteta_credits.po summit/docmessages/kdeutils/okteta.po merge summit/docmessages/kdeutils/okteta_introduction.po summit/docmessages/kdeutils/okteta.po merge summit/docmessages/kdeutils/okteta_menu.po summit/docmessages/kdeutils/okteta.po merge summit/docmessages/kdeutils/okteta_tools.po summit/docmessages/kdeutils/okteta.po move summit/messages/playground-pim/akonadi_openxchange_resource.po summit/messages/playground-pim/akonadi_ldap_resource.po delete summit/messages/playground-games/koproperty.po delete summit/messages/playground-base/akonadi_attica_resource.po delete summit/messages/playground-base/attica.po move summit/docmessages/playground-base/kcm_tablet.po summit/docmessages/playground-base/kcontrol_kcm_tablet.po delete summit/docmessages/playground-office/kmymoney_details-hbciofx.po delete summit/docmessages/playground-office/kmymoney_details-integrity.po delete summit/docmessages/playground-office/kmymoney_otherdoc.po move summit/messages/playground-network/rekonq.po summit/messages/kdereview/rekonq.po move summit/messages/kdereview/kajongg.po summit/messages/kdegames/kajongg.po move summit/docmessages/kdereview/kajongg.po summit/docmessages/kdegames/kajongg.po delete summit/messages/extragear-base/crashesplugin.po move summit/messages/playground-pim/akonadi_davcalendar_resource.po summit/messages/kdereview/akonadi_davgroupware_resource.po move summit/messages/playground-base/plasma_runner_datetime.po summit/messages/kdereview/plasma_runner_datetime.po delete summit/messages/playground-network/akonadi_telepathycontacts_resource.po delete summit/messages/playground-network/decibel_addons.po delete summit/messages/playground-pim/kode.po delete summit/messages/playground-pim/kxforms.po #move summit/messages/kdebase/kappfinder.po summit/messages/extragear-base/kappfinder.po move summit/docmessages/kdebase-apps/kappfinder_man-kappfinder.1.po summit/docmessages/extragear-base/kappfinder_man-kappfinder.1.po move summit/messages/kdereview/krcdnotifieritem.po summit/messages/kdeutils/krcdnotifieritem.po move summit/messages/kdereview/libkremotecontrol.po summit/messages/kdeutils/libkremotecontrol.po move summit/messages/kdereview/kcm_remotecontrol.po summit/messages/kdeutils/kcm_remotecontrol.po move summit/messages/kdereview/kremotecontroldaemon.po summit/messages/kdeutils/kremotecontroldaemon.po move summit/docmessages/kdereview/kremotecontrol.po summit/docmessages/kdeutils/kremotecontrol.po merge summit/docmessages/kdeutils/kdelirc_kcmlirc.po summit/docmessages/kdeutils/kremotecontrol.po merge summit/docmessages/kdeutils/kdelirc_irkick.po summit/docmessages/kdeutils/kremotecontrol.po delete summit/messages/kdevelop/kde4app.po delete summit/messages/extragear-sdk/kde4app.po move summit/messages/playground-base/kinfocenter2.po summit/messages/kdereview/kinfocenter2.po copy summit/messages/extragear-network/ktorrent.po summit/messages/extragear-network/libktorrent.po move summit/messages/playground-games/mancala.po summit/messages/kdereview/mancala.po move summit/docmessages/playground-games/mancala.po summit/docmessages/kdereview/mancala.po move summit/messages/kdeplasma-addons/plasma_runner_charrunner.po summit/messages/kdeplasma-addons/plasma_runner_CharacterRunner.po #merge summit/messages/kdereview/kinfocenter2.po summit/messages/kdebase/kinfocenter.po #merge summit/messages/kdereview/kcm_infosummary.po summit/messages/kdebase/kcminfosum.po #move summit/messages/kdebase/kcminfosum.po summit/messages/kdebase/kcm_infosummary.po move summit/messages/kdesdk/katesnippetstng_editor.po summit/messages/kdesdk/ktesnippets_editor.po move summit/docmessages/kdeutils/kremotecontrol.po summit/docmessages/kdeutils/kcontrol_kremotecontrol.po move summit/messages/kdereview/akonadi_davgroupware_resource.po summit/messages/kdepim/akonadi_davgroupware_resource.po move summit/messages/playground-base/freespacenotifier.po summit/messages/kdereview/freespacenotifier.po delete summit/docmessages/koffice/kplato.po delete summit/docmessages/koffice/kplato_commands.po delete summit/docmessages/koffice/kplato_definitions.po delete summit/docmessages/koffice/kplato_mainwindow.po delete summit/docmessages/koffice/kplato_options.po delete summit/docmessages/koffice/kplato_wbs.po delete summit/messages/kdereview/kcm_nicview.po #delete summit/messages/kdebase/kcm_nicview.po #delete summit/messages/kdebase/kcmnicviewer.po move summit/messages/playground-base/plasma_runner_plasmamobileapps.po summit/messages/kdereview/plasma_runner_windowedwidgets.po move summit/messages/playground-base/plasma-standaloneplasmoids.po summit/messages/kdereview/plasma-windowed.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_digikamimageplugins.po delete summit/messages/extragear-utils/desktop_extragear-utils_guidance-power-manager.po delete summit/messages/playground-libs/desktop_playground-libs.po move summit/messages/kdereview/rekonq.po summit/messages/extragear-network/rekonq.po #move summit/messages/kdereview/freespacenotifier.po summit/messages/kdebase/freespacenotifier.po move summit/messages/extragear-sdk/quanta.po summit/messages/playground-sdk/quanta.po move summit/docmessages/extragear-sdk/quanta_adv-quanta.po summit/docmessages/playground-sdk/quanta_adv-quanta.po move summit/docmessages/extragear-sdk/quanta_debugging-quanta.po summit/docmessages/playground-sdk/quanta_debugging-quanta.po move summit/docmessages/extragear-sdk/quanta_glossary.po summit/docmessages/playground-sdk/quanta_glossary.po move summit/docmessages/extragear-sdk/quanta_man-quanta.1.po summit/docmessages/playground-sdk/quanta_man-quanta.1.po move summit/docmessages/extragear-sdk/quanta_quanta-menus.po summit/docmessages/playground-sdk/quanta_quanta-menus.po move summit/docmessages/extragear-sdk/quanta_config-quanta.po summit/docmessages/playground-sdk/quanta_config-quanta.po move summit/docmessages/extragear-sdk/quanta_extending-quanta.po summit/docmessages/playground-sdk/quanta_extending-quanta.po move summit/docmessages/extragear-sdk/quanta_installation.po summit/docmessages/playground-sdk/quanta_installation.po move summit/docmessages/extragear-sdk/quanta.po summit/docmessages/playground-sdk/quanta.po move summit/docmessages/extragear-sdk/quanta_quanta-projects.po summit/docmessages/playground-sdk/quanta_quanta-projects.po move summit/docmessages/extragear-sdk/quanta_credits-license.po summit/docmessages/playground-sdk/quanta_credits-license.po move summit/docmessages/extragear-sdk/quanta_fundamentals.po summit/docmessages/playground-sdk/quanta_fundamentals.po move summit/docmessages/extragear-sdk/quanta_introduction.po summit/docmessages/playground-sdk/quanta_introduction.po move summit/docmessages/extragear-sdk/quanta_q-and-a.po summit/docmessages/playground-sdk/quanta_q-and-a.po move summit/docmessages/extragear-sdk/quanta_working-with-quanta.po summit/docmessages/playground-sdk/quanta_working-with-quanta.po #move summit/messages/kdereview/plasma_runner_windowedwidgets.po summit/messages/kdebase/plasma_runner_windowedwidgets.po #move summit/messages/kdereview/plasma-windowed.po summit/messages/kdebase/plasma-windowed.po move summit/docmessages/playground-network/rekonq.po summit/docmessages/extragear-network/rekonq.po move summit/messages/kdereview/plasma_runner_datetime.po summit/messages/kdeplasma-addons/plasma_runner_datetime.po merge summit/messages/kdereview/plasma_applet_kdeobservatory.po summit/messages/kdeplasma-addons/plasma_applet_kdeobservatory.po move summit/messages/kdereview/plasma_engine_kdeobservatory.po summit/messages/kdeplasma-addons/plasma_engine_kdeobservatory.po move summit/messages/kdepim/kjots-mobile.po summit/messages/kdepim/notes-mobile.po delete summit/messages/playground-office/krone.po move summit/messages/kdeaccessibility/ksayit.po summit/messages/playground-accessibility/ksayit.po move summit/messages/kdereview/desktop_kdereview_rekonq.po summit/messages/extragear-network/desktop_extragear-network_rekonq.po move summit/messages/kdeaccessibility/kttsd.po summit/messages/kdeaccessibility/jovie.po move summit/docmessages/kdeaccessibility/kttsd.po summit/docmessages/kdeaccessibility/jovie.po delete summit/messages/playground-base/nepomuklinker.po delete summit/messages/playground-base/tasktop.po move summit/messages/playground-office/kmymoney.po summit/messages/kdereview/kmymoney.po move summit/docmessages/playground-office/kmymoney_whatsnew.po summit/docmessages/kdereview/kmymoney_whatsnew.po move summit/docmessages/playground-office/kmymoney_details-investments.po summit/docmessages/kdereview/kmymoney_details-investments.po move summit/docmessages/playground-office/kmymoney_details-schedules.po summit/docmessages/kdereview/kmymoney_details-schedules.po move summit/docmessages/playground-office/kmymoney_makemostof.po summit/docmessages/kdereview/kmymoney_makemostof.po move summit/docmessages/playground-office/kmymoney_firsttime.po summit/docmessages/kdereview/kmymoney_firsttime.po move summit/docmessages/playground-office/kmymoney.po summit/docmessages/kdereview/kmymoney.po move summit/docmessages/playground-office/kmymoney_details-widgets.po summit/docmessages/kdereview/kmymoney_details-widgets.po move summit/docmessages/playground-office/kmymoney_credits.po summit/docmessages/kdereview/kmymoney_credits.po move summit/docmessages/playground-office/kmymoney_details-payees.po summit/docmessages/kdereview/kmymoney_details-payees.po move summit/docmessages/playground-office/kmymoney_details-institutions.po summit/docmessages/kdereview/kmymoney_details-institutions.po move summit/docmessages/playground-office/kmymoney_details-ledgers.po summit/docmessages/kdereview/kmymoney_details-ledgers.po move summit/docmessages/playground-office/kmymoney_details-budgets.po summit/docmessages/kdereview/kmymoney_details-budgets.po move summit/docmessages/playground-office/kmymoney_man-kmymoney.1.po summit/docmessages/kdereview/kmymoney_man-kmymoney.1.po move summit/docmessages/playground-office/kmymoney_details-loans.po summit/docmessages/kdereview/kmymoney_details-loans.po move summit/docmessages/playground-office/kmymoney_details-reports.po summit/docmessages/kdereview/kmymoney_details-reports.po move summit/docmessages/playground-office/kmymoney_details-files.po summit/docmessages/kdereview/kmymoney_details-files.po move summit/docmessages/playground-office/kmymoney_details-currencies.po summit/docmessages/kdereview/kmymoney_details-currencies.po move summit/docmessages/playground-office/kmymoney_details-accounts.po summit/docmessages/kdereview/kmymoney_details-accounts.po move summit/docmessages/playground-office/kmymoney_details-categories.po summit/docmessages/kdereview/kmymoney_details-categories.po move summit/docmessages/playground-office/kmymoney_introduction.po summit/docmessages/kdereview/kmymoney_introduction.po move summit/docmessages/playground-office/kmymoney_details-database.po summit/docmessages/kdereview/kmymoney_details-database.po move summit/docmessages/playground-office/kmymoney_details-settings.po summit/docmessages/kdereview/kmymoney_details-settings.po move summit/docmessages/playground-office/kmymoney_details-reconciliation.po summit/docmessages/kdereview/kmymoney_details-reconciliation.po move summit/docmessages/playground-office/kmymoney_details-formats.po summit/docmessages/kdereview/kmymoney_details-formats.po move summit/docmessages/playground-office/kmymoney_details-impexp.po summit/docmessages/kdereview/kmymoney_details-impexp.po move summit/docmessages/playground-office/kmymoney_details-search.po summit/docmessages/kdereview/kmymoney_details-search.po move summit/docmessages/playground-office/kmymoney_details-forecast.po summit/docmessages/kdereview/kmymoney_details-forecast.po move summit/docmessages/playground-office/kmymoney_reference.po summit/docmessages/kdereview/kmymoney_reference.po delete summit/messages/playground-base/khtml_nepomukannotation.po merge summit/docmessages/kdebase-workspace/kinfocenter_devinfo.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_dma.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_infosummary.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_interrupts.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_ioports.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_memory.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_nics.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_opengl.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_pci.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_samba.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_scsi.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_usb.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_view1394.po summit/docmessages/kdebase-workspace/kinfocenter.po merge summit/docmessages/kdebase-workspace/kinfocenter_xserver.po summit/docmessages/kdebase-workspace/kinfocenter.po move summit/messages/kdereview/kmymoney.po summit/messages/extragear-office/kmymoney.po move summit/docmessages/kdereview/kmymoney_whatsnew.po summit/docmessages/extragear-office/kmymoney_whatsnew.po move summit/docmessages/kdereview/kmymoney_details-investments.po summit/docmessages/extragear-office/kmymoney_details-investments.po move summit/docmessages/kdereview/kmymoney_details-schedules.po summit/docmessages/extragear-office/kmymoney_details-schedules.po move summit/docmessages/kdereview/kmymoney_makemostof.po summit/docmessages/extragear-office/kmymoney_makemostof.po move summit/docmessages/kdereview/kmymoney_firsttime.po summit/docmessages/extragear-office/kmymoney_firsttime.po move summit/docmessages/kdereview/kmymoney.po summit/docmessages/extragear-office/kmymoney.po move summit/docmessages/kdereview/kmymoney_details-widgets.po summit/docmessages/extragear-office/kmymoney_details-widgets.po move summit/docmessages/kdereview/kmymoney_credits.po summit/docmessages/extragear-office/kmymoney_credits.po move summit/docmessages/kdereview/kmymoney_details-payees.po summit/docmessages/extragear-office/kmymoney_details-payees.po move summit/docmessages/kdereview/kmymoney_details-institutions.po summit/docmessages/extragear-office/kmymoney_details-institutions.po move summit/docmessages/kdereview/kmymoney_details-ledgers.po summit/docmessages/extragear-office/kmymoney_details-ledgers.po move summit/docmessages/kdereview/kmymoney_details-budgets.po summit/docmessages/extragear-office/kmymoney_details-budgets.po move summit/docmessages/kdereview/kmymoney_man-kmymoney.1.po summit/docmessages/extragear-office/kmymoney_man-kmymoney.1.po move summit/docmessages/kdereview/kmymoney_details-loans.po summit/docmessages/extragear-office/kmymoney_details-loans.po move summit/docmessages/kdereview/kmymoney_details-reports.po summit/docmessages/extragear-office/kmymoney_details-reports.po move summit/docmessages/kdereview/kmymoney_details-files.po summit/docmessages/extragear-office/kmymoney_details-files.po move summit/docmessages/kdereview/kmymoney_details-currencies.po summit/docmessages/extragear-office/kmymoney_details-currencies.po move summit/docmessages/kdereview/kmymoney_details-accounts.po summit/docmessages/extragear-office/kmymoney_details-accounts.po move summit/docmessages/kdereview/kmymoney_details-categories.po summit/docmessages/extragear-office/kmymoney_details-categories.po move summit/docmessages/kdereview/kmymoney_introduction.po summit/docmessages/extragear-office/kmymoney_introduction.po move summit/docmessages/kdereview/kmymoney_details-database.po summit/docmessages/extragear-office/kmymoney_details-database.po move summit/docmessages/kdereview/kmymoney_details-settings.po summit/docmessages/extragear-office/kmymoney_details-settings.po move summit/docmessages/kdereview/kmymoney_details-reconciliation.po summit/docmessages/extragear-office/kmymoney_details-reconciliation.po move summit/docmessages/kdereview/kmymoney_details-formats.po summit/docmessages/extragear-office/kmymoney_details-formats.po move summit/docmessages/kdereview/kmymoney_details-impexp.po summit/docmessages/extragear-office/kmymoney_details-impexp.po move summit/docmessages/kdereview/kmymoney_details-search.po summit/docmessages/extragear-office/kmymoney_details-search.po move summit/docmessages/kdereview/kmymoney_details-forecast.po summit/docmessages/extragear-office/kmymoney_details-forecast.po move summit/docmessages/kdereview/kmymoney_reference.po summit/docmessages/extragear-office/kmymoney_reference.po move summit/messages/extragear-sdk/kdevupload.po summit/messages/playground-sdk/kdevupload.po move summit/messages/playground-devtools/kdevcrossfire.po summit/messages/playground-sdk/kdevcrossfire.po move summit/messages/playground-devtools/kdevexecutebrowser.po summit/messages/playground-sdk/kdevexecutebrowser.po move summit/messages/playground-devtools/kdevexecutescript.po summit/messages/playground-sdk/kdevexecutescript.po move summit/messages/playground-devtools/kdevxdebug.po summit/messages/playground-sdk/kdevxdebug.po move summit/messages/playground-devtools/kdevxml.po summit/messages/playground-sdk/kdevxml.po move summit/messages/playground-devtools/kdevcontrolflowgraph.po summit/messages/kdereview/kdevcontrolflowgraph.po delete summit/messages/playground-base/plasma_runner_windowmanager.po move summit/messages/kdepim/kdgantt.po summit/messages/koffice/kdgantt.po delete summit/messages/playground-libs/muon.po move summit/messages/playground-libs/qapt-batch.po summit/messages/playground-libs/qaptbatch.po delete summit/messages/playground-libs/qapttest.po # Summit catalogs left behind on 4.4->4.5 switch, 2010-07-02. #delete summit/messages/kdebase/kcmioslaveinfo.po #delete summit/messages/kdebase/kcm_partition.po #delete summit/messages/kdebase/kcmsolidproc.po delete summit/messages/kdeedu/kalzium_qt.po delete summit/messages/kdepim/kabc_slox.po delete summit/messages/kdepim/kdepimresources.po delete summit/messages/kdepim/kres_birthday.po delete summit/messages/kdepim/kres_groupware.po delete summit/messages/kdepim/kres_kolab.po delete summit/messages/kdesdk/katehtmltools.po delete summit/messages/kdesdk/katepybrowse.po delete summit/messages/kdesdk/katesnippets.po delete summit/messages/kdetoys/kweather.po delete summit/messages/kdeutils/irkick.po delete summit/messages/kdeutils/kcm_lirc.po delete summit/messages/kdeutils/kdelirc.po delete summit/docmessages/kdebase-runtime/faq_about.po delete summit/docmessages/kdebase-runtime/faq_configkde.po delete summit/docmessages/kdebase-runtime/faq_contrib.po delete summit/docmessages/kdebase-runtime/faq_desktop.po delete summit/docmessages/kdebase-runtime/faq_filemng.po delete summit/docmessages/kdebase-runtime/faq_getkde.po delete summit/docmessages/kdebase-runtime/faq_install.po delete summit/docmessages/kdebase-runtime/faq_intro.po delete summit/docmessages/kdebase-runtime/faq_kdeapps.po delete summit/docmessages/kdebase-runtime/faq_misc.po delete summit/docmessages/kdebase-runtime/faq_moreinfo.po delete summit/docmessages/kdebase-runtime/faq_nonkdeapps.po delete summit/docmessages/kdebase-runtime/faq_notrelated.po delete summit/docmessages/kdebase-runtime/faq_panel.po delete summit/docmessages/kdebase-runtime/faq.po delete summit/docmessages/kdebase-runtime/faq_qt.po delete summit/docmessages/kdebase-runtime/faq_questions.po delete summit/docmessages/kdebase-runtime/faq_sound.po delete summit/docmessages/kdebase-runtime/faq_tips.po delete summit/docmessages/kdebase-runtime/faq_webbrowse.po delete summit/docmessages/kdebase-runtime/faq_winmng.po delete summit/docmessages/kdebase-runtime/khelpcenter_contact.po delete summit/docmessages/kdebase-runtime/khelpcenter_help.po delete summit/docmessages/kdebase-runtime/khelpcenter_support.po delete summit/docmessages/kdebase-runtime/khelpcenter_welcome.po delete summit/docmessages/kdebase-runtime/khelpcenter_whatiskde.po delete summit/docmessages/kdebase-runtime/quickstart.po delete summit/docmessages/kdebase-runtime/userguide_accessibility.po delete summit/docmessages/kdebase-runtime/userguide_base-kde-applications.po delete summit/docmessages/kdebase-runtime/userguide_browser-fine-tuning.po delete summit/docmessages/kdebase-runtime/userguide_burning-cds.po delete summit/docmessages/kdebase-runtime/userguide_control-center.po delete summit/docmessages/kdebase-runtime/userguide_creating-graphics.po delete summit/docmessages/kdebase-runtime/userguide_credits-and-license.po delete summit/docmessages/kdebase-runtime/userguide_customizing-desktop.po delete summit/docmessages/kdebase-runtime/userguide_email.po delete summit/docmessages/kdebase-runtime/userguide_extragear-applications.po delete summit/docmessages/kdebase-runtime/userguide_file-sharing.po delete summit/docmessages/kdebase-runtime/userguide_font-installation.po delete summit/docmessages/kdebase-runtime/userguide_getting-help.po delete summit/docmessages/kdebase-runtime/userguide_glossary.po delete summit/docmessages/kdebase-runtime/userguide_groupware-kontact.po delete summit/docmessages/kdebase-runtime/userguide_internet-shortcuts.po delete summit/docmessages/kdebase-runtime/userguide_kde-as-root.po delete summit/docmessages/kdebase-runtime/userguide_kde-edutainment.po delete summit/docmessages/kdebase-runtime/userguide_kde-for-admins.po delete summit/docmessages/kdebase-runtime/userguide_kde-office.po delete summit/docmessages/kdebase-runtime/userguide_konsole-intro.po delete summit/docmessages/kdebase-runtime/userguide_messaging-intro.po delete summit/docmessages/kdebase-runtime/userguide_migrator-applications.po delete summit/docmessages/kdebase-runtime/userguide_migrator-dictionary.po delete summit/docmessages/kdebase-runtime/userguide_net-connection-setup.po delete summit/docmessages/kdebase-runtime/userguide_networking-with-windows.po delete summit/docmessages/kdebase-runtime/userguide_panel-and-desktop.po delete summit/docmessages/kdebase-runtime/userguide_pdf-files.po delete summit/docmessages/kdebase-runtime/userguide_playing-audiocds.po delete summit/docmessages/kdebase-runtime/userguide_playing-movies.po delete summit/docmessages/kdebase-runtime/userguide_playing-music.po delete summit/docmessages/kdebase-runtime/userguide.po delete summit/docmessages/kdebase-runtime/userguide_printer-setup.po delete summit/docmessages/kdebase-runtime/userguide_printing-from-apps.po delete summit/docmessages/kdebase-runtime/userguide_programs-and-documents.po delete summit/docmessages/kdebase-runtime/userguide_programs-controlling.po delete summit/docmessages/kdebase-runtime/userguide_removable-disks.po delete summit/docmessages/kdebase-runtime/userguide_screen-captures.po delete summit/docmessages/kdebase-runtime/userguide_shared-sessions.po delete summit/docmessages/kdebase-runtime/userguide_standard-menu-entries.po delete summit/docmessages/kdebase-runtime/userguide_switching-sessions.po delete summit/docmessages/kdebase-runtime/userguide_the-filemanager.po delete summit/docmessages/kdebase-runtime/userguide_troubleshooting-network-x.po delete summit/docmessages/kdebase-runtime/userguide_troubleshooting-no-open.po delete summit/docmessages/kdebase-runtime/userguide_under-the-hood.po delete summit/docmessages/kdebase-runtime/userguide_usenet.po delete summit/docmessages/kdebase-runtime/userguide_where-next.po delete summit/docmessages/kdebase-runtime/userguide_windows-how-to.po delete summit/docmessages/kdebase-runtime/userguide_your-kde-account.po delete summit/docmessages/kdebase-runtime/visualdict.po delete summit/docmessages/kdebase-workspace/kcontrol_kxkb.po delete summit/docmessages/kdebase-workspace/kinfocenter_devices.po delete summit/docmessages/kdebase-workspace/kinfocenter_partitions.po delete summit/docmessages/kdebase-workspace/kinfocenter_processor.po delete summit/docmessages/kdebase-workspace/kinfocenter_protocols.po delete summit/docmessages/kdebase-workspace/kinfocenter_sound.po delete summit/docmessages/kdetoys/kweather.po move summit/docmessages/kdereview/palapeli-goldberg-slicer.po summit/docmessages/kdegames/palapeli_palapeli-goldberg-slicer.po delete summit/messages/kdepimlibs/libkcalcore.po move summit/messages/kdepimlibs/libkcal.po summit/messages/kdepimlibs/libkcalutils.po move summit/messages/kdereview/libknetworkmanager.po summit/messages/extragear-base/libknetworkmanager.po move summit/messages/kdereview/plasma_applet_networkmanagement.po summit/messages/extragear-base/plasma_applet_networkmanagement.po move summit/messages/kdereview/knetworkmanager.po summit/messages/extragear-base/knetworkmanager.po delete summit/docmessages/kdebase-runtime/kcontrol_helpindex.po delete summit/docmessages/kdebase-workspace/kcontrol_kcmdisplay.po move summit/messages/playground-base/plasma_containment_groupingdesktop.po summit/messages/kdereview/plasma_containment_groupingdesktop.po delete summit/docmessages/kdeutils/superkaramba.po delete summit/docmessages/extragear-office/kmymoney_details-files.po move summit/messages/kdereview/plasma_containment_groupingdesktop.po summit/messages/kdereview/libplasma_groupingcontainment.po move summit/messages/kdereview/plasma_runner_dictionary.po summit/messages/kdereview/plasma_runner_krunner_dictionary.po #move summit/messages/kdereview/kcm_infobase.po summit/messages/kdebase/kcm_infobase.po delete summit/messages/playground-games/ksirtet.po delete summit/docmessages/playground-games/ksirtet.po delete summit/messages/playground-games/libksirtet.po move summit/messages/playground-base/plasma_engine_share.po summit/messages/kdereview/plasma_engine_share.po move summit/messages/kdepim/akonadi_openchange_resource.po summit/messages/playground-pim/akonadi_openchange_resource.po merge summit/docmessages/extragear-multimedia/amarok_advanced.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/amarok_config.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/amarok_faq.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/amarok_quick.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/amarok_requirements.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/amarok_using.po summit/docmessages/extragear-multimedia/amarok.po merge summit/docmessages/extragear-multimedia/k3b_audiocd-howto.po summit/docmessages/extragear-multimedia/k3b.po merge summit/docmessages/extragear-multimedia/k3b_cdcopy-howto.po summit/docmessages/extragear-multimedia/k3b.po merge summit/docmessages/extragear-multimedia/k3b_commands.po summit/docmessages/extragear-multimedia/k3b.po merge summit/docmessages/extragear-multimedia/k3b_dcop.po summit/docmessages/extragear-multimedia/k3b.po move summit/messages/kdereview/libplasma_groupingcontainment.po summit/messages/kdeplasma-addons/libplasma_groupingcontainment.po move summit/messages/kdereview/plasma_applet_groupingpanel.po summit/messages/kdeplasma-addons/plasma_applet_groupingpanel.po move summit/messages/playground-libs/qaptbatch.po summit/messages/kdereview/qaptbatch.po move summit/messages/playground-sysadmin/muon.po summit/messages/kdereview/muon.po delete summit/messages/kdepimlibs/libakonadi-mail.po move summit/messages/playground-base/containmentpart.po summit/messages/kdereview/containmentpart.po move summit/docmessages/playground-base/kcontrol_kcm_tablet.po summit/docmessages/playground-base/kcontrol_wacomtablet.po delete summit/messages/playground-base/akonadi_storage_resource.po move summit/messages/playground-devtools/kdevokteta.po summit/messages/kdereview/kdevokteta.po #move summit/messages/kdereview/plasma_engine_share.po summit/messages/kdebase/plasma_engine_share.po move summit/messages/kdepim/akonadi-kcal.po summit/messages/kdepim/calendarsupport.po move summit/docmessages/kdesdk/scripts_kdesvn-build.po summit/docmessages/kdesdk/scripts_kdesrc-build.po move summit/messages/kdereview/qaptbatch.po summit/messages/extragear-sysadmin/qaptbatch.po move summit/messages/kdereview/muon.po summit/messages/extragear-sysadmin/muon.po move summit/messages/kdereview/containmentpart.po summit/messages/kdereview/plasma-kpart.po move summit/messages/kdereview/plasma_runner_events.po summit/messages/kdeplasma-addons/plasma_runner_events.po move summit/messages/kdereview/kdevokteta.po summit/messages/extragear-sdk/kdevokteta.po move summit/messages/playground-devtools/kdevgit.po summit/messages/extragear-sdk/kdevgit.po move summit/messages/playground-ioslaves/kio_torrent.po summit/messages/playground-ioslaves/kio_magnet.po delete summit/messages/kdereview/plasma-kpart.po move summit/messages/kdereview/bluedevil.po summit/messages/extragear-base/bluedevil.po move summit/messages/kdereview/kcm_nic.po summit/messages/playground-base/kcm_nic.po move summit/messages/playground-games/pege.po summit/messages/playground-games/kpeg.po move summit/docmessages/playground-games/pege.po summit/docmessages/playground-games/kpeg.po move summit/messages/playground-utils/filelight.po summit/messages/kdereview/filelight.po move summit/docmessages/playground-utils/filelight.po summit/docmessages/kdereview/filelight.po delete summit/messages/playground-games/kpoker.po delete summit/docmessages/playground-games/kpoker.po delete summit/docmessages/kdepim/korganizer_outlook-to-vcalendar.po merge summit/docmessages/kdepim/korganizer_plugins-chapter.po summit/docmessages/kdepim/korganizer.po move summit/messages/playground-base/pimoshell.po summit/messages/playground-base/nepomukshell.po move summit/docmessages/playground-games/knights.po summit/docmessages/kdereview/knights.po move summit/messages/playground-games/knights.po summit/messages/kdereview/knights.po move summit/messages/kdeutils/okteta.po summit/messages/kdesdk/okteta.po move summit/messages/kdeutils/oktetapart.po summit/messages/kdesdk/oktetapart.po move summit/messages/kdeutils/okteta-mobile.po summit/messages/kdesdk/okteta-mobile.po move summit/messages/kdeutils/libkasten.po summit/messages/kdesdk/libkasten.po move summit/messages/kdeutils/liboktetakasten.po summit/messages/kdesdk/liboktetakasten.po move summit/messages/kdeutils/liboktetacore.po summit/messages/kdesdk/liboktetacore.po move summit/docmessages/kdeutils/okteta.po summit/docmessages/kdesdk/okteta.po delete summit/messages/playground-edu/kurriculum.po move summit/messages/playground-games/klickety.po summit/messages/kdereview/klickety.po move summit/docmessages/playground-games/klickety.po summit/docmessages/kdereview/klickety.po move summit/messages/playground-base/wacomtablet.po summit/messages/kdereview/wacomtablet.po move summit/docmessages/playground-base/kcontrol_wacomtablet.po summit/docmessages/kdereview/kcontrol_wacomtablet.po move summit/messages/kdereview/filelight.po summit/messages/kdeutils/filelight.po move summit/docmessages/kdereview/filelight.po summit/docmessages/kdeutils/filelight.po copy summit/messages/kdepim/kmail.po summit/messages/kdepim/libmailcommon.po delete summit/docmessages/kdepim/korganizer_outlook-to-vcalendar.po copy summit/docmessages/kdebase-workspace/kcontrol_mouse.po summit/docmessages/kdebase-workspace/kcontrol_cursortheme.po move summit/messages/playground-utils/desktop_playground-utils_yakuake.po summit/messages/extragear-utils/desktop_extragear-utils_yakuake.po #copy summit/messages/kdebase/powerdevil.po summit/messages/kdebase/powerdevilglobalconfig.po #copy summit/messages/kdebase/powerdevil.po summit/messages/kdebase/powerdevilprofilesconfig.po move summit/messages/kdereview/knights.po summit/messages/extragear-games/knights.po move summit/docmessages/kdereview/knights.po summit/docmessages/extragear-games/knights.po delete summit/messages/playground-base/plasma_appletscript_qml.po move summit/messages/extragear-base/desktop_extragear-base_polkit-kde-kcmmodules-1.po summit/messages/extragear-base/desktop_extragear-base_polkit-kde-kcmodules-1.po move summit/messages/playground-base/nepomukshell.po summit/messages/kdereview/nepomukshell.po move summit/messages/playground-artwork/kannasaver.po summit/messages/kdereview/kannasaver.po delete summit/docmessages/kdesdk/kbugbuster.po copy summit/messages/extragear-sysadmin/muon.po summit/messages/extragear-sysadmin/libmuon.po copy summit/messages/extragear-sysadmin/muon.po summit/messages/extragear-sysadmin/muon-installer.po copy summit/messages/extragear-sysadmin/muon.po summit/messages/extragear-sysadmin/muon-notifier.po copy summit/messages/extragear-sysadmin/muon.po summit/messages/extragear-sysadmin/muon-updater.po merge summit/docmessages/kdegraphics/gwenview_interface.po summit/docmessages/kdegraphics/gwenview.po merge summit/docmessages/kdegraphics/gwenview_introduction.po summit/docmessages/kdegraphics/gwenview.po merge summit/docmessages/kdegraphics/gwenview_keybindings.po summit/docmessages/kdegraphics/gwenview.po merge summit/docmessages/kdegraphics/gwenview_mouse.po summit/docmessages/kdegraphics/gwenview.po #move summit/messages/kdebase/activity-manager.po summit/messages/kdebase/kactivitymanagerd.po move summit/messages/playground-artwork/desktop_playground-artwork_kannasaver.po summit/messages/kdereview/desktop_kdereview_kannasaver.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/kcm_nepomuk.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/nepomukserver.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/nepomukqueryservice.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/nepomukstorage.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/nepomukstrigiservice.po #copy summit/messages/kdebase/nepomuk.po summit/messages/kdebase/nepomukservicestub.po #delete summit/messages/kdebase/nepomuk.po move summit/messages/playground-network/wicd-client-kde.po summit/messages/playground-network/wicd-kde.po delete summit/messages/playground-devtools/desktop_playground-devtools_kdevelop4-git.po delete summit/docmessages/extragear-base/konq-plugins_crashes.po delete summit/messages/extragear-base/konqsidebar_metabar.po delete summit/messages/extragear-base/konqsidebar_mediaplayer.po move summit/messages/extragear-sdk/desktop_extragear-sdk_php.po summit/messages/extragear-sdk/desktop_extragear-sdk_kdev-php.po move summit/messages/extragear-sdk/desktop_extragear-sdk_php-docs.po summit/messages/extragear-sdk/desktop_extragear-sdk_kdev-php-docs.po delete summit/messages/extragear-sdk/desktop_extragear-sdk_kdevelop-plugins.po delete summit/messages/extragear-sdk/desktop_extragear-sdk_quanta.po move summit/messages/kdereview/klickety.po summit/messages/kdegames/klickety.po move summit/docmessages/kdereview/klickety.po summit/docmessages/kdegames/klickety.po move summit/messages/kdereview/nepomukshell.po summit/messages/extragear-utils/nepomukshell.po merge summit/docmessages/kdegames/palapeli_palapeli-goldberg-slicer.po summit/docmessages/kdegames/palapeli.po copy summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-qmake.po move summit/messages/playground-base/plasma_applet_recentdocuments.po summit/messages/playground-base/plasma_applet_recentappdocuments.po delete summit/messages/playground-base/plasma_appletscript_kinetic.po delete summit/messages/playground-base/plasma_applet_clock_hybrid.po move summit/messages/kdereview/kannasaver.po summit/messages/extragear-artwork/kannasaver.po move summit/messages/kdereview/desktop_kdereview_kannasaver.po summit/messages/extragear-artwork/desktop_extragear-artwork_kannasaver.po move summit/messages/kdepim/accountwizard_ical.po summit/messages/kdepim-runtime/accountwizard_ical.po move summit/messages/kdepim/accountwizard_imap.po summit/messages/kdepim-runtime/accountwizard_imap.po move summit/messages/kdepim/accountwizard_kolab.po summit/messages/kdepim-runtime/accountwizard_kolab.po move summit/messages/kdepim/accountwizard_mailbox.po summit/messages/kdepim-runtime/accountwizard_mailbox.po move summit/messages/kdepim/accountwizard_maildir.po summit/messages/kdepim-runtime/accountwizard_maildir.po move summit/messages/kdepim/accountwizard_pop3.po summit/messages/kdepim-runtime/accountwizard_pop3.po move summit/messages/kdepim/accountwizard.po summit/messages/kdepim-runtime/accountwizard.po move summit/messages/kdepim/akonadi_birthdays_resource.po summit/messages/kdepim-runtime/akonadi_birthdays_resource.po move summit/messages/kdepim/akonadi_contacts_resource.po summit/messages/kdepim-runtime/akonadi_contacts_resource.po move summit/messages/kdepim/akonadi_davgroupware_resource.po summit/messages/kdepim-runtime/akonadi_davgroupware_resource.po move summit/messages/kdepim/akonadi-filestore.po summit/messages/kdepim-runtime/akonadi-filestore.po move summit/messages/kdepim/akonadi_ical_resource.po summit/messages/kdepim-runtime/akonadi_ical_resource.po move summit/messages/kdepim/akonadi_imap_resource.po summit/messages/kdepim-runtime/akonadi_imap_resource.po move summit/messages/kdepim/akonadi_invitations_agent.po summit/messages/kdepim-runtime/akonadi_invitations_agent.po move summit/messages/kdepim/akonadi_kabc_resource.po summit/messages/kdepim-runtime/akonadi_kabc_resource.po move summit/messages/kdepim/akonadi_kcal_resource.po summit/messages/kdepim-runtime/akonadi_kcal_resource.po move summit/messages/kdepim/akonadi_kdeaccounts_resource.po summit/messages/kdepim-runtime/akonadi_kdeaccounts_resource.po move summit/messages/kdepim/akonadi_knut_resource.po summit/messages/kdepim-runtime/akonadi_knut_resource.po move summit/messages/kdepim/akonadi_kolabproxy_resource.po summit/messages/kdepim-runtime/akonadi_kolabproxy_resource.po move summit/messages/kdepim/akonadi_kresourceassistant.po summit/messages/kdepim-runtime/akonadi_kresourceassistant.po move summit/messages/kdepim/akonadi_localbookmarks_resource.po summit/messages/kdepim-runtime/akonadi_localbookmarks_resource.po move summit/messages/kdepim/akonadi_maildir_resource.po summit/messages/kdepim-runtime/akonadi_maildir_resource.po move summit/messages/kdepim/akonadi_maildispatcher_agent.po summit/messages/kdepim-runtime/akonadi_maildispatcher_agent.po move summit/messages/kdepim/akonadi_mailtransport_resource.po summit/messages/kdepim-runtime/akonadi_mailtransport_resource.po move summit/messages/kdepim/akonadi_mbox_resource.po summit/messages/kdepim-runtime/akonadi_mbox_resource.po move summit/messages/kdepim/akonadi_microblog_resource.po summit/messages/kdepim-runtime/akonadi_microblog_resource.po move summit/messages/kdepim/akonadi_mixedmaildir_resource.po summit/messages/kdepim-runtime/akonadi_mixedmaildir_resource.po move summit/messages/kdepim/akonadi_nepomukfeeder.po summit/messages/kdepim-runtime/akonadi_nepomukfeeder.po move summit/messages/kdepim/akonadi_nepomuktag_resource.po summit/messages/kdepim-runtime/akonadi_nepomuktag_resource.po move summit/messages/kdepim/akonadi_nntp_resource.po summit/messages/kdepim-runtime/akonadi_nntp_resource.po move summit/messages/kdepim/akonadi_openxchange_resource.po summit/messages/kdepim-runtime/akonadi_openxchange_resource.po move summit/messages/kdepim/akonadi_pop3_resource.po summit/messages/kdepim-runtime/akonadi_pop3_resource.po move summit/messages/kdepim/akonadi_serializer_plugins.po summit/messages/kdepim-runtime/akonadi_serializer_plugins.po move summit/messages/kdepim/akonadi_singlefile_resource.po summit/messages/kdepim-runtime/akonadi_singlefile_resource.po move summit/messages/kdepim/akonaditray.po summit/messages/kdepim-runtime/akonaditray.po move summit/messages/kdepim/akonadi_vcarddir_resource.po summit/messages/kdepim-runtime/akonadi_vcarddir_resource.po move summit/messages/kdepim/akonadi_vcard_resource.po summit/messages/kdepim-runtime/akonadi_vcard_resource.po move summit/messages/kdepim/kabc_akonadi.po summit/messages/kdepim-runtime/kabc_akonadi.po move summit/messages/kdepim/kaddressbookmigrator.po summit/messages/kdepim-runtime/kaddressbookmigrator.po move summit/messages/kdepim/kcal_akonadi.po summit/messages/kdepim-runtime/kcal_akonadi.po move summit/messages/kdepim/kcm_akonadi.po summit/messages/kdepim-runtime/kcm_akonadi.po move summit/messages/kdepim/kio_akonadi.po summit/messages/kdepim-runtime/kio_akonadi.po move summit/messages/kdepim/kjotsmigrator.po summit/messages/kdepim-runtime/kjotsmigrator.po move summit/messages/kdepim/kmail-migrator.po summit/messages/kdepim-runtime/kmail-migrator.po move summit/messages/kdepim/kres-migrator.po summit/messages/kdepim-runtime/kres-migrator.po move summit/messages/kdepim/kresources_shared_akonadi.po summit/messages/kdepim-runtime/kresources_shared_akonadi.po copy summit/messages/kdepim/desktop_kdepim.po summit/messages/kdepim-runtime/desktop_kdepim-runtime.po copy summit/messages/qt/desktop_phonon.po summit/messages/qt/desktop_phonon-gstreamer.po copy summit/messages/qt/desktop_phonon.po summit/messages/qt/desktop_phonon-xine.po copy summit/messages/extragear-multimedia/amarok.po summit/messages/playground-libs/liblikeback.po move summit/messages/playground-sdk/massif-visualizer.po summit/messages/extragear-sdk/massif-visualizer.po copy summit/messages/playground-sysadmin/desktop_playground-sysadmin.po summit/messages/playground-sysadmin/desktop_playground-sysadmin_kalternatives.po #move summit/messages/extragear-base/adblock.po summit/messages/kdebase/adblock.po #move summit/messages/extragear-base/akregator_konqplugin.po summit/messages/kdebase/akregator_konqplugin.po #move summit/messages/extragear-base/autorefresh.po summit/messages/kdebase/autorefresh.po #move summit/messages/extragear-base/babelfish.po summit/messages/kdebase/babelfish.po #move summit/messages/extragear-base/dirfilterplugin.po summit/messages/kdebase/dirfilterplugin.po #move summit/messages/extragear-base/domtreeviewer.po summit/messages/kdebase/domtreeviewer.po #move summit/messages/extragear-base/fsview.po summit/messages/kdebase/fsview.po #move summit/messages/extragear-base/imgalleryplugin.po summit/messages/kdebase/imgalleryplugin.po #move summit/messages/extragear-base/khtmlsettingsplugin.po summit/messages/kdebase/khtmlsettingsplugin.po #move summit/messages/extragear-base/mf_konqplugin.po summit/messages/kdebase/mf_konqplugin.po #move summit/messages/extragear-base/minitoolsplugin.po summit/messages/kdebase/minitoolsplugin.po #move summit/messages/extragear-base/rellinks.po summit/messages/kdebase/rellinks.po #move summit/messages/extragear-base/searchbarplugin.po summit/messages/kdebase/searchbarplugin.po #move summit/messages/extragear-base/uachangerplugin.po summit/messages/kdebase/uachangerplugin.po #move summit/messages/extragear-base/validatorsplugin.po summit/messages/kdebase/validatorsplugin.po #move summit/messages/extragear-base/webarchiver.po summit/messages/kdebase/webarchiver.po move summit/docmessages/extragear-base/konq-plugins_babel.po summit/docmessages/kdebase-apps/konq-plugins_babel.po move summit/docmessages/extragear-base/konq-plugins_domtreeviewer.po summit/docmessages/kdebase-apps/konq-plugins_domtreeviewer.po move summit/docmessages/extragear-base/konq-plugins_imgallery.po summit/docmessages/kdebase-apps/konq-plugins_imgallery.po move summit/docmessages/extragear-base/konq-plugins_mediaplayer.po summit/docmessages/kdebase-apps/konq-plugins_mediaplayer.po move summit/docmessages/extragear-base/konq-plugins_uachanger.po summit/docmessages/kdebase-apps/konq-plugins_uachanger.po move summit/docmessages/extragear-base/konq-plugins_webarchiver.po summit/docmessages/kdebase-apps/konq-plugins_webarchiver.po move summit/docmessages/extragear-base/konq-plugins_dirfilter.po summit/docmessages/kdebase-apps/konq-plugins_dirfilter.po move summit/docmessages/extragear-base/konq-plugins_fsview.po summit/docmessages/kdebase-apps/konq-plugins_fsview.po move summit/docmessages/extragear-base/konq-plugins_khtmlsettings.po summit/docmessages/kdebase-apps/konq-plugins_khtmlsettings.po move summit/docmessages/extragear-base/konq-plugins.po summit/docmessages/kdebase-apps/konq-plugins.po move summit/docmessages/extragear-base/konq-plugins_validators.po summit/docmessages/kdebase-apps/konq-plugins_validators.po #merge summit/messages/extragear-base/desktop_extragear-base_konq-plugins.po summit/messages/kdebase/desktop_kdebase.po # Summit catalogs left behind on 4.5->4.6 switch, 2011-01-10. delete summit/messages/kdeadmin/knetworkconfmodule.po #delete summit/messages/kdebase/plasma_appletscriptengine_qedjescripts.po #delete summit/messages/kdebase/policykit-kde.po #delete summit/messages/kdebase/polkit-kde-authorization.po #delete summit/messages/kdebase/solid-bluetooth.po #delete summit/messages/kdebase/solid-powermanagement.po delete summit/messages/kdegames/ksame.po delete summit/messages/kdepim/kdgantt1.po delete summit/messages/kdeplasma-addons/plasma_engine_pastebin.po delete summit/messages/kdesdk/kbugbuster.po delete summit/messages/kdesdk/kres_bugzilla.po delete summit/docmessages/kdeadmin/kcontrol_knetworkconf.po delete summit/docmessages/kdegames/ksame.po delete summit/messages/kdepim/akonadi_kalarm_dir_resource.po delete summit/messages/kdepim/akonadi_kalarm_resource.po delete summit/messages/kdepim/akonadi_kalarm_resource_common.po copy summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-valgrind.po move summit/messages/playground-network/desktop_playground-network_wicd-client-kde.po summit/messages/kdereview/desktop_kdereview_wicd-client-kde.po move summit/messages/playground-network/wicd-kde.po summit/messages/kdereview/wicd-kde.po move summit/messages/playground-ioslaves/kio_magnet.po summit/messages/extragear-network/kio_magnet.po move summit/messages/koffice/googledocs_plugin.po summit/messages/playground-office/googledocs_plugin.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/extragear-utils/desktop_extragear-utils_kdesrc-build.po move summit/docmessages/kdesdk/scripts_kdesrc-build.po summit/docmessages/extragear-utils/kdesrc-build.po move summit/messages/kdereview/libdebconf-kde.po summit/messages/extragear-sysadmin/libdebconf-kde.po move summit/messages/kdereview/desktop_kdereview_wicd-client-kde.po summit/messages/extragear-network/desktop_extragear-network_wicd-kde.po move summit/messages/kdereview/wicd-kde.po summit/messages/extragear-network/wicd-kde.po #move summit/messages/kdesdk/katebacktracebrowserplugin.po summit/messages/kdebase/katebacktracebrowserplugin.po #move summit/messages/kdesdk/katebuild-plugin.po summit/messages/kdebase/katebuild-plugin.po #move summit/messages/kdesdk/kateexternaltoolsplugin.po summit/messages/kdebase/kateexternaltoolsplugin.po #move summit/messages/kdesdk/katefilebrowserplugin.po summit/messages/kdebase/katefilebrowserplugin.po #move summit/messages/kdesdk/katefiletemplates.po summit/messages/kdebase/katefiletemplates.po #move summit/messages/kdesdk/katefindinfilesplugin.po summit/messages/kdebase/katefindinfilesplugin.po #move summit/messages/kdesdk/kategdbplugin.po summit/messages/kdebase/kategdbplugin.po #move summit/messages/kdesdk/katehelloworld.po summit/messages/kdebase/katehelloworld.po #move summit/messages/kdesdk/kateinsertcommand.po summit/messages/kdebase/kateinsertcommand.po #move summit/messages/kdesdk/katekjswrapper.po summit/messages/kdebase/katekjswrapper.po #move summit/messages/kdesdk/katekonsoleplugin.po summit/messages/kdebase/katekonsoleplugin.po #move summit/messages/kdesdk/kate_kttsd.po summit/messages/kdebase/kate_kttsd.po #move summit/messages/kdesdk/katemailfilesplugin.po summit/messages/kdebase/katemailfilesplugin.po #move summit/messages/kdesdk/kateopenheader.po summit/messages/kdebase/kateopenheader.po #move summit/messages/kdesdk/katequickdocumentswitcherplugin.po summit/messages/kdebase/katequickdocumentswitcherplugin.po #move summit/messages/kdesdk/katesnippets_tng.po summit/messages/kdebase/katesnippets_tng.po #move summit/messages/kdesdk/katesql.po summit/messages/kdebase/katesql.po #move summit/messages/kdesdk/katesymbolviewer.po summit/messages/kdebase/katesymbolviewer.po #move summit/messages/kdesdk/katetabbarextension.po summit/messages/kdebase/katetabbarextension.po #move summit/messages/kdesdk/katetabifyplugin.po summit/messages/kdebase/katetabifyplugin.po #move summit/messages/kdesdk/katetextfilter.po summit/messages/kdebase/katetextfilter.po #move summit/messages/kdesdk/katexmlcheck.po summit/messages/kdebase/katexmlcheck.po #move summit/messages/kdesdk/katexmltools.po summit/messages/kdebase/katexmltools.po #move summit/messages/kdesdk/ktesnippets_editor.po summit/messages/kdebase/ktesnippets_editor.po #move summit/messages/kdesdk/ktexteditor_codesnippets_core.po summit/messages/kdebase/ktexteditor_codesnippets_core.po #move summit/messages/kdesdk/plasma_applet_katesession.po summit/messages/kdebase/plasma_applet_katesession.po #move summit/messages/kdesdk/kate-ctags-plugin.po summit/messages/kdebase/kate-ctags-plugin.po #move summit/messages/kdesdk/kate.po summit/messages/kdebase/kate.po move summit/docmessages/kdesdk/kate.po summit/docmessages/kdebase-runtime/kate.po move summit/docmessages/kdesdk/kate_advanced.po summit/docmessages/kdebase-runtime/kate_advanced.po move summit/docmessages/kdesdk/kate_configuring.po summit/docmessages/kdebase-runtime/kate_configuring.po move summit/docmessages/kdesdk/kate_fundamentals.po summit/docmessages/kdebase-runtime/kate_fundamentals.po move summit/docmessages/kdesdk/kate_highlighting.po summit/docmessages/kdebase-runtime/kate_highlighting.po move summit/docmessages/kdesdk/kate_man-kate.1.po summit/docmessages/kdebase-runtime/kate_man-kate.1.po move summit/docmessages/kdesdk/kate_mdi.po summit/docmessages/kdebase-runtime/kate_mdi.po move summit/docmessages/kdesdk/kate_menus.po summit/docmessages/kdebase-runtime/kate_menus.po move summit/docmessages/kdesdk/kate_part.po summit/docmessages/kdebase-runtime/kate_part.po move summit/docmessages/kdesdk/kate_plugins.po summit/docmessages/kdebase-runtime/kate_plugins.po move summit/docmessages/kdesdk/kate_regular-expressions.po summit/docmessages/kdebase-runtime/kate_regular-expressions.po #move summit/messages/kdelibs/katepart4.po summit/messages/kdebase/katepart4.po #move summit/messages/kdelibs/ktexteditor_plugins.po summit/messages/kdebase/ktexteditor_plugins.po move summit/docmessages/kdebase-apps/kwrite.po summit/docmessages/kdebase-runtime/kwrite.po delete summit/docmessages/kdebase-apps/konq-plugins_mediaplayer.po #copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdebase/desktop_kdebase_kate.po #copy summit/messages/kdebase/desktop_kdebase.po summit/messages/kdebase/desktop_kdebase_konsole.po #copy summit/messages/kdebase/desktop_kdebase.po summit/messages/kdebase/desktop_kdebase_kde-baseapps.po #copy summit/messages/kdebase/desktop_kdebase.po summit/messages/kdebase/desktop_kdebase_kde-runtime.po #copy summit/messages/kdebase/desktop_kdebase.po summit/messages/kdebase/desktop_kdebase_kde-workspace.po #delete summit/messages/kdebase/desktop_kdebase.po copy summit/messages/extragear-sysadmin/qaptbatch.po summit/messages/extragear-sysadmin/qapt-gst-helper.po copy summit/messages/kdenetwork/kget.po summit/messages/kdenetwork/kgetplugin.po #copy summit/messages/kdebase/konqueror.po summit/messages/kdebase/kshellcmdplugin.po move summit/messages/extragear-sdk/kdevappwizard.po summit/messages/extragear-kdevelop/kdevappwizard.po move summit/messages/extragear-sdk/kdevclassbrowser.po summit/messages/extragear-kdevelop/kdevclassbrowser.po move summit/messages/extragear-sdk/kdevcmakebuilder.po summit/messages/extragear-kdevelop/kdevcmakebuilder.po move summit/messages/extragear-sdk/kdevcmake.po summit/messages/extragear-kdevelop/kdevcmake.po move summit/messages/extragear-sdk/kdevcodeutils.po summit/messages/extragear-kdevelop/kdevcodeutils.po move summit/messages/extragear-sdk/kdevcontextbrowser.po summit/messages/extragear-kdevelop/kdevcontextbrowser.po move summit/messages/extragear-sdk/kdevcpp.po summit/messages/extragear-kdevelop/kdevcpp.po move summit/messages/extragear-sdk/kdevcustommake.po summit/messages/extragear-kdevelop/kdevcustommake.po move summit/messages/extragear-sdk/kdevcvs.po summit/messages/extragear-kdevelop/kdevcvs.po move summit/messages/extragear-sdk/kdevdocumentswitcher.po summit/messages/extragear-kdevelop/kdevdocumentswitcher.po move summit/messages/extragear-sdk/kdevdocumentview.po summit/messages/extragear-kdevelop/kdevdocumentview.po move summit/messages/extragear-sdk/kdevelop.po summit/messages/extragear-kdevelop/kdevelop.po move summit/messages/extragear-sdk/kdevexecute.po summit/messages/extragear-kdevelop/kdevexecute.po move summit/messages/extragear-sdk/kdevexternalscript.po summit/messages/extragear-kdevelop/kdevexternalscript.po move summit/messages/extragear-sdk/kdevfilemanager.po summit/messages/extragear-kdevelop/kdevfilemanager.po move summit/messages/extragear-sdk/kdevformatters.po summit/messages/extragear-kdevelop/kdevformatters.po move summit/messages/extragear-sdk/kdevgdb.po summit/messages/extragear-kdevelop/kdevgdb.po move summit/messages/extragear-sdk/kdevgenericprojectmanager.po summit/messages/extragear-kdevelop/kdevgenericprojectmanager.po move summit/messages/extragear-sdk/kdevgit.po summit/messages/extragear-kdevelop/kdevgit.po move summit/messages/extragear-sdk/kdevgrepview.po summit/messages/extragear-kdevelop/kdevgrepview.po move summit/messages/extragear-sdk/kdevkonsole.po summit/messages/extragear-kdevelop/kdevkonsole.po move summit/messages/extragear-sdk/kdevmakebuilder.po summit/messages/extragear-kdevelop/kdevmakebuilder.po move summit/messages/extragear-sdk/kdevokteta.po summit/messages/extragear-kdevelop/kdevokteta.po move summit/messages/extragear-sdk/kdevopenwith.po summit/messages/extragear-kdevelop/kdevopenwith.po move summit/messages/extragear-sdk/kdevpastebin.po summit/messages/extragear-kdevelop/kdevpastebin.po move summit/messages/extragear-sdk/kdevpatchreview.po summit/messages/extragear-kdevelop/kdevpatchreview.po move summit/messages/extragear-sdk/kdevphpdocs.po summit/messages/extragear-kdevelop/kdevphpdocs.po move summit/messages/extragear-sdk/kdevphp.po summit/messages/extragear-kdevelop/kdevphp.po move summit/messages/extragear-sdk/kdevplatform.po summit/messages/extragear-kdevelop/kdevplatform.po move summit/messages/extragear-sdk/kdevproblemreporter.po summit/messages/extragear-kdevelop/kdevproblemreporter.po move summit/messages/extragear-sdk/kdevprojectmanagerview.po summit/messages/extragear-kdevelop/kdevprojectmanagerview.po move summit/messages/extragear-sdk/kdevqthelp.po summit/messages/extragear-kdevelop/kdevqthelp.po move summit/messages/extragear-sdk/kdevquickopen.po summit/messages/extragear-kdevelop/kdevquickopen.po move summit/messages/extragear-sdk/kdevreviewboard.po summit/messages/extragear-kdevelop/kdevreviewboard.po move summit/messages/extragear-sdk/kdevsnippet.po summit/messages/extragear-kdevelop/kdevsnippet.po move summit/messages/extragear-sdk/kdevstandardoutputview.po summit/messages/extragear-kdevelop/kdevstandardoutputview.po move summit/messages/extragear-sdk/kdevsubversion.po summit/messages/extragear-kdevelop/kdevsubversion.po move summit/messages/playground-sdk/kdevcrossfire.po summit/messages/playground-devtools/kdevcrossfire.po move summit/messages/playground-sdk/kdevexecutebrowser.po summit/messages/playground-devtools/kdevexecutebrowser.po move summit/messages/playground-sdk/kdevexecutescript.po summit/messages/playground-devtools/kdevexecutescript.po move summit/messages/playground-sdk/kdevupload.po summit/messages/playground-devtools/kdevupload.po move summit/messages/playground-sdk/kdevxdebug.po summit/messages/playground-devtools/kdevxdebug.po move summit/messages/playground-sdk/kdevxml.po summit/messages/playground-devtools/kdevxml.po move summit/messages/playground-sdk/quanta.po summit/messages/playground-devtools/quanta.po move summit/messages/playground-sdk/kdevcss.po summit/messages/playground-devtools/kdevcss.po move summit/messages/playground-sdk/kdevphpformatter.po summit/messages/playground-devtools/kdevphpformatter.po move summit/messages/playground-sdk/kdevsql.po summit/messages/playground-devtools/kdevsql.po move summit/messages/extragear-sdk/desktop_extragear-sdk_kdevelop.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdevelop.po move summit/messages/extragear-sdk/desktop_extragear-sdk_kdevplatform.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdevplatform.po move summit/messages/playground-sdk/desktop_playground-sdk_quanta.po summit/messages/playground-devtools/desktop_playground-devtools_quanta.po move summit/messages/extragear-sdk/desktop_extragear-sdk_kdev-php-docs.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-php-docs.po move summit/messages/extragear-sdk/desktop_extragear-sdk_kdev-php.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-php.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-custom-buildsystem.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-custom-buildsystem.po move summit/messages/qt/desktop_phonon-directshow.po summit/messages/qt/desktop_kdesupport-phonon_phonon-directshow.po move summit/messages/qt/desktop_phonon-gstreamer.po summit/messages/qt/desktop_kdesupport-phonon_phonon-gstreamer.po move summit/messages/qt/desktop_phonon-mplayer.po summit/messages/qt/desktop_kdesupport-phonon_phonon-mplayer.po move summit/messages/qt/desktop_phonon.po summit/messages/qt/desktop_kdesupport-phonon_phonon.po move summit/messages/qt/desktop_phonon-vlc.po summit/messages/qt/desktop_kdesupport-phonon_phonon-vlc.po move summit/messages/qt/desktop_phonon-xine.po summit/messages/qt/desktop_kdesupport-phonon_phonon-xine.po move summit/messages/koffice/desktop_koffice-plugins.po summit/messages/koffice/desktop_koffice_koffice-plugins.po copy summit/messages/playground-base/desktop_playground-base.po summit/messages/playground-multimedia/desktop_playground-multimedia_plasma-mediacenter.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/playground-network/desktop_playground-network_telepathy-chat-handler.po move summit/messages/playground-base/plasma_applet_flicklist.po summit/messages/playground-multimedia/plasma_applet_flicklist.po move summit/messages/playground-base/plasma_applet_playlist.po summit/messages/playground-multimedia/plasma_applet_playlist.po move summit/messages/playground-base/plasma_applet_mediacontainment.po summit/messages/playground-multimedia/plasma_applet_mediacontainment.po move summit/messages/playground-base/plasma_applet_mediaplayer.po summit/messages/playground-multimedia/plasma_applet_mediaplayer.po move summit/messages/playground-base/plasma-mediacenter.po summit/messages/playground-multimedia/plasma-mediacenter.po move summit/messages/playground-base/plasma_applet_mediabrowser.po summit/messages/playground-multimedia/plasma_applet_mediabrowser.po move summit/messages/playground-devtools/kdevcustombuildsystem.po summit/messages/extragear-kdevelop/kdevcustombuildsystem.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-strigi-analyzer.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kgamma.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-thumbnailers.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_libkipi.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kamera.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kcolorchooser.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_gwenview.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_svgpart.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kolourpaint.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_ksnapshot.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_kruler.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_ksaneplugin.po #move summit/messages/kdebase/kwin_lib.po summit/messages/kdebase/libkdecorations.po #move summit/messages/kdebase/kshutdown.po summit/messages/kdebase/kwinshutdown.po copy summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-xtest.po move summit/messages/playground-office/kchart.po summit/messages/koffice/kchart.po move summit/docmessages/playground-office/kchart.po summit/docmessages/koffice/kchart.po move summit/messages/playground-base/nepomukutils.po summit/messages/playground-libs/nepomukutils.po copy summit/templates/summit/messages/playground-base/desktop_playground-base.po summit/messages/playground-base/desktop_playground-base_publictransport.po move summit/messages/playground-base/plasma_applet_presence.po summit/messages/playground-network/plasma_applet_presence.po move summit/messages/playground-libs/nepomukutils.po summit/messages/playground-libs/nepomukextras.po delete summit/messages/koffice/desktop_koffice-plugins.po move summit/messages/playground-network/telepathy-chat-handler.po summit/messages/playground-network/telepathy-kde-text-ui.po move summit/messages/playground-base/kipiplugin_mediawiki.po summit/messages/extragear-graphics/kipiplugin_mediawiki.po move summit/messages/kdereview/wacomtablet.po summit/messages/extragear-base/wacomtablet.po copy summit/messages/kdereview/desktop_kdereview.po summit/messages/extragear-base/desktop_extragear-base_wacomtablet.po move summit/docmessages/kdereview/kcontrol_wacomtablet.po summit/docmessages/extragear-base/kcontrol_wacomtablet.po delete summit/messages/playground-pim/knowit.po delete summit/messages/playground-pim/plasma_applet_facebook.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_blinken.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_cantor.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kalgebra.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kalzium.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kanagram.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kbruch.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kgeography.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_khangman.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kig.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kiten.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_klettres.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kmplot.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kstars.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_ktouch.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kturtle.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_kwordquiz.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_marble.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_parley.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_rocs.po copy summit/messages/kdeedu/desktop_kdeedu.po summit/messages/kdeedu/desktop_kdeedu_step.po delete summit/messages/kdeedu/desktop_kdeedu.po delete summit/docmessages/playground-sdk/quanta_adv-quanta.po delete summit/docmessages/playground-sdk/quanta_config-quanta.po delete summit/docmessages/playground-sdk/quanta_credits-license.po delete summit/docmessages/playground-sdk/quanta_debugging-quanta.po delete summit/docmessages/playground-sdk/quanta_extending-quanta.po delete summit/docmessages/playground-sdk/quanta_fundamentals.po delete summit/docmessages/playground-sdk/quanta_glossary.po delete summit/docmessages/playground-sdk/quanta_installation.po delete summit/docmessages/playground-sdk/quanta_introduction.po delete summit/docmessages/playground-sdk/quanta.po delete summit/docmessages/playground-sdk/quanta_q-and-a.po delete summit/docmessages/playground-sdk/quanta_quanta-menus.po delete summit/docmessages/playground-sdk/quanta_quanta-projects.po delete summit/docmessages/playground-sdk/quanta_working-with-quanta.po delete summit/docmessages/playground-sdk/quanta_man-quanta.1.po move summit/messages/playground-games/desktop_playground-games_libtagaro.po summit/messages/kdereview/desktop_kdereview_libtagaro.po move summit/messages/playground-games/libtagaro.po summit/messages/kdereview/libtagaro.po delete summit/messages/playground-base/kdisplay.po delete summit/messages/playground-utils/kde4guidance-power-manager.po copy summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-ruby.po move summit/docmessages/koffice/kspread.po summit/docmessages/koffice/kcells.po move summit/docmessages/koffice/kspread_a11y.po summit/docmessages/koffice/kcells_a11y.po move summit/docmessages/koffice/kspread_advanced.po summit/docmessages/koffice/kcells_advanced.po move summit/docmessages/koffice/kspread_basics.po summit/docmessages/koffice/kcells_basics.po move summit/docmessages/koffice/kspread_commands.po summit/docmessages/koffice/kcells_commands.po move summit/docmessages/koffice/kspread_config.po summit/docmessages/koffice/kcells_config.po move summit/docmessages/koffice/kspread_configdialog.po summit/docmessages/koffice/kcells_configdialog.po move summit/docmessages/koffice/kspread_faq.po summit/docmessages/koffice/kcells_faq.po move summit/docmessages/koffice/kspread_format.po summit/docmessages/koffice/kcells_format.po move summit/docmessages/koffice/kspread_importexport.po summit/docmessages/koffice/kcells_importexport.po delete summit/messages/playground-sysadmin/arboretum.po delete summit/messages/extragear-graphics/kipicmd.po move summit/messages/playground-sysadmin/kcm-grub2.po summit/messages/kdereview/kcm-grub2.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_kcm-grub2.po summit/messages/kdereview/desktop_kdereview_kcm-grub2.po move summit/messages/kdereview/desktop_kdereview_libtagaro.po summit/messages/playground-games/desktop_playground-games_libtagaro.po move summit/messages/kdereview/libtagaro.po summit/messages/playground-games/libtagaro.po #move summit/messages/kdereview/nepomukcontroller.po summit/messages/kdebase/nepomukcontroller.po #copy summit/messages/kdebase/nepomukcontroller.po summit/messages/playground-base/nepomuk-system-tray.po move summit/messages/kdereview/kdevcontrolflowgraph.po summit/messages/playground-devtools/kdevcontrolflowgraph.po move summit/messages/kdereview/desktop_kdereview_kdev-control-flow-graph.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-control-flow-graph.po move summit/messages/playground-multimedia/desktop_playground-multimedia_kamoso.po summit/messages/kdereview/desktop_kdereview_kamoso.po move summit/messages/playground-multimedia/kamoso.po summit/messages/kdereview/kamoso.po move summit/messages/playground-sysadmin/kpackagekit.po summit/messages/playground-sysadmin/apper.po merge summit/docmessages/kdebase-apps/konq-plugins.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_babel.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_dirfilter.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_domtreeviewer.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_imgallery.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_khtmlsettings.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_uachanger.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_validators.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_webarchiver.po summit/docmessages/kdebase-apps/konqueror_plugins.po merge summit/docmessages/kdebase-apps/konq-plugins_fsview.po summit/docmessages/kdebase-apps/konqueror_view-extensions.po copy summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/desktop_playground-devtools_kdev-java.po move summit/messages/kdereview/nepomuk-system-tray.po summit/messages/playground-base/nepomuk-system-tray.po move summit/messages/kdereview/desktop_kdereview_nepomuk-system-tray.po summit/messages/playground-base/desktop_playground-base_nepomuk-system-tray.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_mobipocket.po copy summit/messages/kdegraphics/desktop_kdegraphics.po summit/messages/kdegraphics/desktop_kdegraphics_okular.po delete summit/messages/kdegraphics/desktop_kdegraphics.po delete summit/messages/kdepim/kalarm-migrator.po copy summit/messages/extragear-base/desktop_extragear-base_polkit-kde-1.po summit/messages/extragear-base/desktop_extragear-base_polkit-kde-agent-1.po copy summit/messages/extragear-base/desktop_extragear-base_polkit-kde-1.po summit/messages/extragear-base/desktop_extragear-base_polkit-kde-kcmodules-1.po delete summit/messages/extragear-base/desktop_extragear-base_polkit-kde-1.po move summit/messages/playground-network/kcall.po summit/messages/playground-network/telepathy-kde-call-ui.po delete summit/messages/playground-network/desktop_playground-network_telepathy-call-ui.po move summit/messages/playground-devtools/kdevexecutescript.po summit/messages/extragear-kdevelop/kdevexecutescript.po #move summit/messages/kdebase/kateinsertcommand.po summit/messages/kdesdk/kateinsertcommand.po move summit/messages/extragear-pim/desktop_extragear-pim_googledata.po summit/messages/extragear-pim/desktop_extragear-pim_akonadi-googledata-resource.po move summit/messages/koffice/kspread.po summit/messages/koffice/kcells.po move summit/messages/koffice/kpresenter.po summit/messages/koffice/showcase.po # Summit catalogs left behind on 4.6->4.7 switch, 2011-07-07. delete summit/messages/kdesdk/kateinsertcommand.po #delete summit/messages/kdebase/katekjswrapper.po #delete summit/messages/kdebase/kthememanager.po delete summit/messages/playground-network/desktop_playground-network_telepathy-test-tool.po move summit/messages/kdereview/libkmap.po summit/messages/extragear-libs/libkgeomap.po move summit/messages/extragear-libs/libkmap.po summit/messages/extragear-libs/libkgeomap.po merge summit/messages/kdepim/akonadi_kalarm_dir_resource.po summit/messages/kdepim/akonadi_kalarm_resource.po merge summit/messages/kdepim/akonadi_kalarm_resource_common.po summit/messages/kdepim/akonadi_kalarm_resource.po move summit/messages/kdereview/kamoso.po summit/messages/extragear-multimedia/kamoso.po move summit/messages/kdereview/desktop_kdereview_kamoso.po summit/messages/extragear-multimedia/desktop_extragear-multimedia_kamoso.po move summit/messages/playground-pim/libkvkontakte.po summit/messages/kdereview/libkvkontakte.po move summit/messages/koffice/karbon.po summit/messages/koffice/artwork.po move summit/messages/koffice/KarbonTools.po summit/messages/koffice/ArtworkTools.po move summit/messages/playground-office/kformula.po summit/messages/koffice/kformula.po move summit/docmessages/koffice/kformula.po summit/docmessages/playground-office/kformula.po delete summit/messages/playground-multimedia/kdetv.po #move summit/messages/kdebase/nepomukstrigiservice.po summit/messages/kdebase/nepomukfileindexer.po copy summit/messages/kdeaccessibility/desktop_kdeaccessibility.po summit/messages/kdeaccessibility/desktop_kdeaccessibility_jovie.po copy summit/messages/kdeaccessibility/desktop_kdeaccessibility.po summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmag.po copy summit/messages/kdeaccessibility/desktop_kdeaccessibility.po summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmousetool.po copy summit/messages/kdeaccessibility/desktop_kdeaccessibility.po summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmouth.po delete summit/messages/kdeaccessibility/desktop_kdeaccessibility.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_ark.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_filelight.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kcalc.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kcharselect.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kdf.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kfloppy.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kgpg.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kremotecontrol.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_ktimer.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_kwallet.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_printer-applet.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_superkaramba.po copy summit/messages/kdeutils/desktop_kdeutils.po summit/messages/kdeutils/desktop_kdeutils_sweeper.po delete summit/messages/kdeutils/desktop_kdeutils.po move summit/messages/playground-base/plasma-mobile.po summit/messages/playground-base/plasma-device.po #move summit/messages/kdebase/desktop_kdebase_kate.po summit/messages/kdebase/desktop_kde-baseapps_kate.po #move summit/messages/kdebase/desktop_kdebase_kde-baseapps.po summit/messages/kdebase/desktop_kde-baseapps.po #move summit/messages/kdebase/desktop_kdebase_kde-runtime.po summit/messages/kdebase/desktop_kde-runtime.po #move summit/messages/kdebase/desktop_kdebase_konsole.po summit/messages/kdebase/desktop_kde-baseapps_konsole.po #move summit/messages/kdebase/desktop_kdebase_kde-workspace.po summit/messages/kdebase/desktop_kde-workspace.po delete summit/docmessages/kdeedu/kstars_calc-precess.po move summit/messages/kdereview/libkvkontakte.po summit/messages/extragear-libs/libkvkontakte.po merge summit/messages/extragear-multimedia/k3bsetup.po summit/messages/extragear-multimedia/k3b.po move summit/messages/kdebase/attica_kde.po summit/messages/kde-runtime/attica_kde.po move summit/messages/kdebase/audiorename_plugin.po summit/messages/kde-runtime/audiorename_plugin.po move summit/messages/kdebase/drkonqi.po summit/messages/kde-runtime/drkonqi.po move summit/messages/kdebase/filetypes.po summit/messages/kde-runtime/filetypes.po move summit/messages/kdebase/htmlsearch.po summit/messages/kde-runtime/htmlsearch.po move summit/messages/kdebase/imagerename_plugin.po summit/messages/kde-runtime/imagerename_plugin.po move summit/messages/kdebase/kactivitymanagerd.po summit/messages/kde-runtime/kactivitymanagerd.po move summit/messages/kdebase/kcm_attica.po summit/messages/kde-runtime/kcm_attica.po move summit/messages/kdebase/kcmcgi.po summit/messages/kde-runtime/kcmcgi.po move summit/messages/kdebase/kcmcomponentchooser.po summit/messages/kde-runtime/kcmcomponentchooser.po move summit/messages/kdebase/kcm_device_automounter.po summit/messages/kde-runtime/kcm_device_automounter.po move summit/messages/kdebase/kcm_emoticons.po summit/messages/kde-runtime/kcm_emoticons.po move summit/messages/kdebase/kcmhtmlsearch.po summit/messages/kde-runtime/kcmhtmlsearch.po move summit/messages/kdebase/kcmicons.po summit/messages/kde-runtime/kcmicons.po move summit/messages/kdebase/kcmkded.po summit/messages/kde-runtime/kcmkded.po move summit/messages/kdebase/kcmkdnssd.po summit/messages/kde-runtime/kcmkdnssd.po move summit/messages/kdebase/kcmlocale.po summit/messages/kde-runtime/kcmlocale.po move summit/messages/kdebase/kcm_nepomuk.po summit/messages/kde-runtime/kcm_nepomuk.po move summit/messages/kdebase/kcmnotify.po summit/messages/kde-runtime/kcmnotify.po move summit/messages/kdebase/kcm_phonon.po summit/messages/kde-runtime/kcm_phonon.po move summit/messages/kdebase/kcm_phononxine.po summit/messages/kde-runtime/kcm_phononxine.po move summit/messages/kdebase/kcm_platform.po summit/messages/kde-runtime/kcm_platform.po move summit/messages/kdebase/kcmshell.po summit/messages/kde-runtime/kcmshell.po move summit/messages/kdebase/kdebugdialog.po summit/messages/kde-runtime/kdebugdialog.po move summit/messages/kdebase/kde-menu.po summit/messages/kde-runtime/kde-menu.po move summit/messages/kdebase/kdesud.po summit/messages/kde-runtime/kdesud.po move summit/messages/kdebase/kdesu.po summit/messages/kde-runtime/kdesu.po move summit/messages/kdebase/kdontchangethehostname.po summit/messages/kde-runtime/kdontchangethehostname.po move summit/messages/kdebase/kfile.po summit/messages/kde-runtime/kfile.po move summit/messages/kdebase/kglobalaccel.po summit/messages/kde-runtime/kglobalaccel.po move summit/messages/kdebase/khelpcenter.po summit/messages/kde-runtime/khelpcenter.po move summit/messages/kdebase/khotnewstuff.po summit/messages/kde-runtime/khotnewstuff.po move summit/messages/kdebase/kiconfinder.po summit/messages/kde-runtime/kiconfinder.po move summit/messages/kdebase/kio_applications.po summit/messages/kde-runtime/kio_applications.po move summit/messages/kdebase/kio_archive.po summit/messages/kde-runtime/kio_archive.po move summit/messages/kdebase/kio_bookmarks.po summit/messages/kde-runtime/kio_bookmarks.po move summit/messages/kdebase/kioclient.po summit/messages/kde-runtime/kioclient.po move summit/messages/kdebase/kioexec.po summit/messages/kde-runtime/kioexec.po move summit/messages/kdebase/kio_finger.po summit/messages/kde-runtime/kio_finger.po move summit/messages/kdebase/kio_fish.po summit/messages/kde-runtime/kio_fish.po move summit/messages/kdebase/kio_floppy.po summit/messages/kde-runtime/kio_floppy.po move summit/messages/kdebase/kio_info.po summit/messages/kde-runtime/kio_info.po move summit/messages/kdebase/kio_man.po summit/messages/kde-runtime/kio_man.po move summit/messages/kdebase/kio_nepomuk.po summit/messages/kde-runtime/kio_nepomuk.po move summit/messages/kdebase/kio_nepomuksearch.po summit/messages/kde-runtime/kio_nepomuksearch.po move summit/messages/kdebase/kio_nfs.po summit/messages/kde-runtime/kio_nfs.po move summit/messages/kdebase/kio_remote.po summit/messages/kde-runtime/kio_remote.po move summit/messages/kdebase/kio_sftp.po summit/messages/kde-runtime/kio_sftp.po move summit/messages/kdebase/kio_smb.po summit/messages/kde-runtime/kio_smb.po move summit/messages/kdebase/kio_thumbnail.po summit/messages/kde-runtime/kio_thumbnail.po move summit/messages/kdebase/kio_timeline.po summit/messages/kde-runtime/kio_timeline.po move summit/messages/kdebase/kio_trash.po summit/messages/kde-runtime/kio_trash.po move summit/messages/kdebase/kmimetypefinder.po summit/messages/kde-runtime/kmimetypefinder.po move summit/messages/kdebase/knetattach.po summit/messages/kde-runtime/knetattach.po move summit/messages/kdebase/knotify4.po summit/messages/kde-runtime/knotify4.po move summit/messages/kdebase/kpasswdserver.po summit/messages/kde-runtime/kpasswdserver.po move summit/messages/kdebase/kquitapp.po summit/messages/kde-runtime/kquitapp.po move summit/messages/kdebase/kreadconfig.po summit/messages/kde-runtime/kreadconfig.po move summit/messages/kdebase/kshorturifilter.po summit/messages/kde-runtime/kshorturifilter.po move summit/messages/kdebase/kstart.po summit/messages/kde-runtime/kstart.po move summit/messages/kdebase/ktraderclient.po summit/messages/kde-runtime/ktraderclient.po move summit/messages/kdebase/kuiserver.po summit/messages/kde-runtime/kuiserver.po move summit/messages/kdebase/kurifilter.po summit/messages/kde-runtime/kurifilter.po move summit/messages/kdebase/kwalletd.po summit/messages/kde-runtime/kwalletd.po move summit/messages/kdebase/kwinshutdown.po summit/messages/kde-runtime/kwinshutdown.po move summit/messages/kdebase/kwinstartmenu.po summit/messages/kde-runtime/kwinstartmenu.po move summit/messages/kdebase/kwriteconfig.po summit/messages/kde-runtime/kwriteconfig.po move summit/messages/kdebase/nepomukbackup.po summit/messages/kde-runtime/nepomukbackup.po move summit/messages/kdebase/nepomukcontroller.po summit/messages/kde-runtime/nepomukcontroller.po move summit/messages/kdebase/nepomukfileindexer.po summit/messages/kde-runtime/nepomukfileindexer.po move summit/messages/kdebase/nepomukqueryservice.po summit/messages/kde-runtime/nepomukqueryservice.po move summit/messages/kdebase/nepomukserver.po summit/messages/kde-runtime/nepomukserver.po move summit/messages/kdebase/nepomukservicestub.po summit/messages/kde-runtime/nepomukservicestub.po move summit/messages/kdebase/nepomukstorage.po summit/messages/kde-runtime/nepomukstorage.po move summit/messages/kdebase/phonon_kde.po summit/messages/kde-runtime/phonon_kde.po move summit/messages/kdebase/phononserver.po summit/messages/kde-runtime/phononserver.po move summit/messages/kdebase/plasma_applet_newspaper.po summit/messages/kde-runtime/plasma_applet_newspaper.po move summit/messages/kdebase/plasmapkg.po summit/messages/kde-runtime/plasmapkg.po move summit/messages/kdebase/plasma-remote-helper.po summit/messages/kde-runtime/plasma-remote-helper.po move summit/messages/kdebase/plasma_scriptengine_qscript.po summit/messages/kde-runtime/plasma_scriptengine_qscript.po move summit/messages/kdebase/solid-hardware.po summit/messages/kde-runtime/solid-hardware.po move summit/messages/kdebase/soliduiserver.po summit/messages/kde-runtime/soliduiserver.po move summit/messages/kdebase/display.po summit/messages/kde-workspace/display.po move summit/messages/kdebase/freespacenotifier.po summit/messages/kde-workspace/freespacenotifier.po move summit/messages/kdebase/joystick.po summit/messages/kde-workspace/joystick.po move summit/messages/kdebase/kaccess.po summit/messages/kde-workspace/kaccess.po move summit/messages/kdebase/kblankscrn.po summit/messages/kde-workspace/kblankscrn.po move summit/messages/kdebase/kcmaccess.po summit/messages/kde-workspace/kcmaccess.po move summit/messages/kdebase/kcm_autostart.po summit/messages/kde-workspace/kcm_autostart.po move summit/messages/kdebase/kcmbackground.po summit/messages/kde-workspace/kcmbackground.po move summit/messages/kdebase/kcmbell.po summit/messages/kde-workspace/kcmbell.po move summit/messages/kdebase/kcmcolors.po summit/messages/kde-workspace/kcmcolors.po move summit/messages/kdebase/kcm_desktoppaths.po summit/messages/kde-workspace/kcm_desktoppaths.po move summit/messages/kdebase/kcm_desktopthemedetails.po summit/messages/kde-workspace/kcm_desktopthemedetails.po move summit/messages/kdebase/kcmdevinfo.po summit/messages/kde-workspace/kcmdevinfo.po move summit/messages/kdebase/kcmfonts.po summit/messages/kde-workspace/kcmfonts.po move summit/messages/kdebase/kcm_infobase.po summit/messages/kde-workspace/kcm_infobase.po move summit/messages/kdebase/kcminfo.po summit/messages/kde-workspace/kcminfo.po move summit/messages/kdebase/kcm_infosummary.po summit/messages/kde-workspace/kcm_infosummary.po move summit/messages/kdebase/kcminit.po summit/messages/kde-workspace/kcminit.po move summit/messages/kdebase/kcminput.po summit/messages/kde-workspace/kcminput.po move summit/messages/kdebase/kcmkclock.po summit/messages/kde-workspace/kcmkclock.po move summit/messages/kdebase/kcmkeyboard.po summit/messages/kde-workspace/kcmkeyboard.po move summit/messages/kdebase/kcmkeys.po summit/messages/kde-workspace/kcmkeys.po move summit/messages/kdebase/kcmkwincompositing.po summit/messages/kde-workspace/kcmkwincompositing.po move summit/messages/kdebase/kcmkwindecoration.po summit/messages/kde-workspace/kcmkwindecoration.po move summit/messages/kdebase/kcm_kwindesktop.po summit/messages/kde-workspace/kcm_kwindesktop.po move summit/messages/kdebase/kcmkwinrules.po summit/messages/kde-workspace/kcmkwinrules.po move summit/messages/kdebase/kcmkwinscreenedges.po summit/messages/kde-workspace/kcmkwinscreenedges.po move summit/messages/kdebase/kcm_kwintabbox.po summit/messages/kde-workspace/kcm_kwintabbox.po move summit/messages/kdebase/kcmkwm.po summit/messages/kde-workspace/kcmkwm.po move summit/messages/kdebase/kcmlaunch.po summit/messages/kde-workspace/kcmlaunch.po move summit/messages/kdebase/kcm_memory.po summit/messages/kde-workspace/kcm_memory.po move summit/messages/kdebase/kcmnic.po summit/messages/kde-workspace/kcmnic.po move summit/messages/kdebase/kcmopengl.po summit/messages/kde-workspace/kcmopengl.po move summit/messages/kdebase/kcm_pci.po summit/messages/kde-workspace/kcm_pci.po move summit/messages/kdebase/kcmsamba.po summit/messages/kde-workspace/kcmsamba.po move summit/messages/kdebase/kcmscreensaver.po summit/messages/kde-workspace/kcmscreensaver.po move summit/messages/kdebase/kcmsmartcard.po summit/messages/kde-workspace/kcmsmartcard.po move summit/messages/kdebase/kcmsmserver.po summit/messages/kde-workspace/kcmsmserver.po move summit/messages/kdebase/kcm_solid_actions.po summit/messages/kde-workspace/kcm_solid_actions.po move summit/messages/kdebase/kcm_solid.po summit/messages/kde-workspace/kcm_solid.po move summit/messages/kdebase/kcm_standard_actions.po summit/messages/kde-workspace/kcm_standard_actions.po move summit/messages/kdebase/kcmstyle.po summit/messages/kde-workspace/kcmstyle.po move summit/messages/kdebase/kcmusb.po summit/messages/kde-workspace/kcmusb.po move summit/messages/kdebase/kcmview1394.po summit/messages/kde-workspace/kcmview1394.po move summit/messages/kdebase/kcmworkspaceoptions.po summit/messages/kde-workspace/kcmworkspaceoptions.po move summit/messages/kdebase/kcmxinerama.po summit/messages/kde-workspace/kcmxinerama.po move summit/messages/kdebase/kdmconfig.po summit/messages/kde-workspace/kdmconfig.po move summit/messages/kdebase/kdmgreet.po summit/messages/kde-workspace/kdmgreet.po move summit/messages/kdebase/kfontinst.po summit/messages/kde-workspace/kfontinst.po move summit/messages/kdebase/kgreet_classic.po summit/messages/kde-workspace/kgreet_classic.po move summit/messages/kdebase/kgreet_generic.po summit/messages/kde-workspace/kgreet_generic.po move summit/messages/kdebase/kgreet_winbind.po summit/messages/kde-workspace/kgreet_winbind.po move summit/messages/kdebase/khotkeys.po summit/messages/kde-workspace/khotkeys.po move summit/messages/kdebase/kinfocenter.po summit/messages/kde-workspace/kinfocenter.po move summit/messages/kdebase/klipper.po summit/messages/kde-workspace/klipper.po move summit/messages/kdebase/kmenuedit.po summit/messages/kde-workspace/kmenuedit.po move summit/messages/kdebase/krandr.po summit/messages/kde-workspace/krandr.po move summit/messages/kdebase/krdb.po summit/messages/kde-workspace/krdb.po move summit/messages/kdebase/krunner.po summit/messages/kde-workspace/krunner.po move summit/messages/kdebase/kscreensaver.po summit/messages/kde-workspace/kscreensaver.po move summit/messages/kdebase/ksmserver.po summit/messages/kde-workspace/ksmserver.po move summit/messages/kdebase/ksplashthemes.po summit/messages/kde-workspace/ksplashthemes.po move summit/messages/kdebase/kstyle_config.po summit/messages/kde-workspace/kstyle_config.po move summit/messages/kdebase/ksysguardlsofwidgets.po summit/messages/kde-workspace/ksysguardlsofwidgets.po move summit/messages/kdebase/ksysguard.po summit/messages/kde-workspace/ksysguard.po move summit/messages/kdebase/ksystraycmd.po summit/messages/kde-workspace/ksystraycmd.po move summit/messages/kdebase/kwin_clients.po summit/messages/kde-workspace/kwin_clients.po move summit/messages/kdebase/kwin_effects.po summit/messages/kde-workspace/kwin_effects.po move summit/messages/kdebase/kwin.po summit/messages/kde-workspace/kwin.po move summit/messages/kdebase/kxkb.po summit/messages/kde-workspace/kxkb.po move summit/messages/kdebase/libkdecorations.po summit/messages/kde-workspace/libkdecorations.po move summit/messages/kdebase/libkscreensaver.po summit/messages/kde-workspace/libkscreensaver.po move summit/messages/kdebase/libkworkspace.po summit/messages/kde-workspace/libkworkspace.po move summit/messages/kdebase/libplasmaclock.po summit/messages/kde-workspace/libplasmaclock.po move summit/messages/kdebase/libtaskmanager.po summit/messages/kde-workspace/libtaskmanager.po move summit/messages/kdebase/plasma_applet_battery.po summit/messages/kde-workspace/plasma_applet_battery.po move summit/messages/kdebase/plasma_applet_clock.po summit/messages/kde-workspace/plasma_applet_clock.po move summit/messages/kdebase/plasma_applet_currentappcontrol.po summit/messages/kde-workspace/plasma_applet_currentappcontrol.po move summit/messages/kdebase/plasma_applet_devicenotifier.po summit/messages/kde-workspace/plasma_applet_devicenotifier.po move summit/messages/kdebase/plasma_applet_dig_clock.po summit/messages/kde-workspace/plasma_applet_dig_clock.po move summit/messages/kdebase/plasma_applet_icon.po summit/messages/kde-workspace/plasma_applet_icon.po move summit/messages/kdebase/plasma_applet_launcher.po summit/messages/kde-workspace/plasma_applet_launcher.po move summit/messages/kdebase/plasma_applet_lockout.po summit/messages/kde-workspace/plasma_applet_lockout.po move summit/messages/kdebase/plasma_applet_netpanel.po summit/messages/kde-workspace/plasma_applet_netpanel.po move summit/messages/kdebase/plasma_applet_notifications.po summit/messages/kde-workspace/plasma_applet_notifications.po move summit/messages/kdebase/plasma_applet_pager.po summit/messages/kde-workspace/plasma_applet_pager.po move summit/messages/kdebase/plasma_applet_panel.po summit/messages/kde-workspace/plasma_applet_panel.po move summit/messages/kdebase/plasma_applet_panelspacer_internal.po summit/messages/kde-workspace/plasma_applet_panelspacer_internal.po move summit/messages/kdebase/plasma_applet_quicklaunch.po summit/messages/kde-workspace/plasma_applet_quicklaunch.po move summit/messages/kdebase/plasma_applet_sal.po summit/messages/kde-workspace/plasma_applet_sal.po move summit/messages/kdebase/plasma_applet_saverdesktop.po summit/messages/kde-workspace/plasma_applet_saverdesktop.po move summit/messages/kdebase/plasma_appletscriptengine_dashboard.po summit/messages/kde-workspace/plasma_appletscriptengine_dashboard.po move summit/messages/kdebase/plasma_applet_searchbox.po summit/messages/kde-workspace/plasma_applet_searchbox.po move summit/messages/kdebase/plasma_applet_showactivitymanager.po summit/messages/kde-workspace/plasma_applet_showactivitymanager.po move summit/messages/kdebase/plasma_applet_system-monitor.po summit/messages/kde-workspace/plasma_applet_system-monitor.po move summit/messages/kdebase/plasma_applet_systemtray.po summit/messages/kde-workspace/plasma_applet_systemtray.po move summit/messages/kdebase/plasma_applet_tasks.po summit/messages/kde-workspace/plasma_applet_tasks.po move summit/messages/kdebase/plasma_applet_trash.po summit/messages/kde-workspace/plasma_applet_trash.po move summit/messages/kdebase/plasma_applet_webbrowser.po summit/messages/kde-workspace/plasma_applet_webbrowser.po move summit/messages/kdebase/plasma_applet_windowlist.po summit/messages/kde-workspace/plasma_applet_windowlist.po move summit/messages/kdebase/plasma_containmentactions_contextmenu.po summit/messages/kde-workspace/plasma_containmentactions_contextmenu.po move summit/messages/kdebase/plasma_containmentactions_switchactivity.po summit/messages/kde-workspace/plasma_containmentactions_switchactivity.po move summit/messages/kdebase/plasma_containmentactions_switchdesktop.po summit/messages/kde-workspace/plasma_containmentactions_switchdesktop.po move summit/messages/kdebase/plasma_containmentactions_switchwindow.po summit/messages/kde-workspace/plasma_containmentactions_switchwindow.po move summit/messages/kdebase/plasma-desktop.po summit/messages/kde-workspace/plasma-desktop.po move summit/messages/kdebase/plasma_engine_calendar.po summit/messages/kde-workspace/plasma_engine_calendar.po move summit/messages/kdebase/plasmaengineexplorer.po summit/messages/kde-workspace/plasmaengineexplorer.po move summit/messages/kdebase/plasma_engine_keystate.po summit/messages/kde-workspace/plasma_engine_keystate.po move summit/messages/kdebase/plasma_engine_kuiserver.po summit/messages/kde-workspace/plasma_engine_kuiserver.po move summit/messages/kdebase/plasma_engine_metadata.po summit/messages/kde-workspace/plasma_engine_metadata.po move summit/messages/kdebase/plasma_engine_network.po summit/messages/kde-workspace/plasma_engine_network.po move summit/messages/kdebase/plasma_engine_notifications.po summit/messages/kde-workspace/plasma_engine_notifications.po move summit/messages/kdebase/plasma_engine_nowplaying.po summit/messages/kde-workspace/plasma_engine_nowplaying.po move summit/messages/kdebase/plasma_engine_rss.po summit/messages/kde-workspace/plasma_engine_rss.po move summit/messages/kdebase/plasma_engine_share.po summit/messages/kde-workspace/plasma_engine_share.po move summit/messages/kdebase/plasma_engine_soliddevice.po summit/messages/kde-workspace/plasma_engine_soliddevice.po move summit/messages/kdebase/plasma_engine_weather.po summit/messages/kde-workspace/plasma_engine_weather.po move summit/messages/kdebase/plasmagenericshell.po summit/messages/kde-workspace/plasmagenericshell.po move summit/messages/kdebase/plasma-netbook.po summit/messages/kde-workspace/plasma-netbook.po move summit/messages/kdebase/plasma-overlay.po summit/messages/kde-workspace/plasma-overlay.po move summit/messages/kdebase/plasma_runner_activities.po summit/messages/kde-workspace/plasma_runner_activities.po move summit/messages/kdebase/plasma_runner_bookmarksrunner.po summit/messages/kde-workspace/plasma_runner_bookmarksrunner.po move summit/messages/kdebase/plasma_runner_calculatorrunner.po summit/messages/kde-workspace/plasma_runner_calculatorrunner.po move summit/messages/kdebase/plasma_runner_kill.po summit/messages/kde-workspace/plasma_runner_kill.po move summit/messages/kdebase/plasma_runner_locations.po summit/messages/kde-workspace/plasma_runner_locations.po move summit/messages/kdebase/plasma_runner_nepomuksearchrunner.po summit/messages/kde-workspace/plasma_runner_nepomuksearchrunner.po move summit/messages/kdebase/plasma_runner_placesrunner.po summit/messages/kde-workspace/plasma_runner_placesrunner.po move summit/messages/kdebase/plasma_runner_plasma-desktop.po summit/messages/kde-workspace/plasma_runner_plasma-desktop.po move summit/messages/kdebase/plasma_runner_powerdevil.po summit/messages/kde-workspace/plasma_runner_powerdevil.po move summit/messages/kdebase/plasma_runner_recentdocuments.po summit/messages/kde-workspace/plasma_runner_recentdocuments.po move summit/messages/kdebase/plasma_runner_services.po summit/messages/kde-workspace/plasma_runner_services.po move summit/messages/kdebase/plasma_runner_sessions.po summit/messages/kde-workspace/plasma_runner_sessions.po move summit/messages/kdebase/plasma_runner_shell.po summit/messages/kde-workspace/plasma_runner_shell.po move summit/messages/kdebase/plasma_runner_solid.po summit/messages/kde-workspace/plasma_runner_solid.po move summit/messages/kdebase/plasma_runner_webshortcuts.po summit/messages/kde-workspace/plasma_runner_webshortcuts.po move summit/messages/kdebase/plasma_runner_windowedwidgets.po summit/messages/kde-workspace/plasma_runner_windowedwidgets.po move summit/messages/kdebase/plasma_runner_windows.po summit/messages/kde-workspace/plasma_runner_windows.po move summit/messages/kdebase/plasma_toolbox_desktoptoolbox.po summit/messages/kde-workspace/plasma_toolbox_desktoptoolbox.po move summit/messages/kdebase/plasma_toolbox_paneltoolbox.po summit/messages/kde-workspace/plasma_toolbox_paneltoolbox.po move summit/messages/kdebase/plasma_wallpaper_color.po summit/messages/kde-workspace/plasma_wallpaper_color.po move summit/messages/kdebase/plasma_wallpaper_image.po summit/messages/kde-workspace/plasma_wallpaper_image.po move summit/messages/kdebase/plasmawallpaperviewer.po summit/messages/kde-workspace/plasmawallpaperviewer.po move summit/messages/kdebase/plasma-windowed.po summit/messages/kde-workspace/plasma-windowed.po move summit/messages/kdebase/plasmoidviewer.po summit/messages/kde-workspace/plasmoidviewer.po move summit/messages/kdebase/powerdevilglobalconfig.po summit/messages/kde-workspace/powerdevilglobalconfig.po move summit/messages/kdebase/powerdevil.po summit/messages/kde-workspace/powerdevil.po move summit/messages/kdebase/powerdevilprofilesconfig.po summit/messages/kde-workspace/powerdevilprofilesconfig.po move summit/messages/kdebase/processcore.po summit/messages/kde-workspace/processcore.po move summit/messages/kdebase/processui.po summit/messages/kde-workspace/processui.po move summit/messages/kdebase/randrmonitor.po summit/messages/kde-workspace/randrmonitor.po move summit/messages/kdebase/remote-widgets-browser.po summit/messages/kde-workspace/remote-widgets-browser.po move summit/messages/kdebase/solidcontrol.po summit/messages/kde-workspace/solidcontrol.po move summit/messages/kdebase/solid-network.po summit/messages/kde-workspace/solid-network.po move summit/messages/kdebase/systemsettings.po summit/messages/kde-workspace/systemsettings.po move summit/messages/kdebase/adblock.po summit/messages/kde-baseapps/adblock.po move summit/messages/kdebase/akregator_konqplugin.po summit/messages/kde-baseapps/akregator_konqplugin.po move summit/messages/kdebase/autorefresh.po summit/messages/kde-baseapps/autorefresh.po move summit/messages/kdebase/babelfish.po summit/messages/kde-baseapps/babelfish.po move summit/messages/kdebase/dirfilterplugin.po summit/messages/kde-baseapps/dirfilterplugin.po move summit/messages/kdebase/dolphin.po summit/messages/kde-baseapps/dolphin.po move summit/messages/kdebase/domtreeviewer.po summit/messages/kde-baseapps/domtreeviewer.po move summit/messages/kdebase/fsview.po summit/messages/kde-baseapps/fsview.po move summit/messages/kdebase/imgalleryplugin.po summit/messages/kde-baseapps/imgalleryplugin.po move summit/messages/kdebase/kcmkio.po summit/messages/kde-baseapps/kcmkio.po move summit/messages/kdebase/kcmkonqhtml.po summit/messages/kde-baseapps/kcmkonqhtml.po move summit/messages/kdebase/kcmkonq.po summit/messages/kde-baseapps/kcmkonq.po move summit/messages/kdebase/kcmkurifilt.po summit/messages/kde-baseapps/kcmkurifilt.po move summit/messages/kdebase/kcmperformance.po summit/messages/kde-baseapps/kcmperformance.po move summit/messages/kdebase/kdepasswd.po summit/messages/kde-baseapps/kdepasswd.po move summit/messages/kdebase/kdialog.po summit/messages/kde-baseapps/kdialog.po move summit/messages/kdebase/keditbookmarks.po summit/messages/kde-baseapps/keditbookmarks.po move summit/messages/kdebase/kfindpart.po summit/messages/kde-baseapps/kfindpart.po move summit/messages/kdebase/kfmclient.po summit/messages/kde-baseapps/kfmclient.po move summit/messages/kdebase/khtmlkttsd.po summit/messages/kde-baseapps/khtmlkttsd.po move summit/messages/kdebase/khtmlsettingsplugin.po summit/messages/kde-baseapps/khtmlsettingsplugin.po move summit/messages/kdebase/konqueror.po summit/messages/kde-baseapps/konqueror.po move summit/messages/kdebase/kshellcmdplugin.po summit/messages/kde-baseapps/kshellcmdplugin.po move summit/messages/kdebase/libkonq.po summit/messages/kde-baseapps/libkonq.po move summit/messages/kdebase/mf_konqplugin.po summit/messages/kde-baseapps/mf_konqplugin.po move summit/messages/kdebase/minitoolsplugin.po summit/messages/kde-baseapps/minitoolsplugin.po move summit/messages/kdebase/nsplugin.po summit/messages/kde-baseapps/nsplugin.po move summit/messages/kdebase/plasma_applet_folderview.po summit/messages/kde-baseapps/plasma_applet_folderview.po move summit/messages/kdebase/rellinks.po summit/messages/kde-baseapps/rellinks.po move summit/messages/kdebase/searchbarplugin.po summit/messages/kde-baseapps/searchbarplugin.po move summit/messages/kdebase/uachangerplugin.po summit/messages/kde-baseapps/uachangerplugin.po move summit/messages/kdebase/useraccount.po summit/messages/kde-baseapps/useraccount.po move summit/messages/kdebase/validatorsplugin.po summit/messages/kde-baseapps/validatorsplugin.po move summit/messages/kdebase/webarchiver.po summit/messages/kde-baseapps/webarchiver.po move summit/messages/kdebase/konsole.po summit/messages/kde-baseapps/konsole.po move summit/messages/kdebase/katebacktracebrowserplugin.po summit/messages/kde-baseapps/katebacktracebrowserplugin.po move summit/messages/kdebase/katebuild-plugin.po summit/messages/kde-baseapps/katebuild-plugin.po move summit/messages/kdebase/kate-ctags-plugin.po summit/messages/kde-baseapps/kate-ctags-plugin.po move summit/messages/kdebase/kateexternaltoolsplugin.po summit/messages/kde-baseapps/kateexternaltoolsplugin.po move summit/messages/kdebase/katefilebrowserplugin.po summit/messages/kde-baseapps/katefilebrowserplugin.po move summit/messages/kdebase/katefiletemplates.po summit/messages/kde-baseapps/katefiletemplates.po move summit/messages/kdebase/katefindinfilesplugin.po summit/messages/kde-baseapps/katefindinfilesplugin.po move summit/messages/kdebase/kategdbplugin.po summit/messages/kde-baseapps/kategdbplugin.po move summit/messages/kdebase/katehelloworld.po summit/messages/kde-baseapps/katehelloworld.po move summit/messages/kdebase/katekonsoleplugin.po summit/messages/kde-baseapps/katekonsoleplugin.po move summit/messages/kdebase/kate_kttsd.po summit/messages/kde-baseapps/kate_kttsd.po move summit/messages/kdebase/katemailfilesplugin.po summit/messages/kde-baseapps/katemailfilesplugin.po move summit/messages/kdebase/kateopenheader.po summit/messages/kde-baseapps/kateopenheader.po move summit/messages/kdebase/katepart4.po summit/messages/kde-baseapps/katepart4.po move summit/messages/kdebase/kate.po summit/messages/kde-baseapps/kate.po move summit/messages/kdebase/katequickdocumentswitcherplugin.po summit/messages/kde-baseapps/katequickdocumentswitcherplugin.po move summit/messages/kdebase/katesearch.po summit/messages/kde-baseapps/katesearch.po move summit/messages/kdebase/katesnippets_tng.po summit/messages/kde-baseapps/katesnippets_tng.po move summit/messages/kdebase/katesql.po summit/messages/kde-baseapps/katesql.po move summit/messages/kdebase/katesymbolviewer.po summit/messages/kde-baseapps/katesymbolviewer.po move summit/messages/kdebase/katetabbarextension.po summit/messages/kde-baseapps/katetabbarextension.po move summit/messages/kdebase/katetabifyplugin.po summit/messages/kde-baseapps/katetabifyplugin.po move summit/messages/kdebase/katetextfilter.po summit/messages/kde-baseapps/katetextfilter.po move summit/messages/kdebase/katexmlcheck.po summit/messages/kde-baseapps/katexmlcheck.po move summit/messages/kdebase/katexmltools.po summit/messages/kde-baseapps/katexmltools.po move summit/messages/kdebase/kte_acomment.po summit/messages/kde-baseapps/kte_acomment.po move summit/messages/kdebase/ktesnippets_editor.po summit/messages/kde-baseapps/ktesnippets_editor.po move summit/messages/kdebase/ktexteditor_codesnippets_core.po summit/messages/kde-baseapps/ktexteditor_codesnippets_core.po move summit/messages/kdebase/ktexteditor_plugins.po summit/messages/kde-baseapps/ktexteditor_plugins.po move summit/messages/kdebase/kwrite.po summit/messages/kde-baseapps/kwrite.po move summit/messages/kdebase/plasma_applet_katesession.po summit/messages/kde-baseapps/plasma_applet_katesession.po move summit/docmessages/kdebase-runtime/kate_advanced.po summit/docmessages/kdebase-apps/kate_advanced.po move summit/docmessages/kdebase-runtime/kate_configuring.po summit/docmessages/kdebase-apps/kate_configuring.po move summit/docmessages/kdebase-runtime/kate_fundamentals.po summit/docmessages/kdebase-apps/kate_fundamentals.po move summit/docmessages/kdebase-runtime/kate_highlighting.po summit/docmessages/kdebase-apps/kate_highlighting.po move summit/docmessages/kdebase-runtime/kate_man-kate.1.po summit/docmessages/kdebase-apps/kate_man-kate.1.po move summit/docmessages/kdebase-runtime/kate_mdi.po summit/docmessages/kdebase-apps/kate_mdi.po move summit/docmessages/kdebase-runtime/kate_menus.po summit/docmessages/kdebase-apps/kate_menus.po move summit/docmessages/kdebase-runtime/kate_part.po summit/docmessages/kdebase-apps/kate_part.po move summit/docmessages/kdebase-runtime/kate_plugins.po summit/docmessages/kdebase-apps/kate_plugins.po move summit/docmessages/kdebase-runtime/kate.po summit/docmessages/kdebase-apps/kate.po move summit/docmessages/kdebase-runtime/kate_regular-expressions.po summit/docmessages/kdebase-apps/kate_regular-expressions.po move summit/docmessages/kdebase-runtime/kate_vi.po summit/docmessages/kdebase-apps/kate_vi.po move summit/docmessages/kdebase-runtime/kwrite.po summit/docmessages/kdebase-apps/kwrite.po move summit/messages/kdebase/desktop_kde-baseapps_kate.po summit/messages/kde-baseapps/desktop_kde-baseapps_kate.po move summit/messages/kdebase/desktop_kde-baseapps_konsole.po summit/messages/kde-baseapps/desktop_kde-baseapps_konsole.po move summit/messages/kdebase/desktop_kde-baseapps.po summit/messages/kde-baseapps/desktop_kde-baseapps.po move summit/messages/kdebase/desktop_kde-runtime.po summit/messages/kde-runtime/desktop_kde-runtime.po move summit/messages/kdebase/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_kde-workspace.po move summit/messages/kdebase/kstyle_keramik_config.po summit/messages/kde-workspace/kstyle_keramik_config.po move summit/docmessages/kdebase-runtime/ summit/docmessages/kde-runtime/ move summit/docmessages/kdebase-workspace/ summit/docmessages/kde-workspace/ move summit/docmessages/kdebase-apps/ summit/docmessages/kde-baseapps/ move summit/messages/playground-network/telepathy-contactslist-prototype.po summit/messages/playground-network/telepathy-kde-contactlist.po move summit/messages/kde-runtime/kactivitymanagerd.po summit/messages/kdelibs/kactivitymanagerd.po delete summit/messages/playground-base/busynotifier.po move summit/messages/playground-network/desktop_playground-network_telepathy-chat-handler.po summit/messages/playground-network/desktop_playground-network_telepathy-text-ui.po merge summit/docmessages/extragear-sdk/kxsldbg_callstack.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_credits.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_entities.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_glossary.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_configure.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_inspector.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_mainwindow.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_kxsldbg_tools.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_sources.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_templates.po summit/docmessages/extragear-sdk/kxsldbg.po merge summit/docmessages/extragear-sdk/kxsldbg_variables.po summit/docmessages/extragear-sdk/kxsldbg.po delete summit/docmessages/extragear-graphics/kipi-plugins_cdarchiving.po delete summit/docmessages/extragear-graphics/kipi-plugins_mpegencoder.po move summit/messages/kde-baseapps/katefindinfilesplugin.po summit/messages/kde-workspace/katefindinfilesplugin.po delete summit/messages/playground-network/desktop_playground-network_telepathy-accounts-kcm-plugins.po move summit/messages/koffice/KexiMapBrowserFormPlugin.po summit/messages/koffice/kformdesigner_mapbrowser.po move summit/messages/koffice/KexiWebBrowserFormPlugin.po summit/messages/koffice/kformdesigner_webbrowser.po move summit/messages/koffice/MapsReportPlugin.po summit/messages/koffice/koreport_mapsplugin.po move summit/messages/koffice/WebReportPlugin.po summit/messages/koffice/koreport_webplugin.po delete summit/messages/playground-multimedia/plasma_applet_mediaplayer.po move summit/messages/playground-network/kcm_telepathy_accounts.po summit/messages/playground-network/telepathy-accounts-kcm.po move summit/messages/playground-network/telepathy_kde_approver.po summit/messages/playground-network/telepathy-kde-approver.po move summit/messages/playground-network/telepathy_auth_handler.po summit/messages/playground-network/telepathy-auth-handler.po mergekeep summit/messages/kdepim/akonadi_kalarm_resource.po summit/messages/kdepim-runtime/akonadi_serializer_plugins.po move summit/messages/kdepim/akonadi_kalarm_resource.po summit/messages/kdepim-runtime/akonadi_kalarm_resource.po copy summit/messages/kdeedu/kalgebra.po summit/messages/kdeedu/analitza.po move summit/messages/playground-base/ksecretservice.po summit/messages/kdereview/ksecretservice.po move summit/messages/playground-base/desktop_playground-base_ksecretservice.po summit/messages/kdereview/desktop_kdereview_ksecretservice.po move summit/messages/kde-workspace/plasma_applet_devicenotifier.po summit/messages/kde-workspace/notifier.po move summit/messages/kde-workspace/notifier.po summit/messages/kde-workspace/plasma_applet_notifier.po move summit/messages/playground-base/org.kde.active.activityscreen.po summit/messages/playground-base/plasma_applet_org.kde.active.activityscreen.po move summit/messages/playground-base/org.kde.activityswitcher.po summit/messages/playground-base/plasma_package_org.kde.activityswitcher.po move summit/messages/playground-multimedia/org.kde.mediacontainment.po summit/messages/playground-multimedia/plasma_applet_org.kde.mediacontainment.po delete summit/docmessages/extragear-multimedia/kplayer_howto-translation.po delete summit/docmessages/extragear-multimedia/kplayer_howto-properties.po delete summit/docmessages/extragear-multimedia/kplayer_howto-slaves.po delete summit/docmessages/extragear-multimedia/kplayer_howto-settings.po delete summit/docmessages/extragear-multimedia/kplayer_howto-playlist.po delete summit/docmessages/extragear-multimedia/kplayer_howto-installation.po delete summit/docmessages/extragear-multimedia/kplayer_howto.po delete summit/docmessages/extragear-multimedia/kplayer_howto-library.po delete summit/docmessages/extragear-multimedia/kplayer_howto-configuration.po delete summit/docmessages/extragear-multimedia/kplayer_howto-compilation.po delete summit/docmessages/extragear-multimedia/kplayer_howto-streams.po delete summit/docmessages/extragear-multimedia/kplayer_howto-subtitles.po delete summit/docmessages/extragear-multimedia/kplayer_howto-full-screen.po delete summit/docmessages/extragear-multimedia/kplayer_howto-devices.po delete summit/docmessages/extragear-multimedia/kplayer_howto-bug-reporting.po delete summit/docmessages/extragear-multimedia/kplayer_howto-troubleshooting.po merge summit/messages/playground-base/desktop_playground-base_kimpanel.po summit/messages/kdeplasma-addons/desktop_kdeplasma-addons.po move summit/messages/kdereview/ksecrets.po summit/messages/kdeutils/ksecrets.po move summit/messages/kdereview/desktop_kdereview_ksecrets.po summit/messages/kdeutils/desktop_kdeutils_ksecrets.po move summit/messages/kdereview/ksecretservice.po summit/messages/kde-runtime/ksecretservice.po merge summit/messages/kdereview/desktop_kdereview_ksecretservice.po summit/messages/kde-runtime/desktop_kde-runtime.po copy summit/docmessages/kde-baseapps/kwrite.po summit/docmessages/kde-baseapps/kwrite_configuring.po copy summit/docmessages/kde-baseapps/kwrite.po summit/docmessages/kde-baseapps/kwrite_fundamentals.po copy summit/docmessages/kde-baseapps/kwrite.po summit/docmessages/kde-baseapps/kwrite_menus.po merge summit/messages/kde-runtime/ksecretservice.po summit/messages/kdeutils/ksecrets.po mergekeep summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/kwl2kss.po mergekeep summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/ksecretsserviced.po mergekeep summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/ksecrets_kio.po mergekeep summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/ksecretsservice_api.po mergekeep summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/ksecretsync.po move summit/messages/kdeutils/ksecrets.po summit/messages/kdeutils/ksecrets_ksecrets.po delete summit/messages/playground-base/plasma_package_org.kde.active.launcher.po delete summit/docmessages/extragear-utils/krusader_java.po delete summit/messages/qt/desktop_kdesupport-phonon_phonon.po move summit/messages/playground-network/telepathy-common-internals.po summit/messages/playground-network/ktp-common-internals.po move summit/messages/playground-network/adiumxtra-protocol-handler.po summit/messages/playground-network/ktp-adiumxtra-protocol-handler.po move summit/messages/playground-network/telepathy-kde-text-ui.po summit/messages/playground-network/ktp-text-ui.po move summit/messages/playground-network/ktelepathy_chat_lib.po summit/messages/playground-network/ktpchat.po move summit/messages/playground-network/telepathy-chat-window-config.po summit/messages/playground-network/kcm_ktp_chat_behavior.po move summit/messages/playground-network/telepathy-kded-module.po summit/messages/playground-network/kded_ktp_integration_module.po move summit/messages/playground-network/telepathy-kde-contactlist.po summit/messages/playground-network/ktp-contactlist.po move summit/messages/playground-network/plasma_applet_telepathy_contact.po summit/messages/playground-network/plasma_applet_ktp_contact.po move summit/messages/playground-network/telepathy-accounts-kcm.po summit/messages/playground-network/kcm_ktp_accounts.po copy summit/messages/playground-network/kcm_ktp_chat_behavior.po summit/messages/playground-network/kcm_ktp_chat_appearance.po move summit/messages/playground-network/plasma_applet_org.kde.telepathy-presence.po summit/messages/playground-network/ktp-presence-applet.po move summit/messages/playground-network/telepathy-auth-handler.po summit/messages/playground-network/ktp-auth-handler.po move summit/messages/playground-network/telepathy-filetransfer-handler.po summit/messages/playground-network/ktp-filetransfer-handler.po move summit/messages/playground-network/telepathy-kde-approver.po summit/messages/playground-network/kded_ktp_approver.po move summit/messages/playground-network/kcm_ktp_accounts.po summit/messages/kdereview/kcm_ktp_accounts.po move summit/messages/playground-network/kcm_ktp_chat_appearance.po summit/messages/kdereview/kcm_ktp_chat_appearance.po move summit/messages/playground-network/kcm_ktp_chat_behavior.po summit/messages/kdereview/kcm_ktp_chat_behavior.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_butterfly.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_butterfly.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_gabble.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_gabble.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_haze.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_haze.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_idle.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_idle.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_rakia.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_rakia.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_salut.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_salut.po move summit/messages/playground-network/kcmtelepathyaccounts_plugin_sunshine.po summit/messages/kdereview/kcmtelepathyaccounts_plugin_sunshine.po move summit/messages/playground-network/kded_ktp_approver.po summit/messages/kdereview/kded_ktp_approver.po move summit/messages/playground-network/kded_ktp_integration_module.po summit/messages/kdereview/kded_ktp_integration_module.po move summit/messages/playground-network/ktp-adiumxtra-protocol-handler.po summit/messages/kdereview/ktp-adiumxtra-protocol-handler.po move summit/messages/playground-network/ktp-auth-handler.po summit/messages/kdereview/ktp-auth-handler.po move summit/messages/playground-network/ktpchat.po summit/messages/kdereview/ktpchat.po move summit/messages/playground-network/ktp-common-internals.po summit/messages/kdereview/ktp-common-internals.po move summit/messages/playground-network/ktp-contactlist.po summit/messages/kdereview/ktp-contactlist.po move summit/messages/playground-network/ktp-filetransfer-handler.po summit/messages/kdereview/ktp-filetransfer-handler.po move summit/messages/playground-network/ktp-presence-applet.po summit/messages/kdereview/ktp-presence-applet.po move summit/messages/playground-network/ktp-text-ui.po summit/messages/kdereview/ktp-text-ui.po move summit/messages/playground-network/plasma_applet_ktp_contact.po summit/messages/kdereview/plasma_applet_ktp_contact.po move summit/messages/playground-network/desktop_playground-network_telepathy-accounts-kcm.po summit/messages/kdereview/desktop_kdereview_ktp-accounts-kcm.po move summit/messages/playground-network/desktop_playground-network_telepathy-approver.po summit/messages/kdereview/desktop_kdereview_ktp-approver.po move summit/messages/playground-network/desktop_playground-network_telepathy-contact-applet.po summit/messages/kdereview/desktop_kdereview_ktp-contact-applet.po move summit/messages/playground-network/desktop_playground-network_telepathy-contact-list.po summit/messages/kdereview/desktop_kdereview_ktp-contact-list.po move summit/messages/playground-network/desktop_playground-network_telepathy-kded-module.po summit/messages/kdereview/desktop_kdereview_ktp-kded-module.po move summit/messages/playground-network/desktop_playground-network_telepathy-presence-applet.po summit/messages/kdereview/desktop_kdereview_ktp-presence-applet.po move summit/messages/playground-network/desktop_playground-network_telepathy-send-file.po summit/messages/kdereview/desktop_kdereview_ktp-send-file.po move summit/messages/playground-network/desktop_playground-network_telepathy-text-ui.po summit/messages/kdereview/desktop_kdereview_ktp-text-ui.po move summit/messages/playground-network/telepathy-kde-send-file.po summit/messages/playground-network/ktp-send-file.po move summit/messages/playground-network/ktp-send-file.po summit/messages/kdereview/ktp-send-file.po move summit/messages/playground-utils/ktouchpadenabler.po summit/messages/kdereview/ktouchpadenabler.po move summit/messages/playground-utils/desktop_playground-utils_ktouchpadenabler.po summit/messages/kdereview/desktop_kdereview_ktouchpadenabler.po move summit/messages/kdereview/kcm-grub2.po summit/messages/extragear-sysadmin/kcm-grub2.po move summit/messages/kdereview/desktop_kdereview_kcm-grub2.po summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_kcm-grub2.po move summit/messages/playground-network/desktop_playground-network_telepathy-launcher-kded.po summit/messages/playground-network/desktop_playground-network_ktp-launcher-kded.po move summit/messages/playground-network/desktop_playground-network_telepathy-presence-dataengine.po summit/messages/playground-network/desktop_playground-network_ktp-launcher-kded.po move summit/messages/playground-network/desktop_playground-network_telepathy-nepomuk-service.po summit/messages/playground-network/desktop_playground-network_ktp-nepomuk-service.po delete summit/messages/playground-multimedia/ktabedit.po delete summit/messages/playground-network/safra.po delete summit/docmessages/playground-network/kbandwidth.po delete summit/messages/playground-games/astrododge.po delete summit/messages/playground-games/astrogen.po delete summit/messages/playground-games/wordkubes.po delete summit/messages/playground-network/kbluetooth.po delete summit/messages/playground-games/market.po delete summit/messages/playground-games/nonogram.po delete summit/messages/playground-games/superpong.po delete summit/messages/playground-graphics/dekoroom.po delete summit/messages/playground-network/kssh4.po delete summit/messages/playground-graphics/athec.po delete summit/messages/playground-graphics/kremas.po delete summit/messages/playground-network/kepas.po move summit/messages/kdegraphics/desktop_kdegraphics_mobipocket.po summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-mobipocket.po delete summit/docmessages/playground-multimedia/kalva.po delete summit/docmessages/playground-multimedia/ktabedit.po delete summit/messages/playground-network/khtmlxsltplugin.po move summit/messages/kdereview/ktouchpadenabler.po summit/messages/extragear-base/ktouchpadenabler.po move summit/messages/kdereview/desktop_kdereview_ktouchpadenabler.po summit/messages/extragear-base/desktop_extragear-base_ktouchpadenabler.po move summit/messages/kdereview/kcm_ktp_accounts.po summit/messages/extragear-network/kcm_ktp_accounts.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_butterfly.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_butterfly.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_gabble.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_gabble.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_haze.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_haze.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_idle.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_idle.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_rakia.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_rakia.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_salut.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_salut.po move summit/messages/kdereview/kcmtelepathyaccounts_plugin_sunshine.po summit/messages/extragear-network/kcmtelepathyaccounts_plugin_sunshine.po move summit/messages/kdereview/kded_ktp_approver.po summit/messages/extragear-network/kded_ktp_approver.po move summit/messages/kdereview/ktp-auth-handler.po summit/messages/extragear-network/ktp-auth-handler.po move summit/messages/kdereview/ktp-common-internals.po summit/messages/extragear-network/ktp-common-internals.po move summit/messages/kdereview/plasma_applet_ktp_contact.po summit/messages/extragear-network/plasma_applet_ktp_contact.po move summit/messages/kdereview/ktp-contactlist.po summit/messages/extragear-network/ktp-contactlist.po move summit/messages/kdereview/ktp-filetransfer-handler.po summit/messages/extragear-network/ktp-filetransfer-handler.po move summit/messages/kdereview/kded_ktp_integration_module.po summit/messages/extragear-network/kded_ktp_integration_module.po move summit/messages/kdereview/ktp-presence-applet.po summit/messages/extragear-network/ktp-presence-applet.po move summit/messages/kdereview/ktp-send-file.po summit/messages/extragear-network/ktp-send-file.po move summit/messages/kdereview/kcm_ktp_chat_appearance.po summit/messages/extragear-network/kcm_ktp_chat_appearance.po move summit/messages/kdereview/kcm_ktp_chat_behavior.po summit/messages/extragear-network/kcm_ktp_chat_behavior.po move summit/messages/kdereview/ktp-adiumxtra-protocol-handler.po summit/messages/extragear-network/ktp-adiumxtra-protocol-handler.po move summit/messages/kdereview/ktpchat.po summit/messages/extragear-network/ktpchat.po move summit/messages/kdereview/ktp-text-ui.po summit/messages/extragear-network/ktp-text-ui.po move summit/messages/kdereview/desktop_kdereview_ktp-presence-applet.po summit/messages/extragear-network/desktop_extragear-network_ktp-presence-applet.po move summit/messages/kdereview/desktop_kdereview_ktp-approver.po summit/messages/extragear-network/desktop_extragear-network_ktp-approver.po move summit/messages/kdereview/desktop_kdereview_ktp-text-ui.po summit/messages/extragear-network/desktop_extragear-network_ktp-text-ui.po move summit/messages/kdereview/desktop_kdereview_ktp-send-file.po summit/messages/extragear-network/desktop_extragear-network_ktp-send-file.po move summit/messages/kdereview/desktop_kdereview_ktp-contact-applet.po summit/messages/extragear-network/desktop_extragear-network_ktp-contact-applet.po move summit/messages/kdereview/desktop_kdereview_ktp-accounts-kcm.po summit/messages/extragear-network/desktop_extragear-network_ktp-accounts-kcm.po move summit/messages/kdereview/desktop_kdereview_ktp-kded-module.po summit/messages/extragear-network/desktop_extragear-network_ktp-kded-module.po move summit/messages/kdereview/desktop_kdereview_ktp-contact-list.po summit/messages/extragear-network/desktop_extragear-network_ktp-contact-list.po move summit/messages/playground-accessibility/plasma_applet_simonoid2.po summit/messages/playground-accessibility/plasma_applet_simonoid.po move summit/messages/playground-accessibility/simonactivewindowconditionplugin.po summit/messages/playground-accessibility/simonactivewindowconditioncommand.po move summit/messages/playground-accessibility/simonaiplugin.po summit/messages/playground-accessibility/simonaicommand.po move summit/messages/playground-accessibility/simonakonadiplugin.po summit/messages/playground-accessibility/simonakonadicommand.po move summit/messages/playground-accessibility/simonatspiplugin.po summit/messages/playground-accessibility/simonatspicommand.po move summit/messages/playground-accessibility/simoncalculatorplugin.po summit/messages/playground-accessibility/simoncalculatorcommand.po move summit/messages/playground-accessibility/simoncompositeplugin.po summit/messages/playground-accessibility/simoncompositecommand.po move summit/messages/playground-accessibility/simondbusconditionplugin.po summit/messages/playground-accessibility/simondbusconditioncommand.po move summit/messages/playground-accessibility/simondbusplugin.po summit/messages/playground-accessibility/simondbuscommand.po move summit/messages/playground-accessibility/simondesktopgridplugin.po summit/messages/playground-accessibility/simondesktopgridcommand.po move summit/messages/playground-accessibility/simondialogplugin.po summit/messages/playground-accessibility/simondialogcommand.po move summit/messages/playground-accessibility/simondictationplugin.po summit/messages/playground-accessibility/simondictationcommand.po move summit/messages/playground-accessibility/simonexecutableplugin.po summit/messages/playground-accessibility/simonexecutablecommand.po move summit/messages/playground-accessibility/simonfilecontentplugin.po summit/messages/playground-accessibility/simonfilecontentcommand.po move summit/messages/playground-accessibility/simonfilterplugin.po summit/messages/playground-accessibility/simonfiltercommand.po move summit/messages/playground-accessibility/simoninputnumberplugin.po summit/messages/playground-accessibility/simoninputnumbercommand.po move summit/messages/playground-accessibility/simonjsonplugin.po summit/messages/playground-accessibility/simonjsoncommand.po move summit/messages/playground-accessibility/simonkeyboardplugin.po summit/messages/playground-accessibility/simonkeyboardcommand.po move summit/messages/playground-accessibility/simonlistplugin.po summit/messages/playground-accessibility/simonlistcommand.po move summit/messages/playground-accessibility/simonorconditionassociationconditionplugin.po summit/messages/playground-accessibility/simonorconditionassociationconditioncommand.po move summit/messages/playground-accessibility/simonplaceplugin.po summit/messages/playground-accessibility/simonplacecommand.po move summit/messages/playground-accessibility/simonprocessopenedconditionplugin.po summit/messages/playground-accessibility/simonprocessopenedconditioncommand.po move summit/messages/playground-accessibility/simonpronunciationtrainingplugin.po summit/messages/playground-accessibility/simonpronunciationtrainingcommand.po move summit/messages/playground-accessibility/simonrecognizerplugin.po summit/messages/playground-accessibility/simonrecognizercommand.po move summit/messages/playground-accessibility/simonshortcutplugin.po summit/messages/playground-accessibility/simonshortcutcommand.po move summit/messages/playground-accessibility/simontemplateplugin.po summit/messages/playground-accessibility/simontemplatecommand.po move summit/messages/playground-accessibility/simontextmacroplugin.po summit/messages/playground-accessibility/simontextmacrocommand.po merge summit/messages/kdereview/telepathy-kde-send-file.po summit/messages/extragear-network/ktp-send-file.po delete summit/messages/www/desktop_websites_identity-kde-org.po delete summit/docmessages/playground-games/parsek.po move summit/messages/playground-accessibility/simonactivewindowconditioncommand.po summit/messages/playground-accessibility/simonactivewindow.po move summit/messages/playground-accessibility/simonactivewindowconditionplugin.po summit/messages/playground-accessibility/simonactivewindow.po move summit/messages/playground-accessibility/simondbusconditioncommand.po summit/messages/playground-accessibility/simondbuscondition.po move summit/messages/playground-accessibility/simondbusconditionplugin.po summit/messages/playground-accessibility/simondbuscondition.po move summit/messages/playground-accessibility/simonfilecontentcommand.po summit/messages/playground-accessibility/simonfilecontent.po move summit/messages/playground-accessibility/simonfilecontentplugin.po summit/messages/playground-accessibility/simonfilecontent.po move summit/messages/playground-accessibility/simonorconditionassociationconditioncommand.po summit/messages/playground-accessibility/simonorconditionassociation.po move summit/messages/playground-accessibility/simonorconditionassociationconditionplugin.po summit/messages/playground-accessibility/simonorconditionassociation.po move summit/messages/playground-accessibility/simonprocessopenedconditioncommand.po summit/messages/playground-accessibility/simonprocessopenedcondition.po move summit/messages/playground-accessibility/simonprocessopenedconditionplugin.po summit/messages/playground-accessibility/simonprocessopenedcondition.po delete summit/messages/www/desktop_websites_jointhegame-kde-org.po move summit/messages/extragear-network/ktp-presence-applet.po summit/messages/extragear-network/plasma_applet_ktp_presence.po delete summit/messages/kde-workspace/katefindinfilesplugin.po delete summit/messages/kde-workspace/kstyle_keramik_config.po delete summit/messages/kdepim/akonadi_nepomuk_email_feeder.po delete summit/messages/kdepim/kdepimwizards.po delete summit/messages/kdepim/kio_groupwise.po delete summit/messages/kdepim/kres_groupwise.po move summit/docmessages/kde-runtime/kcm_ssl.po summit/docmessages/kde-runtime/kcontrol_kcm_ssl.po delete summit/messages/playground-games/draughts.po delete summit/messages/playground-graphics/plasma_applet_flickr.po copy summit/messages/kdepim/kmailcvt.po summit/messages/kdepim/libmailimporter.po move summit/messages/playground-accessibility/afaras.po summit/messages/kdereview/afaras.po move summit/messages/playground-accessibility/ksimond.po summit/messages/kdereview/ksimond.po move summit/messages/playground-accessibility/plasma_applet_simonoid.po summit/messages/kdereview/plasma_applet_simonoid.po move summit/messages/playground-accessibility/sam.po summit/messages/kdereview/sam.po move summit/messages/playground-accessibility/simonactivewindow.po summit/messages/kdereview/simonactivewindow.po move summit/messages/playground-accessibility/simonaicommand.po summit/messages/kdereview/simonaicommand.po move summit/messages/playground-accessibility/simonakonadicommand.po summit/messages/kdereview/simonakonadicommand.po move summit/messages/playground-accessibility/simonatspicommand.po summit/messages/kdereview/simonatspicommand.po move summit/messages/playground-accessibility/simoncalculatorcommand.po summit/messages/kdereview/simoncalculatorcommand.po move summit/messages/playground-accessibility/simoncompositecommand.po summit/messages/kdereview/simoncompositecommand.po move summit/messages/playground-accessibility/simondbuscommand.po summit/messages/kdereview/simondbuscommand.po move summit/messages/playground-accessibility/simondbuscondition.po summit/messages/kdereview/simondbuscondition.po move summit/messages/playground-accessibility/simondesktopgridcommand.po summit/messages/kdereview/simondesktopgridcommand.po move summit/messages/playground-accessibility/simondialogcommand.po summit/messages/kdereview/simondialogcommand.po move summit/messages/playground-accessibility/simondictationcommand.po summit/messages/kdereview/simondictationcommand.po move summit/messages/playground-accessibility/simond.po summit/messages/kdereview/simond.po move summit/messages/playground-accessibility/simonexecutablecommand.po summit/messages/kdereview/simonexecutablecommand.po move summit/messages/playground-accessibility/simonfilecontent.po summit/messages/kdereview/simonfilecontent.po move summit/messages/playground-accessibility/simonfiltercommand.po summit/messages/kdereview/simonfiltercommand.po move summit/messages/playground-accessibility/simoninputnumbercommand.po summit/messages/kdereview/simoninputnumbercommand.po move summit/messages/playground-accessibility/simonjsoncommand.po summit/messages/kdereview/simonjsoncommand.po move summit/messages/playground-accessibility/simonkeyboardcommand.po summit/messages/kdereview/simonkeyboardcommand.po move summit/messages/playground-accessibility/simonlib.po summit/messages/kdereview/simonlib.po move summit/messages/playground-accessibility/simonlistcommand.po summit/messages/kdereview/simonlistcommand.po move summit/messages/playground-accessibility/simonorconditionassociation.po summit/messages/kdereview/simonorconditionassociation.po move summit/messages/playground-accessibility/simonplacecommand.po summit/messages/kdereview/simonplacecommand.po move summit/messages/playground-accessibility/simon.po summit/messages/kdereview/simon.po move summit/messages/playground-accessibility/simonprocessopenedcondition.po summit/messages/kdereview/simonprocessopenedcondition.po move summit/messages/playground-accessibility/simonpronunciationtrainingcommand.po summit/messages/kdereview/simonpronunciationtrainingcommand.po move summit/messages/playground-accessibility/simonrecognizercommand.po summit/messages/kdereview/simonrecognizercommand.po move summit/messages/playground-accessibility/simonshortcutcommand.po summit/messages/kdereview/simonshortcutcommand.po move summit/messages/playground-accessibility/simontemplatecommand.po summit/messages/kdereview/simontemplatecommand.po move summit/messages/playground-accessibility/simontextmacrocommand.po summit/messages/kdereview/simontextmacrocommand.po move summit/messages/playground-accessibility/ssc.po summit/messages/kdereview/ssc.po move summit/messages/playground-accessibility/desktop_playground-accessibility_simon.po summit/messages/kdereview/desktop_kdereview_simon.po move summit/docmessages/playground-accessibility/ksimond.po summit/docmessages/kdereview/ksimond.po move summit/docmessages/playground-accessibility/sam.po summit/docmessages/kdereview/sam.po move summit/docmessages/playground-accessibility/simon.po summit/docmessages/kdereview/simon.po move summit/docmessages/playground-accessibility/simond.po summit/docmessages/kdereview/simond.po move summit/docmessages/playground-accessibility/ssc.po summit/docmessages/kdereview/ssc.po move summit/docmessages/playground-accessibility/sscd.po summit/docmessages/kdereview/sscd.po move summit/messages/playground-graphics/desktop_playground-graphics_kolor-manager.po summit/messages/kdereview/desktop_kdereview_kolor-manager.po move summit/messages/playground-network/telepathy-kde-call-ui.po summit/messages/playground-network/ktp-call-ui.po move summit/messages/playground-base/plasma_applet_mobiledesktop.po summit/messages/kdereview/plasma_applet_mobiledesktop.po move summit/messages/playground-base/plasma_applet_org.kde.active.activityscreen.po summit/messages/kdereview/plasma_applet_org.kde.active.activityscreen.po move summit/messages/playground-base/plasma_applet_org.kde.active.welcome.po summit/messages/kdereview/plasma_applet_org.kde.active.welcome.po move summit/messages/playground-base/plasma_applet_org.kde.resourcelists.po summit/messages/kdereview/plasma_applet_org.kde.resourcelists.po move summit/messages/playground-base/plasma-applet-org.kde.windowstrip.po summit/messages/kdereview/plasma-applet-org.kde.windowstrip.po move summit/messages/playground-base/plasma-appletstrip.po summit/messages/kdereview/plasma-appletstrip.po move summit/messages/playground-base/plasma-keyboardContainer.po summit/messages/kdereview/plasma-keyboardContainer.po move summit/messages/playground-base/plasma_applet_org.kde.active.connman.po summit/messages/kdereview/plasma_applet_org.kde.active.connman.po move summit/messages/playground-base/libdatamodelsplugin.po summit/messages/kdereview/libdatamodelsplugin.po move summit/messages/playground-base/plasma_package_org.kde.active.contour-tablet-homescreen.po summit/messages/kdereview/plasma_package_org.kde.active.contour-tablet-homescreen.po move summit/messages/playground-base/plasma_package_org.kde.active.activityconfiguration.po summit/messages/kdereview/plasma_package_org.kde.active.activityconfiguration.po move summit/messages/playground-base/plasma_package_org.kde.activityswitcher.po summit/messages/kdereview/plasma_package_org.kde.activityswitcher.po move summit/messages/playground-base/plasma-device.po summit/messages/kdereview/plasma-device.po delete summit/messages/playground-base/kcmtaskbar.po delete summit/messages/playground-multimedia/plasma_applet_flicklist.po delete summit/messages/playground-multimedia/plasma_applet_mediabrowser.po delete summit/messages/playground-multimedia/plasma_applet_mediacontainment.po delete summit/messages/playground-multimedia/plasma_applet_org.kde.mediacontainment.po delete summit/messages/playground-multimedia/plasma_applet_playlist.po delete summit/messages/playground-network/plasma_applet_presence.po move summit/messages/kdereview/kmdevices.po summit/messages/extragear-graphics/kmdevices.po move summit/messages/kdereview/kminfo.po summit/messages/extragear-graphics/kminfo.po move summit/messages/kdereview/kmsettings.po summit/messages/extragear-graphics/kmsettings.po move summit/messages/kdereview/desktop_kdereview_kolor-manager.po summit/messages/extragear-graphics/desktop_extragear-graphics_kolor-manager.po move summit/messages/kdereview/afaras.po summit/messages/extragear-accessibility/afaras.po move summit/messages/kdereview/ksimond.po summit/messages/extragear-accessibility/ksimond.po move summit/messages/kdereview/plasma_applet_simonoid.po summit/messages/extragear-accessibility/plasma_applet_simonoid.po move summit/messages/kdereview/sam.po summit/messages/extragear-accessibility/sam.po move summit/messages/kdereview/simonactivewindow.po summit/messages/extragear-accessibility/simonactivewindow.po move summit/messages/kdereview/simonakonadicommand.po summit/messages/extragear-accessibility/simonakonadicommand.po move summit/messages/kdereview/simoncalculatorcommand.po summit/messages/extragear-accessibility/simoncalculatorcommand.po move summit/messages/kdereview/simoncompositecommand.po summit/messages/extragear-accessibility/simoncompositecommand.po move summit/messages/kdereview/simondbuscommand.po summit/messages/extragear-accessibility/simondbuscommand.po move summit/messages/kdereview/simondbuscondition.po summit/messages/extragear-accessibility/simondbuscondition.po move summit/messages/kdereview/simondesktopgridcommand.po summit/messages/extragear-accessibility/simondesktopgridcommand.po move summit/messages/kdereview/simondialogcommand.po summit/messages/extragear-accessibility/simondialogcommand.po move summit/messages/kdereview/simondictationcommand.po summit/messages/extragear-accessibility/simondictationcommand.po move summit/messages/kdereview/simond.po summit/messages/extragear-accessibility/simond.po move summit/messages/kdereview/simonexecutablecommand.po summit/messages/extragear-accessibility/simonexecutablecommand.po move summit/messages/kdereview/simonfilecontent.po summit/messages/extragear-accessibility/simonfilecontent.po move summit/messages/kdereview/simonfiltercommand.po summit/messages/extragear-accessibility/simonfiltercommand.po move summit/messages/kdereview/simoninputnumbercommand.po summit/messages/extragear-accessibility/simoninputnumbercommand.po move summit/messages/kdereview/simonjsoncommand.po summit/messages/extragear-accessibility/simonjsoncommand.po move summit/messages/kdereview/simonkeyboardcommand.po summit/messages/extragear-accessibility/simonkeyboardcommand.po move summit/messages/kdereview/simonlistcommand.po summit/messages/extragear-accessibility/simonlistcommand.po move summit/messages/kdereview/simonorconditionassociation.po summit/messages/extragear-accessibility/simonorconditionassociation.po move summit/messages/kdereview/simonplacecommand.po summit/messages/extragear-accessibility/simonplacecommand.po move summit/messages/kdereview/simonprocessopenedcondition.po summit/messages/extragear-accessibility/simonprocessopenedcondition.po move summit/messages/kdereview/simonpronunciationtrainingcommand.po summit/messages/extragear-accessibility/simonpronunciationtrainingcommand.po move summit/messages/kdereview/simonrecognizercommand.po summit/messages/extragear-accessibility/simonrecognizercommand.po move summit/messages/kdereview/simonshortcutcommand.po summit/messages/extragear-accessibility/simonshortcutcommand.po move summit/messages/kdereview/simontemplatecommand.po summit/messages/extragear-accessibility/simontemplatecommand.po move summit/messages/kdereview/simontextmacrocommand.po summit/messages/extragear-accessibility/simontextmacrocommand.po move summit/messages/kdereview/ssc.po summit/messages/extragear-accessibility/ssc.po move summit/messages/kdereview/simonaicommand.po summit/messages/extragear-accessibility/simonaicommand.po move summit/messages/kdereview/simonatspicommand.po summit/messages/extragear-accessibility/simonatspicommand.po move summit/messages/kdereview/simonlib.po summit/messages/extragear-accessibility/simonlib.po move summit/messages/kdereview/simon.po summit/messages/extragear-accessibility/simon.po move summit/messages/kdereview/desktop_kdereview_simon.po summit/messages/extragear-accessibility/desktop_extragear-accessibility_simon.po move summit/docmessages/kdereview/ksimond.po summit/docmessages/extragear-accessibility/ksimond.po move summit/docmessages/kdereview/sam.po summit/docmessages/extragear-accessibility/sam.po move summit/docmessages/kdereview/simon.po summit/docmessages/extragear-accessibility/simon.po move summit/docmessages/kdereview/simond.po summit/docmessages/extragear-accessibility/simond.po move summit/docmessages/kdereview/ssc.po summit/docmessages/extragear-accessibility/ssc.po move summit/docmessages/kdereview/sscd.po summit/docmessages/extragear-accessibility/sscd.po delete summit/docmessages/playground-games/kamala.po delete summit/messages/playground-games/fruitwars.po delete summit/messages/playground-games/kamala.po delete summit/messages/playground-games/kolladev.po delete summit/messages/playground-games/kollagame.po delete summit/messages/playground-games/ktankserver.po delete summit/messages/playground-network/kdevmo.po delete summit/messages/playground-utils/devicesync_ipod.po delete summit/messages/playground-utils/devicesync_localstorage.po delete summit/messages/playground-utils/devicesync_mtp.po delete summit/messages/playground-utils/devicesync.po delete summit/messages/playground-utils/galmuri.po delete summit/messages/playground-utils/kconfigeditor.po delete summit/messages/playground-utils/ultracopier.po move summit/messages/playground-network/ktp-call-ui.po summit/messages/kdereview/ktp-call-ui.po move summit/messages/playground-base/desktop_playground-base_kded-appmenu.po summit/messages/kdereview/desktop_kdereview_kded-appmenu.po move summit/messages/playground-base/desktop_playground-base_plasma-mobile.po summit/messages/kdereview/desktop_kdereview_plasma-mobile.po move summit/messages/playground-pim/akonadi_akonadi-google_resource.po summit/messages/kdereview/akonadi_akonadi-google_resource.po move summit/messages/kdereview/desktop_kdereview_plasma-mobile.po summit/messages/extragear-base/desktop_extragear-base_plasma-mobile.po move summit/messages/kdereview/libdatamodelsplugin.po summit/messages/extragear-base/libdatamodelsplugin.po move summit/messages/kdereview/libmobilecomponentsplugin.po summit/messages/extragear-base/libmobilecomponentsplugin.po move summit/messages/kdereview/plasma_applet_mobiledesktop.po summit/messages/extragear-base/plasma_applet_mobiledesktop.po move summit/messages/kdereview/plasma_applet_org.kde.active.activityscreen.po summit/messages/extragear-base/plasma_applet_org.kde.active.activityscreen.po move summit/messages/kdereview/plasma_applet_org.kde.active.connman.po summit/messages/extragear-base/plasma_applet_org.kde.active.connman.po move summit/messages/kdereview/plasma_applet_org.kde.active.welcome.po summit/messages/extragear-base/plasma_applet_org.kde.active.welcome.po move summit/messages/kdereview/plasma_applet_org.kde.resourcelists.po summit/messages/extragear-base/plasma_applet_org.kde.resourcelists.po move summit/messages/kdereview/plasma-applet-org.kde.windowstrip.po summit/messages/extragear-base/plasma-applet-org.kde.windowstrip.po move summit/messages/kdereview/plasma-appletstrip.po summit/messages/extragear-base/plasma-appletstrip.po move summit/messages/kdereview/plasma-device.po summit/messages/extragear-base/plasma-device.po move summit/messages/kdereview/plasma-keyboardContainer.po summit/messages/extragear-base/plasma-keyboardContainer.po move summit/messages/kdereview/plasma_package_org.kde.active.activityconfiguration.po summit/messages/extragear-base/plasma_package_org.kde.active.activityconfiguration.po move summit/messages/kdereview/plasma_package_org.kde.active.contour-tablet-homescreen.po summit/messages/extragear-base/plasma_package_org.kde.active.contour-tablet-homescreen.po move summit/messages/kdereview/plasma_package_org.kde.activityswitcher.po summit/messages/extragear-base/plasma_package_org.kde.activityswitcher.po move summit/messages/kdereview/pothumbnail.po summit/messages/kdesdk/pothumbnail.po move summit/messages/playground-sysadmin/apper.po summit/messages/kdereview/apper.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_apper.po summit/messages/kdereview/desktop_kdereview_apper.po move summit/messages/kdereview/akonadi_akonadi-google_resource.po summit/messages/kdereview/libkgoogle.po move summit/messages/kde-runtime/nepomukserver.po summit/messages/kdelibs/nepomukserver.po move summit/messages/kde-runtime/nepomukservicestub.po summit/messages/kdelibs/nepomukservicestub.po move summit/messages/kde-runtime/nepomukstorage.po summit/messages/kdelibs/nepomukstorage.po move summit/messages/kde-runtime/nepomukqueryservice.po summit/messages/kdelibs/nepomukqueryservice.po move summit/messages/kde-runtime/nepomukbackup.po summit/messages/kdelibs/nepomukbackup.po move summit/messages/kde-runtime/nepomukfileindexer.po summit/messages/kdelibs/nepomukfileindexer.po delete summit/messages/extragear-pim/akonadi_gcal_resource.po delete summit/messages/extragear-pim/akonadi_googledata_resource.po delete summit/messages/extragear-pim/desktop_extragear-pim_akonadi-googledata-resource.po delete summit/messages/playground-pim/desktop_playground-pim_akonadi-google.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_audiocd-kio.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_dragon.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_ffmpegthumbs.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_juk.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_kmix.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_kscd.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_libkcddb.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_mplayerthumbs.po copy summit/messages/kdemultimedia/desktop_kdemultimedia.po summit/messages/kdemultimedia/desktop_kdemultimedia_strigi-multimedia.po delete summit/messages/kdemultimedia/desktop_kdemultimedia.po move summit/messages/kdereview/libkgoogle.po summit/messages/kdereview/libkgapi.po move summit/messages/extragear-network/ktp-contactrunner.po summit/messages/extragear-network/plasma_runner_ktp_contacts.po move summit/docmessages/playground-utils/KRegExpEditor.po summit/docmessages/playground-utils/kregexpeditor.po move summit/messages/kdereview/apper.po summit/messages/extragear-sysadmin/apper.po move summit/messages/kdereview/desktop_kdereview_apper.po summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_apper.po move summit/docmessages/kdereview/apper_man-apper.1.po summit/docmessages/extragear-sysadmin/apper_man-apper.1.po move summit/docmessages/kdereview/apper_man-apper-appsetup.1.po summit/docmessages/extragear-sysadmin/apper_man-apper-appsetup.1.po delete summit/messages/playground-base/print-manager.po delete summit/messages/kdemultimedia/kfile_avi.po delete summit/messages/kdemultimedia/kfile_flac.po delete summit/messages/kdemultimedia/kfile_mp3.po delete summit/messages/kdemultimedia/kfile_mpc.po delete summit/messages/kdemultimedia/kfile_ogg.po delete summit/messages/kdemultimedia/kfile_sid.po delete summit/messages/kdemultimedia/kfile_theora.po delete summit/messages/kdemultimedia/kfile_wav.po delete summit/messages/kdemultimedia/desktop_kdemultimedia_strigi-multimedia.po move summit/messages/kdereview/ktp-call-ui.po summit/messages/extragear-network/ktp-call-ui.po merge summit/docmessages/extragear-graphics/kipi-plugins_calendar.po summit/docmessages/extragear-graphics/kipi-plugins.po merge summit/docmessages/extragear-graphics/kipi-plugins_findduplicateimages.po summit/docmessages/extragear-graphics/kipi-plugins.po merge summit/docmessages/extragear-graphics/kipi-plugins_galleryexport.po summit/docmessages/extragear-graphics/kipi-plugins.po merge summit/docmessages/extragear-graphics/kipi-plugins_timeadjust.po summit/docmessages/extragear-graphics/kipi-plugins.po delete summit/docmessages/extragear-graphics/kipi-plugins_kameraklient.po delete summit/docmessages/extragear-graphics/kipi-plugins_wallpaper.po delete summit/messages/kdeplasma-addons/plasma_runner_bing.po delete summit/messages/kdeplasma-addons/plasma_runner_duckduckgo.po move summit/messages/kdereview/libkgapi.po summit/messages/extragear-libs/libkgapi.po move summit/messages/kdereview/mancala.po summit/messages/playground-games/mancala.po move summit/docmessages/kdereview/mancala.po summit/docmessages/playground-games/mancala.po move summit/messages/playground-games/picmi.po summit/messages/kdereview/picmi.po move summit/docmessages/playground-games/picmi.po summit/docmessages/kdereview/picmi.po move summit/messages/playground-games/desktop_playground-games_picmi.po summit/messages/kdereview/desktop_kdereview_picmi.po delete summit/messages/playground-pim/plasma_google_contacts.po delete summit/messages/extragear-utils/rsibreak.po delete summit/messages/extragear-utils/plasma_applet_rsibreak.po delete summit/messages/extragear-utils/desktop_extragear-utils_rsibreak.po delete summit/docmessages/extragear-utils/rsibreak.po # Summit catalogs left behind on 4.8->4.9 switch, 2012-08-08. delete summit/messages/kde-workspace/kcmxinerama.po delete summit/messages/kde-workspace/plasma_applet_showactivitymanager.po delete summit/messages/kdesdk/spy.po delete summit/messages/kdeutils/desktop_kdeutils_ksecrets.po delete summit/docmessages/kde-workspace/kcontrol_multiplemonitors.po move summit/messages/kdeutils/ksecrets_kio.po summit/messages/playground-utils/ksecrets_kio.po move summit/messages/kdeutils/ksecrets_ksecrets.po summit/messages/playground-utils/ksecrets_ksecrets.po move summit/messages/kdeutils/ksecretsservice_api.po summit/messages/playground-utils/ksecretsservice_api.po move summit/messages/kdeutils/ksecretsserviced.po summit/messages/playground-utils/ksecretsserviced.po move summit/messages/kdeutils/ksecretsync.po summit/messages/playground-utils/ksecretsync.po move summit/messages/kdeutils/kwl2kss.po summit/messages/playground-utils/kwl2kss.po move summit/messages/playground-base/homerun.po summit/messages/playground-base/plasma_applet_org.kde.homerun.po delete summit/messages/kde-baseapps/kte_acomment.po delete summit/messages/kde-baseapps/katescriptIDE.po move summit/messages/kdereview/picmi.po summit/messages/extragear-games/picmi.po move summit/messages/kdereview/desktop_kdereview_picmi.po summit/messages/extragear-games/desktop_extragear-games_picmi.po move summit/docmessages/kdereview/picmi.po summit/docmessages/extragear-games/picmi.po move summit/messages/playground-utils/kimtoy.po summit/messages/kdereview/kimtoy.po move summit/messages/playground-utils/desktop_playground-utils_kimtoy.po summit/messages/kdereview/desktop_kdereview_kimtoy.po delete summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-custom-buildsystem.po move summit/messages/playground-base/add-printer.po summit/messages/kdereview/add-printer.po move summit/messages/playground-base/kcm_print.po summit/messages/kdereview/kcm_print.po move summit/messages/playground-base/plasma_applet_printmanager.po summit/messages/kdereview/plasma_applet_printmanager.po move summit/messages/playground-base/desktop_playground-base_print-manager.po summit/messages/kdereview/desktop_kdereview_print-manager.po merge summit/messages/kdereview/add-printer.po summit/messages/kdereview/print-manager.po merge summit/messages/kdereview/kcm_print.po summit/messages/kdereview/print-manager.po delete summit/messages/koffice/FreOffice.po delete summit/messages/koffice/MapShape.po delete summit/messages/koffice/TreeShape.po delete summit/messages/koffice/koabstraction.po delete summit/messages/koffice/koreport_shapeplugin.po delete summit/docmessages/playground-pim/kmobiletools.po delete summit/messages/playground-pim/kmobiletools.po delete summit/messages/playground-pim/kmobiletools_at_engine.po delete summit/messages/playground-utils/synaptiks.po delete summit/docmessages/playground-utils/synaptiks.po move summit/messages/kdereview/plasma_runner_krunner_dictionary.po summit/messages/kdeplasma-addons/plasma_runner_krunner_dictionary.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_bomber.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_bovo.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_granatier.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kajongg.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kapman.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_katomic.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kblackbox.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kblocks.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kbounce.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kbreakout.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kdiamond.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kfourinline.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kgoldrunner.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kigo.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_killbots.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kiriki.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kjumpingcube.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_klickety.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_klines.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kmahjongg.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kmines.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_knavalbattle.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_knetwalk.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kolf.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kollision.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_konquest.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kpat.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kreversi.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kshisen.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_ksirk.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_ksnakeduel.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kspaceduel.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_ksquares.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_ksudoku.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_ktuberling.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_kubrick.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_libkdegames.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_libkmahjongg.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_lskat.po copy summit/messages/kdegames/desktop_kdegames.po summit/messages/kdegames/desktop_kdegames_palapeli.po delete summit/messages/kdegames/desktop_kdegames.po delete summit/messages/koffice/BarcodePlugin.po delete summit/messages/koffice/ChartPlugin.po delete summit/messages/koffice/ShapePlugin.po delete summit/messages/koffice/kchart.po delete summit/messages/koffice/kformula.po delete summit/docmessages/koffice/karbon.po delete summit/docmessages/koffice/kexi_basics.po delete summit/docmessages/koffice/kexi_building.po delete summit/docmessages/koffice/kexi_comparing.po delete summit/docmessages/koffice/kexi_configuration.po delete summit/docmessages/koffice/kexi_credits.po delete summit/docmessages/koffice/kexi_database.po delete summit/docmessages/koffice/kexi_designingforms.po delete summit/docmessages/koffice/kexi_enteringdataintotables.po delete summit/docmessages/koffice/kexi_enteringdatausingforms.po delete summit/docmessages/koffice/kexi_intro.po delete summit/docmessages/koffice/kexi_menus.po delete summit/docmessages/koffice/kexi_querydesigning.po delete summit/docmessages/koffice/kivio.po delete summit/docmessages/koffice/kivio_credits.po delete summit/docmessages/koffice/kivio_introduction.po delete summit/docmessages/koffice/kivio_usage.po delete summit/docmessages/koffice/kivio_working.po delete summit/docmessages/koffice/kpresenter_a11y.po delete summit/docmessages/koffice/kpresenter_faq.po delete summit/docmessages/koffice/kpresenter_screen.po delete summit/docmessages/koffice/thesaurus.po move summit/docmessages/koffice/kchart.po summit/docmessages/playground-office/kchart.po move summit/messages/kdepim/archivemailagent.po summit/messages/kdepim/akonadi_archivemail_agent.po move summit/messages/kdepim/mailfilteragent.po summit/messages/kdepim/akonadi_mailfilter_agent.po move summit/messages/kdepim-runtime/akonadi_nepomukfeeder.po summit/messages/kdepim-runtime/akonadi_nepomuk_feeder.po move summit/messages/extragear-games/picmi.po summit/messages/kdegames/picmi.po move summit/messages/extragear-games/desktop_extragear-games_picmi.po summit/messages/kdegames/desktop_kdegames_picmi.po delete summit/messages/playground-base/blazer.po delete summit/messages/playground-base/kcm_nic.po move summit/docmessages/extragear-games/picmi.po summit/docmessages/kdegames/picmi.po move summit/messages/kdereview/print-manager.po summit/messages/kdeutils/print-manager.po move summit/messages/kdereview/plasma_applet_printmanager.po summit/messages/kdeutils/plasma_applet_printmanager.po move summit/messages/kdereview/desktop_kdereview_print-manager.po summit/messages/kdeutils/desktop_kdeutils_print-manager.po delete summit/messages/extragear-base/plasma-keyboardContainer.po copy summit/messages/kdeedu/rocs.po summit/messages/kdeedu/rocscore.po copy summit/messages/kdeedu/rocs.po summit/messages/kdeedu/rocsvisualeditor.po merge summit/messages/kde-baseapps/katequickdocumentswitcherplugin.po summit/messages/kde-baseapps/kate.po delete summit/messages/playground-devtools/icemon.po delete summit/docmessages/playground-devtools/icemon.po move summit/messages/playground-utils/bodega_qt.po summit/messages/kdereview/bodega_qt.po move summit/messages/playground-utils/active-addons.po summit/messages/kdereview/active-addons.po move summit/messages/playground-utils/plasma_package_com.coherenttheory.addonsapp.po summit/messages/kdereview/plasma_package_com.coherenttheory.addonsapp.po move summit/messages/playground-base/metadataextractor.po summit/messages/kdereview/metadataextractor.po move summit/messages/playground-base/desktop_playground-base_nepomuk-metadata-extractor.po summit/messages/kdereview/desktop_kdereview_nepomuk-metadata-extractor.po delete summit/messages/playground-base/org.kde.plasma.slccomponents.po move summit/messages/playground-pim/libkfacebook.po summit/messages/kdereview/libkfbapi.po move summit/messages/playground-base/plasma_applet_stackfolder.po summit/messages/kdereview/plasma_applet_stackfolder.po move summit/messages/playground-base/plasmate.po summit/messages/kdereview/plasmate.po move summit/messages/playground-base/sharelikeconnect_provider_activities.po summit/messages/kdereview/sharelikeconnect_provider_activities.po move summit/messages/playground-base/sharelikeconnect_provider_bookmarks.po summit/messages/kdereview/sharelikeconnect_provider_bookmarks.po move summit/messages/playground-base/sharelikeconnect_provider_tags.po summit/messages/kdereview/sharelikeconnect_provider_tags.po move summit/messages/kdereview/kimtoy.po summit/messages/extragear-utils/kimtoy.po move summit/messages/kdereview/desktop_kdereview_kimtoy.po summit/messages/extragear-utils/desktop_extragear-utils_kimtoy.po move summit/messages/extragear-base/ktouchpadenabler.po summit/messages/kde-workspace/ktouchpadenabler.po merge summit/messages/extragear-base/desktop_extragear-base_ktouchpadenabler.po summit/messages/kde-workspace/desktop_kde-workspace.po move summit/messages/playground-base/kde-gtk-config.po summit/messages/kdereview/kde-gtk-config.po move summit/messages/playground-base/desktop_playground-base_kde-gtk-config.po summit/messages/kdereview/desktop_kdereview_kde-gtk-config.po delete summit/messages/extragear-base/plasma_applet_org.kde.active.connman.po delete summit/messages/playground-base/desktop_playground-base_plasmate.po delete summit/messages/playground-base/desktop_playground-base_share-like-connect.po delete summit/messages/playground-base/desktop_playground-base_stackfolder.po delete summit/messages/playground-utils/desktop_playground-utils_bodega-client.po delete summit/messages/qt/phonon-xine.po delete summit/messages/qt/desktop_kdesupport-phonon_phonon-mplayer.po delete summit/messages/qt/desktop_kdesupport-phonon_phonon-directshow.po delete summit/messages/qt/desktop_kdesupport-phonon_phonon-xine.po move summit/messages/kdereview/plasma_applet_stackfolder.po summit/messages/playground-base/plasma_applet_stackfolder.po move summit/messages/kdereview/desktop_kdereview_stackfolder.po summit/messages/playground-base/desktop_playground-base_stackfolder.po move summit/messages/playground-pim/desktop_playground-pim_trojita.po summit/messages/kdereview/desktop_kdereview_trojita.po move summit/messages/desktop_kdereview_trojita.po summit/messages/kdereview/desktop_kdereview_trojita.po move summit/messages/playground-base/kio_tags.po summit/messages/kde-runtime/kio_tags.po move summit/messages/playground-office/ChartShape.po summit/messages/koffice/ChartShape.po move summit/messages/playground-office/FormulaShape.po summit/messages/koffice/FormulaShape.po move summit/messages/playground-office/MusicShape.po summit/messages/koffice/MusicShape.po move summit/messages/playground-office/VideoShape.po summit/messages/koffice/VideoShape.po move summit/docmessages/kde-workspace/plasma-desktop_tools_man-plasmaengineexplorer.1.po summit/docmessages/kdereview/plasmate_engineexplorer_man-plasmaengineexplorer.1.po move summit/docmessages/kde-workspace/plasma-desktop_tools_man-plasmapkg.1.po summit/docmessages/kdereview/plasmate_man-plasmapkg.1.po move summit/docmessages/kde-workspace/plasma-desktop_tools_man-plasmoidviewer.1.po summit/docmessages/kdereview/plasmate_plasmoidviewer_man-plasmoidviewer.1.po move summit/messages/kdereview/metadataextractor.po summit/messages/kdereview/nepomuk-webminer.po move summit/docmessages/kdereview/plasmate_man-plasmapkg.1.po summit/docmessages/kde-workspace/plasmate_man-plasmapkg.1.po move summit/docmessages/kde-workspace/plasmate_man-plasmapkg.1.po summit/docmessages/kde-runtime/plasmapkg_man-plasmapkg.1.po move summit/messages/kdereview/desktop_kdereview_trojita.po summit/messages/extragear-pim/desktop_extragear-pim_trojita.po move summit/messages/kdereview/trojita_common.po summit/messages/extragear-pim/trojita_common.po move summit/messages/kdereview/kde-gtk-config.po summit/messages/extragear-base/kde-gtk-config.po move summit/messages/kdereview/desktop_kdereview_kde-gtk-config.po summit/messages/extragear-base/desktop_extragear-base_kde-gtk-config.po move summit/messages/playground-devtools/kdevpython.po summit/messages/kdereview/kdevpython.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-python.po summit/messages/kdereview/desktop_kdereview_kdev-python.po delete summit/messages/kdereview/desktop_kdereview_kded-appmenu.po move summit/messages/kdereview/nepomuk-webminer.po summit/messages/extragear-base/nepomuk-webminer.po move summit/messages/kdereview/desktop_kdereview_nepomuk-metadata-extractor.po summit/messages/extragear-base/desktop_extragear-base_nepomuk-webminer.po move summit/docmessages/kdereview/nepomuk-metadata-extractor.po summit/docmessages/extragear-base/nepomuk-webminer.po move summit/messages/extragear-sysadmin/plasma_applet_updater.po summit/messages/extragear-sysadmin/plasma_package_updater.po # Summit catalogs left behind on 4.9->4.10 switch, 2013-01-09. delete summit/messages/kde-baseapps/kateexternaltoolsplugin.po delete summit/messages/kde-runtime/kcm_phononxine.po delete summit/messages/kde-workspace/plasma_applet_notifications.po delete summit/messages/kdeadmin/system-config-printer-kde.po delete summit/messages/kdeplasma-addons/librtm.po delete summit/messages/kdeutils/desktop_kdeutils_printer-applet.po delete summit/messages/kdeutils/printer-applet.po delete summit/docmessages/kdeadmin/system-config-printer-kde.po delete summit/docmessages/kdeedu/kstars_observinglist.po delete summit/docmessages/kdeutils/printer-applet.po copy summit/messages/kdelibs/xml_mimetypes.po summit/messages/kdeedu/marble_xml_mimetypes.po move summit/messages/kde-workspace/plasmaengineexplorer.po summit/messages/kdereview/plasmaengineexplorer.po move summit/messages/kde-workspace/plasmawallpaperviewer.po summit/messages/kdereview/plasmawallpaperviewer.po move summit/messages/kde-workspace/plasmoidviewer.po summit/messages/kdereview/plasmoidviewer.po move summit/messages/kde-workspace/remote-widgets-browser.po summit/messages/kdereview/remote-widgets-browser.po move summit/messages/kdereview/libkfbapi.po summit/messages/extragear-libs/libkfbapi.po move summit/messages/playground-pim/akonadi_facebook_resource.po summit/messages/kdepim-runtime/akonadi_facebook_resource.po move summit/messages/extragear-network/desktop_extragear-network_ktp-contact-applet.po summit/messages/extragear-network/desktop_extragear-network_ktp-desktop-applets.po move summit/messages/kdereview/mangonel.po summit/messages/extragear-base/mangonel.po move summit/messages/kdereview/desktop_kdereview_share-like-connect.po summit/messages/extragear-base/desktop_extragear-base_share-like-connect.po move summit/messages/kdereview/sharelikeconnect_provider_activities.po summit/messages/extragear-base/sharelikeconnect_provider_activities.po move summit/messages/kdereview/sharelikeconnect_provider_bookmarks.po summit/messages/extragear-base/sharelikeconnect_provider_bookmarks.po move summit/messages/kdereview/sharelikeconnect_provider_tags.po summit/messages/extragear-base/sharelikeconnect_provider_tags.po move summit/messages/kdereview/desktop_kdereview_plasmate.po summit/messages/extragear-sdk/desktop_extragear-sdk_plasmate.po move summit/messages/kdereview/plasmate.po summit/messages/extragear-sdk/plasmate.po move summit/messages/kdereview/remote-widgets-browser.po summit/messages/extragear-sdk/remote-widgets-browser.po move summit/messages/kdereview/plasmoidviewer.po summit/messages/extragear-sdk/plasmoidviewer.po move summit/messages/kdereview/plasmaengineexplorer.po summit/messages/extragear-sdk/plasmaengineexplorer.po move summit/messages/kdereview/plasmawallpaperviewer.po summit/messages/extragear-sdk/plasmawallpaperviewer.po move summit/docmessages/kdereview/plasmate_engineexplorer_man-plasmaengineexplorer.1.po summit/docmessages/extragear-sdk/plasmate_engineexplorer_man-plasmaengineexplorer.1.po move summit/docmessages/kdereview/plasmate_plasmoidviewer_man-plasmoidviewer.1.po summit/docmessages/extragear-sdk/plasmate_plasmoidviewer_man-plasmoidviewer.1.po move summit/messages/playground-base/desktop_playground-base_kor.po summit/messages/kdereview/desktop_kdereview_kor.po move summit/messages/playground-devtools/kdevperforce.po summit/messages/kdereview/kdevperforce.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-perforce.po summit/messages/kdereview/desktop_kdereview_kdev-perforce.po move summit/messages/playground-office/googledocs_plugin.po summit/messages/koffice/googledocs_plugin.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_cervisia.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_dolphin-plugins.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kapptemplate.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kcachegrind.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kde-dev-utils.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kdesdk-kioslaves.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kdesdk-thumbnailers.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_kompare.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_lokalize.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_okteta.po copy summit/messages/kdesdk/desktop_kdesdk.po summit/messages/kdesdk/desktop_kdesdk_umbrello.po delete summit/messages/kdesdk/desktop_kdesdk.po copy summit/messages/kdetoys/desktop_kdetoys.po summit/messages/kdetoys/desktop_kdetoys_amor.po copy summit/messages/kdetoys/desktop_kdetoys.po summit/messages/kdetoys/desktop_kdetoys_kteatime.po copy summit/messages/kdetoys/desktop_kdetoys.po summit/messages/kdetoys/desktop_kdetoys_ktux.po delete summit/messages/kdetoys/desktop_kdetoys.po move summit/messages/extragear-kdevelop/kdevelopsessions.po summit/messages/extragear-kdevelop/plasma_applet_kdevelopsessions.po delete summit/messages/extragear-utils/desktop_extragear-utils_kerry.po delete summit/messages/extragear-utils/kcmkerry.po delete summit/messages/extragear-utils/kerry.po delete summit/messages/extragear-utils/desktop_extragear-utils_katimon.po delete summit/messages/extragear-utils/katimon.po delete summit/docmessages/extragear-utils/katimon.po move summit/messages/kde-baseapps/adblock.po summit/messages/applications/adblock.po move summit/messages/kde-baseapps/akregator_konqplugin.po summit/messages/applications/akregator_konqplugin.po move summit/messages/kde-baseapps/autorefresh.po summit/messages/applications/autorefresh.po move summit/messages/kde-baseapps/babelfish.po summit/messages/applications/babelfish.po move summit/messages/kde-baseapps/dirfilterplugin.po summit/messages/applications/dirfilterplugin.po move summit/messages/kde-baseapps/dolphin.po summit/messages/applications/dolphin.po move summit/messages/kde-baseapps/domtreeviewer.po summit/messages/applications/domtreeviewer.po move summit/messages/kde-baseapps/fsview.po summit/messages/applications/fsview.po move summit/messages/kde-baseapps/imgalleryplugin.po summit/messages/applications/imgalleryplugin.po move summit/messages/kde-baseapps/kate-ctags-plugin.po summit/messages/applications/kate-ctags-plugin.po move summit/messages/kde-baseapps/kate.po summit/messages/applications/kate.po move summit/messages/kde-baseapps/kate_kttsd.po summit/messages/applications/kate_kttsd.po move summit/messages/kde-baseapps/katebacktracebrowserplugin.po summit/messages/applications/katebacktracebrowserplugin.po move summit/messages/kde-baseapps/katebuild-plugin.po summit/messages/applications/katebuild-plugin.po move summit/messages/kde-baseapps/katefilebrowserplugin.po summit/messages/applications/katefilebrowserplugin.po move summit/messages/kde-baseapps/katefiletemplates.po summit/messages/applications/katefiletemplates.po move summit/messages/kde-baseapps/kategdbplugin.po summit/messages/applications/kategdbplugin.po move summit/messages/kde-baseapps/katehelloworld.po summit/messages/applications/katehelloworld.po move summit/messages/kde-baseapps/katekonsoleplugin.po summit/messages/applications/katekonsoleplugin.po move summit/messages/kde-baseapps/katemailfilesplugin.po summit/messages/applications/katemailfilesplugin.po move summit/messages/kde-baseapps/kateopenheader.po summit/messages/applications/kateopenheader.po move summit/messages/kde-baseapps/katepart4.po summit/messages/applications/katepart4.po move summit/messages/kde-baseapps/kateproject.po summit/messages/applications/kateproject.po move summit/messages/kde-baseapps/katesearch.po summit/messages/applications/katesearch.po move summit/messages/kde-baseapps/katesnippets_tng.po summit/messages/applications/katesnippets_tng.po move summit/messages/kde-baseapps/katesnippetsplugin.po summit/messages/applications/katesnippetsplugin.po move summit/messages/kde-baseapps/katesql.po summit/messages/applications/katesql.po move summit/messages/kde-baseapps/katesymbolviewer.po summit/messages/applications/katesymbolviewer.po move summit/messages/kde-baseapps/katetabbarextension.po summit/messages/applications/katetabbarextension.po move summit/messages/kde-baseapps/katetabifyplugin.po summit/messages/applications/katetabifyplugin.po move summit/messages/kde-baseapps/katetextfilter.po summit/messages/applications/katetextfilter.po move summit/messages/kde-baseapps/katexmlcheck.po summit/messages/applications/katexmlcheck.po move summit/messages/kde-baseapps/katexmltools.po summit/messages/applications/katexmltools.po move summit/messages/kde-baseapps/kcmkio.po summit/messages/applications/kcmkio.po move summit/messages/kde-baseapps/kcmkonq.po summit/messages/applications/kcmkonq.po move summit/messages/kde-baseapps/kcmkonqhtml.po summit/messages/applications/kcmkonqhtml.po move summit/messages/kde-baseapps/kcmkurifilt.po summit/messages/applications/kcmkurifilt.po move summit/messages/kde-baseapps/kcmperformance.po summit/messages/applications/kcmperformance.po move summit/messages/kde-baseapps/kdepasswd.po summit/messages/applications/kdepasswd.po move summit/messages/kde-baseapps/kdialog.po summit/messages/applications/kdialog.po move summit/messages/kde-baseapps/keditbookmarks.po summit/messages/applications/keditbookmarks.po move summit/messages/kde-baseapps/kfindpart.po summit/messages/applications/kfindpart.po move summit/messages/kde-baseapps/kfmclient.po summit/messages/applications/kfmclient.po move summit/messages/kde-baseapps/khtmlkttsd.po summit/messages/applications/khtmlkttsd.po move summit/messages/kde-baseapps/khtmlsettingsplugin.po summit/messages/applications/khtmlsettingsplugin.po move summit/messages/kde-baseapps/konqueror.po summit/messages/applications/konqueror.po move summit/messages/kde-baseapps/konsole.po summit/messages/applications/konsole.po move summit/messages/kde-baseapps/kshellcmdplugin.po summit/messages/applications/kshellcmdplugin.po move summit/messages/kde-baseapps/ktesnippets_editor.po summit/messages/applications/ktesnippets_editor.po move summit/messages/kde-baseapps/ktexteditor_codesnippets_core.po summit/messages/applications/ktexteditor_codesnippets_core.po move summit/messages/kde-baseapps/ktexteditor_plugins.po summit/messages/applications/ktexteditor_plugins.po move summit/messages/kde-baseapps/kwrite.po summit/messages/applications/kwrite.po move summit/messages/kde-baseapps/libkonq.po summit/messages/applications/libkonq.po move summit/messages/kde-baseapps/mf_konqplugin.po summit/messages/applications/mf_konqplugin.po move summit/messages/kde-baseapps/minitoolsplugin.po summit/messages/applications/minitoolsplugin.po move summit/messages/kde-baseapps/nsplugin.po summit/messages/applications/nsplugin.po move summit/messages/kde-baseapps/plasma_applet_folderview.po summit/messages/applications/plasma_applet_folderview.po move summit/messages/kde-baseapps/plasma_applet_katesession.po summit/messages/applications/plasma_applet_katesession.po move summit/messages/kde-baseapps/rellinks.po summit/messages/applications/rellinks.po move summit/messages/kde-baseapps/searchbarplugin.po summit/messages/applications/searchbarplugin.po move summit/messages/kde-baseapps/uachangerplugin.po summit/messages/applications/uachangerplugin.po move summit/messages/kde-baseapps/useraccount.po summit/messages/applications/useraccount.po move summit/messages/kde-baseapps/validatorsplugin.po summit/messages/applications/validatorsplugin.po move summit/messages/kde-baseapps/webarchiver.po summit/messages/applications/webarchiver.po move summit/messages/kde-baseapps/desktop_kde-baseapps_kate.po summit/messages/applications/desktop_applications_kate.po move summit/messages/kde-baseapps/desktop_kde-baseapps_konsole.po summit/messages/applications/desktop_applications_konsole.po move summit/messages/kde-baseapps/desktop_kde-baseapps.po summit/messages/applications/desktop_applications_kde-baseapps.po move summit/docmessages/kde-baseapps/dolphin.po summit/docmessages/applications/dolphin.po move summit/docmessages/kde-baseapps/kate.po summit/docmessages/applications/kate.po move summit/docmessages/kde-baseapps/kate_advanced.po summit/docmessages/applications/kate_advanced.po move summit/docmessages/kde-baseapps/kate_configuring-part.po summit/docmessages/applications/kate_configuring-part.po move summit/docmessages/kde-baseapps/kate_configuring.po summit/docmessages/applications/kate_configuring.po move summit/docmessages/kde-baseapps/kate_fundamentals.po summit/docmessages/applications/kate_fundamentals.po move summit/docmessages/kde-baseapps/kate_highlighting.po summit/docmessages/applications/kate_highlighting.po move summit/docmessages/kde-baseapps/kate_man-kate.1.po summit/docmessages/applications/kate_man-kate.1.po move summit/docmessages/kde-baseapps/kate_mdi.po summit/docmessages/applications/kate_mdi.po move summit/docmessages/kde-baseapps/kate_menus.po summit/docmessages/applications/kate_menus.po move summit/docmessages/kde-baseapps/kate_part.po summit/docmessages/applications/kate_part.po move summit/docmessages/kde-baseapps/kate_plugins-part.po summit/docmessages/applications/kate_plugins-part.po move summit/docmessages/kde-baseapps/kate_plugins.po summit/docmessages/applications/kate_plugins.po move summit/docmessages/kde-baseapps/kate_regular-expressions.po summit/docmessages/applications/kate_regular-expressions.po move summit/docmessages/kde-baseapps/kate_vi.po summit/docmessages/applications/kate_vi.po move summit/docmessages/kde-baseapps/kdepasswd.po summit/docmessages/applications/kdepasswd.po move summit/docmessages/kde-baseapps/kfind.po summit/docmessages/applications/kfind.po move summit/docmessages/kde-baseapps/kfind_man-kfind.1.po summit/docmessages/applications/kfind_man-kfind.1.po move summit/docmessages/kde-baseapps/konqueror.po summit/docmessages/applications/konqueror.po move summit/docmessages/kde-baseapps/konqueror_basics.po summit/docmessages/applications/konqueror_basics.po move summit/docmessages/kde-baseapps/konqueror_bookmarks.po summit/docmessages/applications/konqueror_bookmarks.po move summit/docmessages/kde-baseapps/konqueror_browser.po summit/docmessages/applications/konqueror_browser.po move summit/docmessages/kde-baseapps/konqueror_commands.po summit/docmessages/applications/konqueror_commands.po move summit/docmessages/kde-baseapps/konqueror_config.po summit/docmessages/applications/konqueror_config.po move summit/docmessages/kde-baseapps/konqueror_credits.po summit/docmessages/applications/konqueror_credits.po move summit/docmessages/kde-baseapps/konqueror_faq.po summit/docmessages/applications/konqueror_faq.po move summit/docmessages/kde-baseapps/konqueror_filemanager.po summit/docmessages/applications/konqueror_filemanager.po move summit/docmessages/kde-baseapps/konqueror_introduction.po summit/docmessages/applications/konqueror_introduction.po move summit/docmessages/kde-baseapps/konqueror_man-kbookmarkmerger.1.po summit/docmessages/applications/konqueror_man-kbookmarkmerger.1.po move summit/docmessages/kde-baseapps/konqueror_path-complete.po summit/docmessages/applications/konqueror_path-complete.po move summit/docmessages/kde-baseapps/konqueror_plugins.po summit/docmessages/applications/konqueror_plugins.po move summit/docmessages/kde-baseapps/konqueror_save-settings.po summit/docmessages/applications/konqueror_save-settings.po move summit/docmessages/kde-baseapps/konqueror_sidebar.po summit/docmessages/applications/konqueror_sidebar.po move summit/docmessages/kde-baseapps/konqueror_view-extensions.po summit/docmessages/applications/konqueror_view-extensions.po move summit/docmessages/kde-baseapps/konsole.po summit/docmessages/applications/konsole.po move summit/docmessages/kde-baseapps/kwrite.po summit/docmessages/applications/kwrite.po move summit/docmessages/kde-baseapps/kwrite_configuring.po summit/docmessages/applications/kwrite_configuring.po move summit/docmessages/kde-baseapps/kwrite_fundamentals.po summit/docmessages/applications/kwrite_fundamentals.po move summit/docmessages/kde-baseapps/kwrite_menus.po summit/docmessages/applications/kwrite_menus.po delete summit/messages/extragear-network/desktop_extragear-network_ktp-presence-applet.po delete summit/messages/extragear-network/plasma_applet_ktp_contact.po delete summit/messages/extragear-network/plasma_applet_ktp_presence.po delete summit/messages/kdenetwork/kcm_krfb.po delete summit/messages/kdenetwork/kinetd.po move summit/messages/playground-multimedia/plasma-mediacenter.po summit/messages/kdereview/plasma-mediacenter.po move summit/messages/playground-multimedia/desktop_playground-multimedia_plasma-mediacenter.po summit/messages/kdereview/desktop_kdereview_plasma-mediacenter.po delete summit/messages/extragear-base/plasma_applet_org.kde.active.notifications.po move summit/messages/kdereview/kdevpython.po summit/messages/extragear-kdevelop/kdevpython.po move summit/messages/kdereview/desktop_kdereview_kdev-python.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-python.po move summit/messages/kdereview/plasma_package_com.coherenttheory.addonsapp.po summit/messages/kdereview/plasma_package_com.makeplaylive.addonsapp.po delete summit/messages/playground-network/kopete_telepathy.po delete summit/messages/playground-network/ktelepathy.po delete summit/messages/playground-network/desktop_playground-network_ktp-presence-dataengine.po delete summit/messages/playground-network/desktop_playground-network_ktp-launcher-kded.po delete summit/messages/playground-network/desktop_playground-network_kopete-protocol-telepathy.po delete summit/messages/extragear-multimedia/amarok_scriptengine_qscript.po delete summit/messages/kdeutils/plasma_package_printmanager.po move summit/messages/extragear-sysadmin/plasma_package_updater.po summit/messages/extragear-sysadmin/plasma_applet_updater.po move summit/messages/playground-edu/desktop_playground-edu_kartesio.po summit/messages/kdereview/desktop_kdereview_kartesio.po merge summit/docmessages/applications/kate_mdi.po summit/docmessages/applications/kate_fundamentals.po mergekeep summit/docmessages/applications/kate_menus.po summit/docmessages/applications/kate_plugins.po mergekeep summit/docmessages/applications/kate_advanced.po summit/docmessages/applications/kate_development.po move summit/messages/kdereview/plasma-mediacenter.po summit/messages/extragear-multimedia/plasma-mediacenter.po move summit/messages/kdereview/desktop_kdereview_plasma-mediacenter.po summit/messages/extragear-multimedia/desktop_extragear-multimedia_plasma-mediacenter.po delete summit/messages/extragear-base/sharelikeconnect_provider_tags.po delete summit/messages/extragear-sysadmin/plasma_applet_updater.po copy summit/messages/kdeadmin/desktop_kdeadmin.po summit/messages/kdeadmin/desktop_kdeadmin_kdeadmin-strigi-analyzers.po copy summit/messages/kdeadmin/desktop_kdeadmin.po summit/messages/kdeadmin/desktop_kdeadmin_kcron.po copy summit/messages/kdeadmin/desktop_kdeadmin.po summit/messages/kdeadmin/desktop_kdeadmin_ksystemlog.po copy summit/messages/kdeadmin/desktop_kdeadmin.po summit/messages/kdeadmin/desktop_kdeadmin_kuser.po delete summit/messages/kdeadmin/desktop_kdeadmin.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_kget.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_kopete.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_kdenetwork-filesharing.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_krfb.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_kppp.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_kdnssd.po copy summit/messages/kdenetwork/desktop_kdenetwork.po summit/messages/kdenetwork/desktop_kdenetwork_krdc.po delete summit/messages/kdenetwork/desktop_kdenetwork.po delete summit/messages/kdeadmin/kfile_rpm.po delete summit/messages/kdeadmin/desktop_kdeadmin_kdeadmin-strigi-analyzers.po move summit/messages/extragear-network/kcm_kopete_scripting.po summit/messages/playground-network/kcm_kopete_scripting.po move summit/messages/extragear-network/desktop_extragear-network_kopete-scripting.po summit/messages/playground-network/desktop_playground-network_kopete-scripting.po delete summit/messages/extragear-network/kwebapp.po merge summit/docmessages/applications/konqueror_basics.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_bookmarks.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_browser.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_commands.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_config.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_credits.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_faq.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_filemanager.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_introduction.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_path-complete.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_plugins.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_save-settings.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_sidebar.po summit/docmessages/applications/konqueror.po merge summit/docmessages/applications/konqueror_view-extensions.po summit/docmessages/applications/konqueror.po move summit/messages/playground-base/desktop_playground-base_web-accounts.po summit/messages/playground-base/desktop_playground-base_kaccounts-integration.po move summit/messages/playground-base/kcm_displayconfiguration.po summit/messages/kdereview/kcm_displayconfiguration.po move summit/messages/playground-base/kscreen.po summit/messages/kdereview/kscreen.po move summit/messages/playground-base/plasma_applet_org.kde.plasma.kscreen.po summit/messages/kdereview/plasma_applet_org.kde.plasma.kscreen.po move summit/messages/playground-base/desktop_playground-base_kscreen.po summit/messages/kdereview/desktop_kdereview_kscreen.po delete summit/docmessages/kdeedu/rocs_scripting-api.po merge summit/messages/kdepim-runtime/newmailnotifieragent.po summit/messages/kdepim-runtime/akonadi_newmailnotifier_agent.po # Summit catalogs left behind on 4.10->4.11 switch, 2013-07-10. delete summit/messages/applications/katesnippets_tng.po delete summit/messages/applications/ktesnippets_editor.po delete summit/messages/applications/ktexteditor_codesnippets_core.po delete summit/messages/kde-runtime/nepomukcontroller.po delete summit/messages/kde-workspace/kcm_solid.po delete summit/messages/kde-workspace/plasma_engine_calendar.po delete summit/messages/kde-workspace/solid-network.po delete summit/messages/kdelibs/activitymanager_uihandler_declarative.po delete summit/messages/kdelibs/nepomukqueryservice.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_wallpaper-qml.po delete summit/messages/kdeutils/plasma_applet_printmanager.po move summit/messages/kde-workspace/solidcontrol.po summit/messages/extragear-base/solidcontrol.po move summit/messages/extragear-network/kopete-cryptography.po summit/messages/kdenetwork/kopete-cryptography.po move summit/docmessages/extragear-network/kopete-cryptography.po summit/docmessages/kdenetwork/kopete-cryptography.po copy summit/messages/extragear-base/libknetworkmanager.po summit/messages/playground-network/plasma_applet_org.kde.plasma-nm.po move summit/messages/kdegames/kbattleship.po summit/messages/kdegames/knavalbattle.po move summit/docmessages/kdegames/kbattleship.po summit/docmessages/kdegames/knavalbattle.po merge summit/messages/extragear-network/desktop_extragear-network_kopete-cryptography.po summit/messages/kdenetwork/desktop_kdenetwork_kopete.po move summit/messages/playground-network/kopete-thinklight.po summit/messages/playground-network/kcm_kopete_thinklight.po merge summit/messages/kdenetwork/kopete-cryptography.po summit/messages/kdenetwork/kopete.po merge summit/docmessages/kdenetwork/kopete-cryptography.po summit/docmessages/kdenetwork/kopete.po copy summit/messages/kdesdk/kompare.po summit/messages/kdesdk/libkomparediff2.po copy summit/messages/kdepim-runtime/akonadi_google_resource.po summit/messages/kdepim-runtime/akonadi_googlecalendar_resource.po copy summit/messages/kdepim-runtime/akonadi_google_resource.po summit/messages/kdepim-runtime/akonadi_googlecontacts_resource.po delete summit/messages/kdepim-runtime/akonadi_google_resource.po delete summit/messages/extragear-base/plasma_applet_org.kde.active.welcome.po delete summit/messages/extragear-base/plasma_package_org.kde.active.contour-tablet-homescreen.po move summit/messages/kdepim/akonadi_folderagent_agent.po summit/messages/kdepim/akonadi_folderarchive_agent.po move summit/messages/kdeedu/plasma_applet_kalgebra.po summit/messages/kdeedu/plasma_applet_kalgebraplasmoid.po delete summit/messages/playground-network/desktop_playground-network_ktp-nepomuk-service.po move summit/messages/playground-network/plasmanm_openconnectui.po summit/messages/playground-network/plasmanetworkmanagement_openconnectui.po move summit/messages/playground-network/plasmanm_openswanui.po summit/messages/playground-network/plasmanetworkmanagement_openswanui.po move summit/messages/playground-network/plasmanm_openvpnui.po summit/messages/playground-network/plasmanetworkmanagement_openvpnui.po move summit/messages/playground-network/plasmanm_vpncui.po summit/messages/playground-network/plasmanetworkmanagement_vpncui.po move summit/messages/playground-network/libplasmanm-editor.po summit/messages/playground-network/libplasmanetworkmanagement-editor.po move summit/messages/playground-network/plasma_applet_org.kde.plasma-nm.po summit/messages/playground-network/plasma_applet_org.kde.networkmanagement.po move summit/messages/playground-network/plasmanm-kded.po summit/messages/playground-network/plasmanetworkmanagement-kded.po move summit/messages/playground-network/plasmanm_l2tpui.po summit/messages/playground-network/plasmanetworkmanagement_l2tpui.po move summit/messages/playground-network/plasmanm_pptpui.po summit/messages/playground-network/plasmanetworkmanagement_pptpui.po move summit/messages/extragear-sysadmin/plasma-runner-installer.po summit/messages/extragear-sysadmin/plasma_runner_installer.po move summit/messages/kdepim-runtime/akonadi_knut_resource.po summit/messages/kdepimlibs/akonadi_knut_resource.po move summit/messages/kdereview/kartesio.po summit/messages/playground-edu/kartesio.po move summit/messages/kdereview/desktop_kdereview_kartesio.po summit/messages/playground-edu/desktop_playground-edu_kartesio.po move summit/docmessages/kdereview/kartesio.po summit/docmessages/playground-edu/kartesio.po move summit/docmessages/kdereview/kartesio_man-kartesio.1.po summit/docmessages/playground-edu/kartesio_man-kartesio.1.po delete summit/messages/playground-graphics/klotz.po move summit/messages/playground-devtools/kdevninja.po summit/messages/extragear-kdevelop/kdevninja.po merge summit/messages/playground-devtools/desktop_playground-devtools_kdev-ninja.po summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdevelop.po move summit/messages/playground-libs/plasma_shell_org.kde.desktop.po summit/messages/kde-workspace/plasma_shell_org.kde.desktop.po mergekeep summit/messages/kdepim/korganizer.po summit/messages/kdepim/calendarsupport.po move summit/messages/kdereview/kcm_displayconfiguration.po summit/messages/extragear-base/kcm_displayconfiguration.po move summit/messages/kdereview/plasma_applet_org.kde.plasma.kscreen.po summit/messages/extragear-base/plasma_applet_org.kde.plasma.kscreen.po move summit/messages/kdereview/kscreen.po summit/messages/extragear-base/kscreen.po move summit/messages/kdereview/desktop_kdereview_kscreen.po summit/messages/extragear-base/desktop_extragear-base_kscreen.po delete summit/messages/playground-network/kcm_network.po delete summit/messages/playground-network/desktop_playground-network_libkpeople.po copy summit/messages/kde-runtime/kio_nepomuksearch.po summit/messages/playground-base/kio_baloosearch.po copy summit/messages/kdelibs/nepomukfilewatch.po summit/messages/playground-base/baloo_file_extractor.po copy summit/messages/kdelibs/nepomukfilewatch.po summit/messages/playground-base/baloo_file.po copy summit/messages/kdelibs/nepomukwidgets.po summit/messages/playground-base/baloowidgets.po move summit/messages/kde-workspace/plasma_applet_clock.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.analogclock.po move summit/messages/kde-workspace/plasma_applet_notifier.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.devicenotifier.po move summit/messages/kde-workspace/plasma_applet_org.kde.showActivityManager.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.showActivityManager.po move summit/messages/kde-workspace/plasma_applet_org.kde.pager.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.pager.po merge summit/messages/kde-workspace/plasma_applet_pager.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.pager.po move summit/messages/kde-workspace/plasma_applet_org.kde.notifications.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.notifications.po move summit/messages/kde-workspace/plasma_applet_org.kde.systemtray.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.systemtray.po move summit/messages/playground-base/kcm_baloofile.po summit/messages/kdereview/kcm_baloofile.po move summit/messages/playground-base/akonadi_baloo_feeder.po summit/messages/kdereview/akonadi_baloo_feeder.po move summit/messages/playground-base/baloo_file_extractor.po summit/messages/kdereview/baloo_file_extractor.po move summit/messages/playground-base/kio_baloosearch.po summit/messages/kdereview/kio_baloosearch.po move summit/messages/playground-base/baloo_file.po summit/messages/kdereview/baloo_file.po move summit/messages/playground-base/baloowidgets.po summit/messages/kdereview/baloowidgets.po move summit/messages/playground-base/desktop_playground-base_baloo.po summit/messages/kdereview/desktop_kdereview_baloo.po delete summit/docmessages/kdepim/kmail_exporting.po delete summit/docmessages/kdepim/kmail_importing.po move summit/messages/kdereview/akonadi_baloo_feeder.po summit/messages/kdereview/akonadi_baloo_indexer.po move summit/messages/kde-workspace/plasma_applet_battery.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.battery.po merge summit/messages/kdepim/akonadi_folderarchive_agent.po summit/messages/kdepim/kmail.po merge summit/docmessages/kdepim/akonadi_folderarchive_agent.po summit/docmessages/kdepim/kmail_using-kmail.po delete summit/messages/playground-pim/akonadi_facebook_resource_standalone.po delete summit/messages/playground-pim/desktop_playground-pim_akonadi-facebook.po move summit/messages/playground-edu/artikulate.po summit/messages/kdereview/artikulate.po move summit/messages/playground-edu/desktop_playground-edu_artikulate.po summit/messages/kdereview/desktop_kdereview_artikulate.po move summit/docmessages/playground-edu/artikulate.po summit/docmessages/kdereview/artikulate.po move summit/messages/playground-network/smb4k.po summit/messages/kdereview/smb4k.po move summit/docmessages/playground-network/smb4k.po summit/docmessages/kdereview/smb4k.po copy summit/messages/kdereview/smb4k.po summit/messages/kdereview/smb4k-core.po delete summit/messages/koffice/desktop_koffice_koffice-plugins.po delete summit/messages/koffice/DivineProportion.po delete summit/messages/koffice/ParagraphTool.po delete summit/messages/koffice/koffice-simpletextedit.po delete summit/messages/koffice/kounavail.po delete summit/messages/koffice/kscan_plugin.po delete summit/messages/koffice/kthesaurus.po delete summit/docmessages/koffice/kcells_a11y.po delete summit/docmessages/koffice/kcells_faq.po delete summit/docmessages/koffice/kcells_importexport.po move summit/messages/koffice/ArtisticTextShape.po summit/messages/calligra/ArtisticTextShape.po move summit/messages/koffice/artwork.po summit/messages/calligra/karbon.po move summit/messages/koffice/ArtworkTools.po summit/messages/calligra/KarbonTools.po move summit/messages/koffice/AutocorrectPlugin.po summit/messages/calligra/AutocorrectPlugin.po move summit/messages/koffice/braindump.po summit/messages/calligra/braindump.po move summit/messages/koffice/CalendarTool.po summit/messages/calligra/CalendarTool.po move summit/messages/koffice/calligraactive.po summit/messages/calligra/calligraactive.po move summit/messages/koffice/calligra-opener.po summit/messages/calligra/calligra-opener.po move summit/messages/koffice/calligra_semanticitem_contact.po summit/messages/calligra/calligra_semanticitem_contact.po move summit/messages/koffice/calligra_semanticitem_event.po summit/messages/calligra/calligra_semanticitem_event.po move summit/messages/koffice/calligra_semanticitem_location.po summit/messages/calligra/calligra_semanticitem_location.po move summit/messages/koffice/ChangecasePlugin.po summit/messages/calligra/ChangecasePlugin.po move summit/messages/koffice/ChartShape.po summit/messages/calligra/ChartShape.po move summit/messages/koffice/CommentShape.po summit/messages/calligra/CommentShape.po move summit/messages/koffice/desktop_koffice.po summit/messages/calligra/desktop_calligra.po move summit/messages/koffice/FormulaShape.po summit/messages/calligra/FormulaShape.po move summit/messages/koffice/googledocs_plugin.po summit/messages/calligra/googledocs_plugin.po move summit/messages/koffice/kcells.po summit/messages/calligra/sheets.po move summit/messages/koffice/kdgantt.po summit/messages/calligra/kdgantt.po move summit/messages/koffice/kexi.po summit/messages/calligra/kexi.po move summit/messages/koffice/KexiRelationDesignShapePlugin.po summit/messages/calligra/KexiRelationDesignShapePlugin.po move summit/messages/koffice/kformdesigner_mapbrowser.po summit/messages/calligra/kformdesigner_mapbrowser.po move summit/messages/koffice/kformdesigner_webbrowser.po summit/messages/calligra/kformdesigner_webbrowser.po move summit/messages/koffice/kivio.po summit/messages/calligra/flow.po move summit/messages/koffice/kocolorspaces.po summit/messages/calligra/kocolorspaces.po move summit/messages/koffice/koconverter.po summit/messages/calligra/koconverter.po move summit/messages/koffice/koffice-defaulttools.po summit/messages/calligra/calligra-defaulttools.po move summit/messages/koffice/koffice-dockers.po summit/messages/calligra/calligra-dockers.po move summit/messages/koffice/kofficefilters.po summit/messages/calligra/calligrafilters.po move summit/messages/koffice/koffice.po summit/messages/calligra/calligra.po move summit/messages/koffice/koproperty.po summit/messages/calligra/koproperty.po move summit/messages/koffice/koreport_barcodeplugin.po summit/messages/calligra/koreport_barcodeplugin.po move summit/messages/koffice/koreport_chartplugin.po summit/messages/calligra/koreport_chartplugin.po move summit/messages/koffice/koreport_mapsplugin.po summit/messages/calligra/koreport_mapsplugin.po move summit/messages/koffice/koreport_webplugin.po summit/messages/calligra/koreport_webplugin.po move summit/messages/koffice/kplatolibs.po summit/messages/calligra/planlibs.po move summit/messages/koffice/kplato.po summit/messages/calligra/plan.po move summit/messages/koffice/kplatorcpsplugin.po summit/messages/calligra/planrcpsplugin.po move summit/messages/koffice/kplatowork.po summit/messages/calligra/planwork.po move summit/messages/koffice/krita.po summit/messages/calligra/krita.po move summit/messages/koffice/krossmodulekplato.po summit/messages/calligra/krossmoduleplan.po move summit/messages/koffice/krossmodulekspread.po summit/messages/calligra/krossmodulesheets.po move summit/messages/koffice/krossmodulekword.po summit/messages/calligra/krossmodulewords.po move summit/messages/koffice/kspreadsolver.po summit/messages/calligra/sheetssolver.po move summit/messages/koffice/kword.po summit/messages/calligra/words.po move summit/messages/koffice/MusicShape.po summit/messages/calligra/MusicShape.po move summit/messages/koffice/okularGenerator_odp.po summit/messages/calligra/okularGenerator_odp.po move summit/messages/koffice/PathShapes.po summit/messages/calligra/PathShapes.po move summit/messages/koffice/PictureShape.po summit/messages/calligra/PictureShape.po move summit/messages/koffice/plantjplugin.po summit/messages/calligra/plantjplugin.po move summit/messages/koffice/PluginShape.po summit/messages/calligra/PluginShape.po move summit/messages/koffice/sheetspivottables_plugin.po summit/messages/calligra/sheetspivottables_plugin.po move summit/messages/koffice/showcase.po summit/messages/calligra/stage.po move summit/messages/koffice/SpellCheckPlugin.po summit/messages/calligra/SpellCheckPlugin.po move summit/messages/koffice/TableShape.po summit/messages/calligra/TableShape.po move summit/messages/koffice/TemplateShape.po summit/messages/calligra/TemplateShape.po move summit/messages/koffice/TextShape.po summit/messages/calligra/TextShape.po move summit/messages/koffice/thesaurus_tool.po summit/messages/calligra/thesaurus_tool.po move summit/messages/koffice/ThreedShape.po summit/messages/calligra/ThreedShape.po move summit/messages/koffice/VariablesPlugin.po summit/messages/calligra/VariablesPlugin.po move summit/messages/koffice/VectorShape.po summit/messages/calligra/VectorShape.po move summit/messages/koffice/VideoShape.po summit/messages/calligra/VideoShape.po move summit/docmessages/koffice/kcells.po summit/docmessages/calligra/sheets.po move summit/docmessages/koffice/kcells_advanced.po summit/docmessages/calligra/sheets_advanced.po move summit/docmessages/koffice/kcells_basics.po summit/docmessages/calligra/sheets_basics.po move summit/docmessages/koffice/kcells_commands.po summit/docmessages/calligra/sheets_commands.po move summit/docmessages/koffice/kcells_configdialog.po summit/docmessages/calligra/sheets_configdialog.po move summit/docmessages/koffice/kcells_config.po summit/docmessages/calligra/sheets_config.po move summit/docmessages/koffice/kcells_format.po summit/docmessages/calligra/sheets_format.po move summit/docmessages/koffice/kcells_functions.po summit/docmessages/calligra/sheets_functions.po move summit/docmessages/koffice/kexi.po summit/docmessages/calligra/kexi.po move summit/docmessages/koffice/koffice.po summit/docmessages/calligra/calligra.po move summit/docmessages/koffice/kpresenter.po summit/docmessages/calligra/stage.po move summit/docmessages/koffice/kpresenter_great-presentations.po summit/docmessages/calligra/stage_great-presentations.po move summit/docmessages/koffice/kpresenter_guides.po summit/docmessages/calligra/stage_guides.po move summit/docmessages/koffice/kpresenter_menus.po summit/docmessages/calligra/stage_menus.po move summit/docmessages/koffice/kpresenter_options.po summit/docmessages/calligra/stage_options.po move summit/docmessages/koffice/kpresenter_tutorial.po summit/docmessages/calligra/stage_tutorial.po move summit/messages/kdereview/kcm_baloofile.po summit/messages/kdelibs/kcm_baloofile.po move summit/messages/kdereview/kio_tags.po summit/messages/kdelibs/kio_tags.po move summit/messages/kdereview/kio_timeline.po summit/messages/kdelibs/kio_timeline.po move summit/messages/kdereview/akonadi_baloo_indexer.po summit/messages/kdelibs/akonadi_baloo_indexer.po move summit/messages/kdereview/baloosearch.po summit/messages/kdelibs/baloosearch.po move summit/messages/kdereview/balooshow.po summit/messages/kdelibs/balooshow.po move summit/messages/kdereview/kio_baloosearch.po summit/messages/kdelibs/kio_baloosearch.po move summit/messages/kdereview/baloo_file_extractor.po summit/messages/kdelibs/baloo_file_extractor.po move summit/messages/kdereview/baloo_file.po summit/messages/kdelibs/baloo_file.po move summit/messages/kdereview/baloowidgets.po summit/messages/kdelibs/baloowidgets.po move summit/messages/kdereview/plasma_runner_baloosearchrunner.po summit/messages/kdelibs/plasma_runner_baloosearchrunner.po move summit/messages/playground-base/kfilemetadata.po summit/messages/kdelibs/kfilemetadata.po move summit/messages/playground-base/desktop_playground-base_kfilemetadata.po summit/messages/kdelibs/desktop_kdelibs_kfilemetadata.po move summit/messages/kdereview/desktop_kdereview_baloo.po summit/messages/kdelibs/desktop_kdelibs_baloo.po delete summit/messages/playground-office/HighlightPlugin.po delete summit/messages/playground-office/desktop_playground-office_koffice-chartingshape.po delete summit/messages/playground-office/desktop_playground-office_koffice-formulashape.po delete summit/messages/playground-office/desktop_playground-office_koffice-musicshape.po delete summit/messages/playground-office/desktop_playground-office_koffice-texthighlight.po delete summit/messages/playground-office/desktop_playground-office_koffice-videoshape.po delete summit/docmessages/playground-office/kchart.po delete summit/docmessages/playground-office/kformula.po move summit/messages/playground-base/kdeconnect-plasmoid.po summit/messages/playground-base/plasma_applet_kdeconnect.po move summit/messages/extragear-graphics/kipiplugin_mediawiki.po summit/messages/extragear-graphics/kipiplugin_wikimedia.po copy summit/messages/kde-runtime/kio_tags.po summit/messages/kdelibs/kio_tags.po copy summit/messages/kde-runtime/kio_timeline.po summit/messages/kdelibs/kio_timeline.po move summit/messages/kde-runtime/kio_tags.po summit/messages/kde-runtime/kio_nepomuktags.po move summit/messages/kde-runtime/kio_timeline.po summit/messages/kde-runtime/kio_nepomuktimeline.po move summit/messages/playground-base/milou.po summit/messages/kdereview/milou.po move summit/messages/playground-base/desktop_playground-base_milou.po summit/messages/kdereview/desktop_kdereview_milou.po move summit/messages/playground-libs/plasma_runner_example_homefiles.po summit/messages/frameworks/plasma_runner_example_homefiles.po move summit/messages/kdeutils/desktop_kdeutils_kwallet.po summit/messages/kdeutils/desktop_kdeutils_kwalletmanager.po move summit/docmessages/kdeutils/kwallet.po summit/docmessages/kdeutils/kwalletmanager.po move summit/messages/kdereview/artikulate.po summit/messages/kdeedu/artikulate.po move summit/messages/kdereview/desktop_kdereview_artikulate.po summit/messages/kdeedu/desktop_kdeedu_artikulate.po move summit/docmessages/kdereview/artikulate.po summit/docmessages/kdeedu/artikulate.po move summit/messages/kdereview/smb4k.po summit/messages/extragear-network/smb4k.po move summit/messages/kdereview/smb4k-core.po summit/messages/extragear-network/smb4k-core.po move summit/messages/kdereview/plasma_applet_smb4k-qml.po summit/messages/extragear-network/plasma_applet_smb4k-qml.po move summit/messages/kdereview/desktop_kdereview_smb4k.po summit/messages/extragear-network/desktop_extragear-network_smb4k.po move summit/docmessages/kdereview/smb4k.po summit/docmessages/extragear-network/smb4k.po move summit/messages/kdenetwork/desktop_kdenetwork_kdnssd.po summit/messages/kdenetwork/desktop_kdenetwork_zeroconf-ioslave.po delete summit/messages/kde-workspace/plasma_shell_org.kde.blank.po delete summit/messages/extragear-sysadmin/muon-notifier.po move summit/messages/playground-office/kbibtex.po summit/messages/kdereview/kbibtex.po move summit/messages/playground-office/desktop_playground-office_kbibtex.po summit/messages/kdereview/desktop_kdereview_kbibtex.po move summit/docmessages/playground-office/kbibtex.po summit/docmessages/kdereview/kbibtex.po move summit/docmessages/playground-office/kbibtex_man-kbibtex.1.po summit/docmessages/kdereview/kbibtex_man-kbibtex.1.po delete summit/messages/frameworks/kprintutils5.po # Summit catalogs left behind on 4.13->4.14 switch, 2014-04-02. delete summit/messages/kdepim-runtime/akonadi_microblog_resource.po delete summit/messages/kdepim-runtime/akonadi_nepomuk_feeder.po delete summit/messages/kdepim-runtime/akonadi_nepomuktag_resource.po delete summit/messages/kdepim-runtime/akonadi_strigi_feeder.po delete summit/messages/kdepim-runtime/nepomukpimindexerutility.po delete summit/messages/kdepim/kfile_mail.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_khotkeys.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_kinfocenter.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_kmenuedit.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_ksysguard.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_kwin.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_kwrited.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_libksysguard.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_oxygen.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_plasma-desktop.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_plasma-workspace.po copy summit/messages/kde-workspace/desktop_kde-workspace.po summit/messages/kde-workspace/desktop_workspace_systemsettings.po delete summit/messages/kde-workspace/desktop_kde-workspace.po copy summit/messages/kde-workspace/desktop_workspace_khotkeys.po summit/messages/extragear-base/desktop_extragear-base_powerdevil.po move summit/messages/kdereview/milou.po summit/messages/extragear-base/milou.po move summit/messages/kdereview/desktop_kdereview_milou.po summit/messages/extragear-base/desktop_extragear-base_milou.po merge summit/messages/playground-base/desktop_playground-base_kwin-compositing-kcm.po summit/messages/kde-workspace/desktop_workspace_kwin.po move summit/messages/playground-utils/kronometer.po summit/messages/kdereview/kronometer.po move summit/docmessages/playground-utils/kronometer.po summit/docmessages/kdereview/kronometer.po move summit/messages/playground-utils/desktop_playground-utils_kronometer.po summit/messages/kdereview/desktop_kdereview_kronometer.po move summit/messages/extragear-base/milou.po summit/messages/extragear-base/plasma_applet_milou_applet.po delete summit/messages/extragear-graphics/kpovmodeler.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_kpovmodeler.po delete summit/messages/extragear-graphics/kuickshow.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_kuickshow.po delete summit/messages/extragear-graphics/kgrab.po delete summit/messages/extragear-graphics/desktop_extragear-graphics_kgrab.po move summit/messages/applications/libkonq.po summit/messages/kde-workspace/libkonq.po copy summit/messages/kde-workspace/libkonq.po summit/messages/kde-workspace/plasma_applet_folder.po copy summit/messages/kde-runtime/desktop_kde-runtime.po summit/messages/kde-runtime/desktop_workspace_kde-cli-tools.po copy summit/messages/kde-runtime/desktop_kde-runtime.po summit/messages/kde-runtime/desktop_workspace_khelpcenter.po copy summit/messages/kde-runtime/desktop_kde-runtime.po summit/messages/kde-runtime/desktop_workspace_kio-extras.po copy summit/messages/kde-runtime/desktop_kde-runtime.po summit/messages/kde-runtime/desktop_workspace_kwindowsaddons.po delete summit/messages/kdepim/akonadi_followupreminder_agent.po move summit/messages/kdelibs/activitymanager_plugin_globalshortcuts.po summit/messages/kdelibs/kactivitymanagerd_plugin_globalshortcuts.po move summit/messages/playground-libs/plasma_scriptengine_declarative.po summit/messages/kdereview/plasma_scriptengine_declarative.po move summit/messages/playground-libs/desktop_playground-libs_plasma-framework.po summit/messages/kdereview/desktop_kdereview_plasma-framework.po delete summit/messages/kdepim/kcm_pimactivity.po delete summit/messages/kdepim/libpimactivity.po delete summit/docmessages/extragear-graphics/kpovmodeler.po delete summit/docmessages/extragear-graphics/kuickshow.po move summit/messages/kdereview/plasma_scriptengine_declarative.po summit/messages/frameworks/desktop_frameworks_plasma-framework.po delete summit/messages/kdereview/desktop_kdereview_plasma-framework.po delete summit/docmessages/kde-workspace/kcontrol_solid-hardware.po delete summit/messages/kde-workspace/plasma_containment_org.kde.plasma.desktopcontainment.po move summit/messages/extragear-base/desktop_extragear-base_milou.po summit/messages/kde-workspace/desktop_extragear-base_milou.po move summit/messages/extragear-base/desktop_extragear-base_powerdevil.po summit/messages/kde-workspace/desktop_extragear-base_powerdevil.po move summit/messages/extragear-base/plasma_applet_milou_applet.po summit/messages/kde-workspace/plasma_applet_milou_applet.po move summit/messages/playground-network/plasmanetworkmanagement-kded.po summit/messages/kdereview/plasmanetworkmanagement-kded.po move summit/messages/playground-network/plasmanetworkmanagement_l2tpui.po summit/messages/kdereview/plasmanetworkmanagement_l2tpui.po move summit/messages/playground-network/plasmanetworkmanagement_openconnectui.po summit/messages/kdereview/plasmanetworkmanagement_openconnectui.po move summit/messages/playground-network/plasmanetworkmanagement_openswanui.po summit/messages/kdereview/plasmanetworkmanagement_openswanui.po move summit/messages/playground-network/plasmanetworkmanagement_openvpnui.po summit/messages/kdereview/plasmanetworkmanagement_openvpnui.po move summit/messages/playground-network/plasmanetworkmanagement_pptpui.po summit/messages/kdereview/plasmanetworkmanagement_pptpui.po move summit/messages/playground-network/plasmanetworkmanagement_strongswanui.po summit/messages/kdereview/plasmanetworkmanagement_strongswanui.po move summit/messages/playground-network/plasmanetworkmanagement_vpncui.po summit/messages/kdereview/plasmanetworkmanagement_vpncui.po move summit/messages/playground-graphics/kxstitch.po summit/messages/kdereview/kxstitch.po move summit/messages/playground-graphics/desktop_playground-graphics_kxstitch.po summit/messages/kdereview/desktop_kdereview_kxstitch.po move summit/docmessages/playground-graphics/kxstitch.po summit/docmessages/kdereview/kxstitch.po move summit/docmessages/playground-graphics/kxstitch_commands.po summit/docmessages/kdereview/kxstitch_commands.po move summit/docmessages/playground-graphics/kxstitch_credits.po summit/docmessages/kdereview/kxstitch_credits.po move summit/docmessages/playground-graphics/kxstitch_dialogs.po summit/docmessages/kdereview/kxstitch_dialogs.po move summit/docmessages/playground-graphics/kxstitch_faq.po summit/docmessages/kdereview/kxstitch_faq.po move summit/docmessages/playground-graphics/kxstitch_features.po summit/docmessages/kdereview/kxstitch_features.po move summit/docmessages/playground-graphics/kxstitch_install.po summit/docmessages/kdereview/kxstitch_install.po move summit/docmessages/playground-graphics/kxstitch_introduction.po summit/docmessages/kdereview/kxstitch_introduction.po move summit/docmessages/playground-graphics/kxstitch_man-kxstitch.1.po summit/docmessages/kdereview/kxstitch_man-kxstitch.1.po move summit/docmessages/playground-graphics/kxstitch_patterns.po summit/docmessages/kdereview/kxstitch_patterns.po move summit/docmessages/playground-graphics/kxstitch_printing.po summit/docmessages/kdereview/kxstitch_printing.po move summit/docmessages/playground-graphics/kxstitch_ui.po summit/docmessages/kdereview/kxstitch_ui.po move summit/messages/kdereview/kbibtex.po summit/messages/extragear-office/kbibtex.po move summit/messages/kdereview/kbibtex_xml_mimetypes.po summit/messages/extragear-office/kbibtex_xml_mimetypes.po move summit/messages/kdereview/desktop_kdereview_kbibtex.po summit/messages/extragear-office/desktop_extragear-office_kbibtex.po move summit/messages/playground-graphics/SymbolEditor.po summit/messages/kdereview/SymbolEditor.po move summit/messages/playground-graphics/desktop_playground-graphics_symboleditor.po summit/messages/kdereview/desktop_kdereview_symboleditor.po move summit/docmessages/playground-graphics/SymbolEditor.po summit/docmessages/kdereview/SymbolEditor.po move summit/docmessages/playground-graphics/SymbolEditor_commands.po summit/docmessages/kdereview/SymbolEditor_commands.po move summit/docmessages/playground-graphics/SymbolEditor_credits.po summit/docmessages/kdereview/SymbolEditor_credits.po move summit/docmessages/playground-graphics/SymbolEditor_dialogs.po summit/docmessages/kdereview/SymbolEditor_dialogs.po move summit/docmessages/playground-graphics/SymbolEditor_introduction.po summit/docmessages/kdereview/SymbolEditor_introduction.po move summit/docmessages/playground-graphics/SymbolEditor_symbols.po summit/docmessages/kdereview/SymbolEditor_symbols.po move summit/docmessages/playground-graphics/SymbolEditor_ui.po summit/docmessages/kdereview/SymbolEditor_ui.po move summit/messages/applications/desktop_applications_kate.po summit/messages/applications/kate.desktop.po move summit/messages/applications/desktop_applications_kde-baseapps.po summit/messages/applications/kde-baseapps.desktop.po move summit/messages/applications/desktop_applications_konsole.po summit/messages/applications/konsole.desktop.po move summit/messages/calligra/desktop_calligra.po summit/messages/calligra/calligra.desktop.po move summit/messages/extragear-accessibility/desktop_extragear-accessibility_simon.po summit/messages/extragear-accessibility/simon.desktop.po move summit/messages/extragear-artwork/desktop_extragear-artwork_kannasaver.po summit/messages/extragear-artwork/kannasaver.desktop.po move summit/messages/extragear-base/desktop_extragear-base_bluedevil.po summit/messages/extragear-base/bluedevil.desktop.po move summit/messages/extragear-base/desktop_extragear-base_kappfinder.po summit/messages/extragear-base/kappfinder.desktop.po move summit/messages/extragear-base/desktop_extragear-base_kde-gtk-config.po summit/messages/extragear-base/kde-gtk-config.desktop.po move summit/messages/extragear-base/desktop_extragear-base_kscreen.po summit/messages/extragear-base/kscreen.desktop.po move summit/messages/extragear-base/desktop_extragear-base_kwebkitpart.po summit/messages/extragear-base/kwebkitpart.desktop.po move summit/messages/extragear-base/desktop_extragear-base_mangonel.po summit/messages/extragear-base/mangonel.desktop.po move summit/messages/extragear-base/desktop_extragear-base_nepomuk-webminer.po summit/messages/extragear-base/nepomuk-webminer.desktop.po move summit/messages/extragear-base/desktop_extragear-base_networkmanagement.po summit/messages/extragear-base/networkmanagement.desktop.po move summit/messages/extragear-base/desktop_extragear-base_plasma-mobile.po summit/messages/extragear-base/plasma-mobile.desktop.po move summit/messages/extragear-base/desktop_extragear-base_polkit-kde-agent-1.po summit/messages/extragear-base/polkit-kde-agent-1.desktop.po move summit/messages/extragear-base/desktop_extragear-base_polkit-kde-kcmodules-1.po summit/messages/extragear-base/polkit-kde-kcmodules-1.desktop.po move summit/messages/extragear-base/desktop_extragear-base_share-like-connect.po summit/messages/extragear-base/share-like-connect.desktop.po move summit/messages/extragear-base/desktop_extragear-base_wacomtablet.po summit/messages/extragear-base/wacomtablet.desktop.po move summit/messages/extragear-games/desktop_extragear-games_knights.po summit/messages/extragear-games/knights.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_digikam.po summit/messages/extragear-graphics/digikam.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kcoloredit.po summit/messages/extragear-graphics/kcoloredit.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kfax.po summit/messages/extragear-graphics/kfax.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kgraphviewer.po summit/messages/extragear-graphics/kgraphviewer.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kiconedit.po summit/messages/extragear-graphics/kiconedit.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kipi-plugins.po summit/messages/extragear-graphics/kipi-plugins.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kolor-manager.po summit/messages/extragear-graphics/kolor-manager.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kphotoalbum.po summit/messages/extragear-graphics/kphotoalbum.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_kst-plot.po summit/messages/extragear-graphics/kst-plot.desktop.po move summit/messages/extragear-graphics/desktop_extragear-graphics_skanlite.po summit/messages/extragear-graphics/skanlite.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdevelop.po summit/messages/extragear-kdevelop/kdevelop.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-php-docs.po summit/messages/extragear-kdevelop/kdev-php-docs.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-php.po summit/messages/extragear-kdevelop/kdev-php.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdevplatform.po summit/messages/extragear-kdevelop/kdevplatform.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-python.po summit/messages/extragear-kdevelop/kdev-python.desktop.po move summit/messages/extragear-kdevelop/desktop_extragear-kdevelop_kdev-www.po summit/messages/extragear-kdevelop/kdev-www.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_amarok.po summit/messages/extragear-multimedia/amarok.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_k3b.po summit/messages/extragear-multimedia/k3b.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kaffeine.po summit/messages/extragear-multimedia/kaffeine.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kamoso.po summit/messages/extragear-multimedia/kamoso.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kaudiocreator.po summit/messages/extragear-multimedia/kaudiocreator.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kdenlive.po summit/messages/extragear-multimedia/kdenlive.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kmid.po summit/messages/extragear-multimedia/kmid.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kmplayer.po summit/messages/extragear-multimedia/kmplayer.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_kplayer.po summit/messages/extragear-multimedia/kplayer.desktop.po move summit/messages/extragear-multimedia/desktop_extragear-multimedia_plasma-mediacenter.po summit/messages/extragear-multimedia/plasma-mediacenter.desktop.po move summit/messages/extragear-network/desktop_extragear-network_choqok.po summit/messages/extragear-network/choqok.desktop.po move summit/messages/extragear-network/desktop_extragear-network_kftpgrabber.po summit/messages/extragear-network/kftpgrabber.desktop.po move summit/messages/extragear-network/desktop_extragear-network_kmldonkey.po summit/messages/extragear-network/kmldonkey.desktop.po move summit/messages/extragear-network/desktop_extragear-network_knemo.po summit/messages/extragear-network/knemo.desktop.po move summit/messages/extragear-network/desktop_extragear-network_konversation.po summit/messages/extragear-network/konversation.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktorrent.po summit/messages/extragear-network/ktorrent.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-accounts-kcm.po summit/messages/extragear-network/ktp-accounts-kcm.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-approver.po summit/messages/extragear-network/ktp-approver.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-common-internals.po summit/messages/extragear-network/ktp-common-internals.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-contact-list.po summit/messages/extragear-network/ktp-contact-list.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-contact-runner.po summit/messages/extragear-network/ktp-contact-runner.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-desktop-applets.po summit/messages/extragear-network/ktp-desktop-applets.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-kded-module.po summit/messages/extragear-network/ktp-kded-module.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-send-file.po summit/messages/extragear-network/ktp-send-file.desktop.po move summit/messages/extragear-network/desktop_extragear-network_ktp-text-ui.po summit/messages/extragear-network/ktp-text-ui.desktop.po move summit/messages/extragear-network/desktop_extragear-network_kwlan.po summit/messages/extragear-network/kwlan.desktop.po move summit/messages/extragear-network/desktop_extragear-network_rekonq.po summit/messages/extragear-network/rekonq.desktop.po move summit/messages/extragear-network/desktop_extragear-network_smb4k.po summit/messages/extragear-network/smb4k.desktop.po move summit/messages/extragear-network/desktop_extragear-network_wicd-kde.po summit/messages/extragear-network/wicd-kde.desktop.po move summit/messages/extragear-office/desktop_extragear-office_kbibtex.po summit/messages/extragear-office/kbibtex.desktop.po move summit/messages/extragear-office/desktop_extragear-office_kile.po summit/messages/extragear-office/kile.desktop.po move summit/messages/extragear-office/desktop_extragear-office_kmymoney.po summit/messages/extragear-office/kmymoney.desktop.po move summit/messages/extragear-office/desktop_extragear-office_skrooge.po summit/messages/extragear-office/skrooge.desktop.po move summit/messages/extragear-office/desktop_extragear-office_tellico.po summit/messages/extragear-office/tellico.desktop.po move summit/messages/extragear-pim/desktop_extragear-pim_ksig.po summit/messages/extragear-pim/ksig.desktop.po move summit/messages/extragear-pim/desktop_extragear-pim_trojita.po summit/messages/extragear-pim/trojita.desktop.po move summit/messages/extragear-sdk/desktop_extragear-sdk_kxsldbg.po summit/messages/extragear-sdk/kxsldbg.desktop.po move summit/messages/extragear-sdk/desktop_extragear-sdk_massif-visualizer.po summit/messages/extragear-sdk/massif-visualizer.desktop.po move summit/messages/extragear-sdk/desktop_extragear-sdk_plasmate.po summit/messages/extragear-sdk/plasmate.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_apper.po summit/messages/extragear-sysadmin/apper.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_kcm-grub2.po summit/messages/extragear-sysadmin/kcm-grub2.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_kiosktool.po summit/messages/extragear-sysadmin/kiosktool.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_libqapt.po summit/messages/extragear-sysadmin/libqapt.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_muon.po summit/messages/extragear-sysadmin/muon.desktop.po move summit/messages/extragear-sysadmin/desktop_extragear-sysadmin_partitionmanager.po summit/messages/extragear-sysadmin/partitionmanager.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_kdesrc-build.po summit/messages/extragear-utils/kdesrc-build.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_kdiff3.po summit/messages/extragear-utils/kdiff3.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_keurocalc.po summit/messages/extragear-utils/keurocalc.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_kimtoy.po summit/messages/extragear-utils/kimtoy.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_kpager.po summit/messages/extragear-utils/kpager.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_krecipes.po summit/messages/extragear-utils/krecipes.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_krusader.po summit/messages/extragear-utils/krusader.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_nepomukshell.po summit/messages/extragear-utils/nepomukshell.desktop.po move summit/messages/extragear-utils/desktop_extragear-utils_yakuake.po summit/messages/extragear-utils/yakuake.desktop.po move summit/messages/frameworks/desktop_frameworks_krunner.po summit/messages/frameworks/krunner.desktop.po move summit/messages/frameworks/desktop_frameworks_plasma-framework.po summit/messages/frameworks/plasma-framework.desktop.po move summit/messages/kdeaccessibility/desktop_kdeaccessibility_jovie.po summit/messages/kdeaccessibility/jovie.desktop.po move summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmag.po summit/messages/kdeaccessibility/kmag.desktop.po move summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmousetool.po summit/messages/kdeaccessibility/kmousetool.desktop.po move summit/messages/kdeaccessibility/desktop_kdeaccessibility_kmouth.po summit/messages/kdeaccessibility/kmouth.desktop.po move summit/messages/kdeadmin/desktop_kdeadmin_kcron.po summit/messages/kdeadmin/kcron.desktop.po move summit/messages/kdeadmin/desktop_kdeadmin_ksystemlog.po summit/messages/kdeadmin/ksystemlog.desktop.po move summit/messages/kdeadmin/desktop_kdeadmin_kuser.po summit/messages/kdeadmin/kuser.desktop.po move summit/messages/kdeartwork/desktop_kdeartwork.po summit/messages/kdeartwork/kdeartwork.desktop.po move summit/messages/kdeedu/desktop_kdeedu_artikulate.po summit/messages/kdeedu/artikulate.desktop.po move summit/messages/kdeedu/desktop_kdeedu_blinken.po summit/messages/kdeedu/blinken.desktop.po move summit/messages/kdeedu/desktop_kdeedu_cantor.po summit/messages/kdeedu/cantor.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kalgebra.po summit/messages/kdeedu/kalgebra.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kalzium.po summit/messages/kdeedu/kalzium.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kanagram.po summit/messages/kdeedu/kanagram.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kbruch.po summit/messages/kdeedu/kbruch.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kgeography.po summit/messages/kdeedu/kgeography.desktop.po move summit/messages/kdeedu/desktop_kdeedu_khangman.po summit/messages/kdeedu/khangman.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kig.po summit/messages/kdeedu/kig.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kiten.po summit/messages/kdeedu/kiten.desktop.po move summit/messages/kdeedu/desktop_kdeedu_klettres.po summit/messages/kdeedu/klettres.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kmplot.po summit/messages/kdeedu/kmplot.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kstars.po summit/messages/kdeedu/kstars.desktop.po move summit/messages/kdeedu/desktop_kdeedu_ktouch.po summit/messages/kdeedu/ktouch.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kturtle.po summit/messages/kdeedu/kturtle.desktop.po move summit/messages/kdeedu/desktop_kdeedu_kwordquiz.po summit/messages/kdeedu/kwordquiz.desktop.po move summit/messages/kdeedu/desktop_kdeedu_marble.po summit/messages/kdeedu/marble.desktop.po move summit/messages/kdeedu/desktop_kdeedu_pairs.po summit/messages/kdeedu/pairs.desktop.po move summit/messages/kdeedu/desktop_kdeedu_parley.po summit/messages/kdeedu/parley.desktop.po move summit/messages/kdeedu/desktop_kdeedu_rocs.po summit/messages/kdeedu/rocs.desktop.po move summit/messages/kdeedu/desktop_kdeedu_step.po summit/messages/kdeedu/step.desktop.po move summit/messages/kdegames/desktop_kdegames_bomber.po summit/messages/kdegames/bomber.desktop.po move summit/messages/kdegames/desktop_kdegames_bovo.po summit/messages/kdegames/bovo.desktop.po move summit/messages/kdegames/desktop_kdegames_granatier.po summit/messages/kdegames/granatier.desktop.po move summit/messages/kdegames/desktop_kdegames_kajongg.po summit/messages/kdegames/kajongg.desktop.po move summit/messages/kdegames/desktop_kdegames_kapman.po summit/messages/kdegames/kapman.desktop.po move summit/messages/kdegames/desktop_kdegames_katomic.po summit/messages/kdegames/katomic.desktop.po move summit/messages/kdegames/desktop_kdegames_kblackbox.po summit/messages/kdegames/kblackbox.desktop.po move summit/messages/kdegames/desktop_kdegames_kblocks.po summit/messages/kdegames/kblocks.desktop.po move summit/messages/kdegames/desktop_kdegames_kbounce.po summit/messages/kdegames/kbounce.desktop.po move summit/messages/kdegames/desktop_kdegames_kbreakout.po summit/messages/kdegames/kbreakout.desktop.po move summit/messages/kdegames/desktop_kdegames_kdiamond.po summit/messages/kdegames/kdiamond.desktop.po move summit/messages/kdegames/desktop_kdegames_kfourinline.po summit/messages/kdegames/kfourinline.desktop.po move summit/messages/kdegames/desktop_kdegames_kgoldrunner.po summit/messages/kdegames/kgoldrunner.desktop.po move summit/messages/kdegames/desktop_kdegames_kigo.po summit/messages/kdegames/kigo.desktop.po move summit/messages/kdegames/desktop_kdegames_killbots.po summit/messages/kdegames/killbots.desktop.po move summit/messages/kdegames/desktop_kdegames_kiriki.po summit/messages/kdegames/kiriki.desktop.po move summit/messages/kdegames/desktop_kdegames_kjumpingcube.po summit/messages/kdegames/kjumpingcube.desktop.po move summit/messages/kdegames/desktop_kdegames_klickety.po summit/messages/kdegames/klickety.desktop.po move summit/messages/kdegames/desktop_kdegames_klines.po summit/messages/kdegames/klines.desktop.po move summit/messages/kdegames/desktop_kdegames_kmahjongg.po summit/messages/kdegames/kmahjongg.desktop.po move summit/messages/kdegames/desktop_kdegames_kmines.po summit/messages/kdegames/kmines.desktop.po move summit/messages/kdegames/desktop_kdegames_knavalbattle.po summit/messages/kdegames/knavalbattle.desktop.po move summit/messages/kdegames/desktop_kdegames_knetwalk.po summit/messages/kdegames/knetwalk.desktop.po move summit/messages/kdegames/desktop_kdegames_kolf.po summit/messages/kdegames/kolf.desktop.po move summit/messages/kdegames/desktop_kdegames_kollision.po summit/messages/kdegames/kollision.desktop.po move summit/messages/kdegames/desktop_kdegames_konquest.po summit/messages/kdegames/konquest.desktop.po move summit/messages/kdegames/desktop_kdegames_kpat.po summit/messages/kdegames/kpat.desktop.po move summit/messages/kdegames/desktop_kdegames_kreversi.po summit/messages/kdegames/kreversi.desktop.po move summit/messages/kdegames/desktop_kdegames_kshisen.po summit/messages/kdegames/kshisen.desktop.po move summit/messages/kdegames/desktop_kdegames_ksirk.po summit/messages/kdegames/ksirk.desktop.po move summit/messages/kdegames/desktop_kdegames_ksnakeduel.po summit/messages/kdegames/ksnakeduel.desktop.po move summit/messages/kdegames/desktop_kdegames_kspaceduel.po summit/messages/kdegames/kspaceduel.desktop.po move summit/messages/kdegames/desktop_kdegames_ksquares.po summit/messages/kdegames/ksquares.desktop.po move summit/messages/kdegames/desktop_kdegames_ksudoku.po summit/messages/kdegames/ksudoku.desktop.po move summit/messages/kdegames/desktop_kdegames_ktuberling.po summit/messages/kdegames/ktuberling.desktop.po move summit/messages/kdegames/desktop_kdegames_kubrick.po summit/messages/kdegames/kubrick.desktop.po move summit/messages/kdegames/desktop_kdegames_libkdegames.po summit/messages/kdegames/libkdegames.desktop.po move summit/messages/kdegames/desktop_kdegames_libkmahjongg.po summit/messages/kdegames/libkmahjongg.desktop.po move summit/messages/kdegames/desktop_kdegames_lskat.po summit/messages/kdegames/lskat.desktop.po move summit/messages/kdegames/desktop_kdegames_palapeli.po summit/messages/kdegames/palapeli.desktop.po move summit/messages/kdegames/desktop_kdegames_picmi.po summit/messages/kdegames/picmi.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_gwenview.po summit/messages/kdegraphics/gwenview.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kamera.po summit/messages/kdegraphics/kamera.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kcolorchooser.po summit/messages/kdegraphics/kcolorchooser.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-mobipocket.po summit/messages/kdegraphics/kdegraphics-mobipocket.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-strigi-analyzer.po summit/messages/kdegraphics/kdegraphics-strigi-analyzer.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kdegraphics-thumbnailers.po summit/messages/kdegraphics/kdegraphics-thumbnailers.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kgamma.po summit/messages/kdegraphics/kgamma.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kolourpaint.po summit/messages/kdegraphics/kolourpaint.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_kruler.po summit/messages/kdegraphics/kruler.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_ksaneplugin.po summit/messages/kdegraphics/ksaneplugin.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_ksnapshot.po summit/messages/kdegraphics/ksnapshot.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_libkipi.po summit/messages/kdegraphics/libkipi.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_okular.po summit/messages/kdegraphics/okular.desktop.po move summit/messages/kdegraphics/desktop_kdegraphics_svgpart.po summit/messages/kdegraphics/svgpart.desktop.po move summit/messages/kdelibs/desktop_kdelibs_baloo.po summit/messages/kdelibs/baloo.desktop.po move summit/messages/kdelibs/desktop_kdelibs_kactivities.po summit/messages/kdelibs/kactivities.desktop.po move summit/messages/kdelibs/desktop_kdelibs_kfilemetadata.po summit/messages/kdelibs/kfilemetadata.desktop.po move summit/messages/kdelibs/desktop_kdelibs_nepomuk-core.po summit/messages/kdelibs/nepomuk-core.desktop.po move summit/messages/kdelibs/desktop_kdelibs.po summit/messages/kdelibs/kdelibs.desktop.po move summit/messages/kdelibs/desktop_l10n.po summit/messages/kdelibs/l10n.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_audiocd-kio.po summit/messages/kdemultimedia/audiocd-kio.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_dragon.po summit/messages/kdemultimedia/dragon.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_ffmpegthumbs.po summit/messages/kdemultimedia/ffmpegthumbs.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_juk.po summit/messages/kdemultimedia/juk.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_kmix.po summit/messages/kdemultimedia/kmix.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_kscd.po summit/messages/kdemultimedia/kscd.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_libkcddb.po summit/messages/kdemultimedia/libkcddb.desktop.po move summit/messages/kdemultimedia/desktop_kdemultimedia_mplayerthumbs.po summit/messages/kdemultimedia/mplayerthumbs.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_kdenetwork-filesharing.po summit/messages/kdenetwork/kdenetwork-filesharing.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_kget.po summit/messages/kdenetwork/kget.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_kopete.po summit/messages/kdenetwork/kopete.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_kppp.po summit/messages/kdenetwork/kppp.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_krdc.po summit/messages/kdenetwork/krdc.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_krfb.po summit/messages/kdenetwork/krfb.desktop.po move summit/messages/kdenetwork/desktop_kdenetwork_zeroconf-ioslave.po summit/messages/kdenetwork/zeroconf-ioslave.desktop.po move summit/messages/kdepim/desktop_kdepim.po summit/messages/kdepim/kdepim.desktop.po move summit/messages/kdepimlibs/desktop_kdepimlibs.po summit/messages/kdepimlibs/kdepimlibs.desktop.po move summit/messages/kdepim-runtime/desktop_kdepim-runtime.po summit/messages/kdepim-runtime/kdepim-runtime.desktop.po move summit/messages/kdeplasma-addons/desktop_kdeplasma-addons.po summit/messages/kdeplasma-addons/kdeplasma-addons.desktop.po move summit/messages/kdereview/desktop_kdereview_bodega-client.po summit/messages/kdereview/bodega-client.desktop.po move summit/messages/kdereview/desktop_kdereview_kdev-perforce.po summit/messages/kdereview/kdev-perforce.desktop.po move summit/messages/kdereview/desktop_kdereview_kor.po summit/messages/kdereview/kor.desktop.po move summit/messages/kdereview/desktop_kdereview_kronometer.po summit/messages/kdereview/kronometer.desktop.po move summit/messages/kdereview/desktop_kdereview_kxstitch.po summit/messages/kdereview/kxstitch.desktop.po move summit/messages/kdereview/desktop_kdereview_labplot.po summit/messages/kdereview/labplot.desktop.po move summit/messages/kdereview/desktop_kdereview_plasma-nm.po summit/messages/kdereview/plasma-nm.desktop.po move summit/messages/kdereview/desktop_kdereview.po summit/messages/kdereview/kdereview.desktop.po move summit/messages/kdereview/desktop_kdereview_symboleditor.po summit/messages/kdereview/symboleditor.desktop.po move summit/messages/kde-runtime/desktop_kde-runtime.po summit/messages/kde-runtime/kde-runtime.desktop.po move summit/messages/kde-runtime/desktop_workspace_kde-cli-tools.po summit/messages/kde-runtime/kde-cli-tools.desktop.po move summit/messages/kde-runtime/desktop_workspace_khelpcenter.po summit/messages/kde-runtime/khelpcenter.desktop.po move summit/messages/kde-runtime/desktop_workspace_kio-extras.po summit/messages/kde-runtime/kio-extras.desktop.po move summit/messages/kde-runtime/desktop_workspace_kwindowsaddons.po summit/messages/kde-runtime/kwindowsaddons.desktop.po move summit/messages/kdesdk/desktop_kdesdk_cervisia.po summit/messages/kdesdk/cervisia.desktop.po move summit/messages/kdesdk/desktop_kdesdk_dolphin-plugins.po summit/messages/kdesdk/dolphin-plugins.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kapptemplate.po summit/messages/kdesdk/kapptemplate.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kcachegrind.po summit/messages/kdesdk/kcachegrind.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kde-dev-utils.po summit/messages/kdesdk/kde-dev-utils.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kdesdk-kioslaves.po summit/messages/kdesdk/kdesdk-kioslaves.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kdesdk-thumbnailers.po summit/messages/kdesdk/kdesdk-thumbnailers.desktop.po move summit/messages/kdesdk/desktop_kdesdk_kompare.po summit/messages/kdesdk/kompare.desktop.po move summit/messages/kdesdk/desktop_kdesdk_lokalize.po summit/messages/kdesdk/lokalize.desktop.po move summit/messages/kdesdk/desktop_kdesdk_okteta.po summit/messages/kdesdk/okteta.desktop.po move summit/messages/kdesdk/desktop_kdesdk_umbrello.po summit/messages/kdesdk/umbrello.desktop.po move summit/messages/kdetoys/desktop_kdetoys_amor.po summit/messages/kdetoys/amor.desktop.po move summit/messages/kdetoys/desktop_kdetoys_kteatime.po summit/messages/kdetoys/kteatime.desktop.po move summit/messages/kdetoys/desktop_kdetoys_ktux.po summit/messages/kdetoys/ktux.desktop.po move summit/messages/kdeutils/desktop_kdeutils_ark.po summit/messages/kdeutils/ark.desktop.po move summit/messages/kdeutils/desktop_kdeutils_filelight.po summit/messages/kdeutils/filelight.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kcalc.po summit/messages/kdeutils/kcalc.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kcharselect.po summit/messages/kdeutils/kcharselect.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kdf.po summit/messages/kdeutils/kdf.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kfloppy.po summit/messages/kdeutils/kfloppy.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kgpg.po summit/messages/kdeutils/kgpg.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kremotecontrol.po summit/messages/kdeutils/kremotecontrol.desktop.po move summit/messages/kdeutils/desktop_kdeutils_ktimer.po summit/messages/kdeutils/ktimer.desktop.po move summit/messages/kdeutils/desktop_kdeutils_kwalletmanager.po summit/messages/kdeutils/kwalletmanager.desktop.po move summit/messages/kdeutils/desktop_kdeutils_print-manager.po summit/messages/kdeutils/print-manager.desktop.po move summit/messages/kdeutils/desktop_kdeutils_superkaramba.po summit/messages/kdeutils/superkaramba.desktop.po move summit/messages/kdeutils/desktop_kdeutils_sweeper.po summit/messages/kdeutils/sweeper.desktop.po move summit/messages/kde-wallpapers/desktop_kde-wallpapers.po summit/messages/kde-wallpapers/kde-wallpapers.desktop.po move summit/messages/kdewebdev/desktop_kdewebdev.po summit/messages/kdewebdev/kdewebdev.desktop.po move summit/messages/kde-workspace/desktop_extragear-base_milou.po summit/messages/kde-workspace/milou.desktop.po move summit/messages/kde-workspace/desktop_extragear-base_powerdevil.po summit/messages/kde-workspace/powerdevil.desktop.po move summit/messages/kde-workspace/desktop_workspace_breeze.po summit/messages/kde-workspace/breeze.desktop.po move summit/messages/kde-workspace/desktop_workspace_khotkeys.po summit/messages/kde-workspace/khotkeys.desktop.po move summit/messages/kde-workspace/desktop_workspace_kinfocenter.po summit/messages/kde-workspace/kinfocenter.desktop.po move summit/messages/kde-workspace/desktop_workspace_kmenuedit.po summit/messages/kde-workspace/kmenuedit.desktop.po move summit/messages/kde-workspace/desktop_workspace_ksysguard.po summit/messages/kde-workspace/ksysguard.desktop.po move summit/messages/kde-workspace/desktop_workspace_kwin.po summit/messages/kde-workspace/kwin.desktop.po move summit/messages/kde-workspace/desktop_workspace_kwrited.po summit/messages/kde-workspace/kwrited.desktop.po move summit/messages/kde-workspace/desktop_workspace_libksysguard.po summit/messages/kde-workspace/libksysguard.desktop.po move summit/messages/kde-workspace/desktop_workspace_oxygen.po summit/messages/kde-workspace/oxygen.desktop.po move summit/messages/kde-workspace/desktop_workspace_plasma-desktop.po summit/messages/kde-workspace/plasma-desktop.desktop.po move summit/messages/kde-workspace/desktop_workspace_plasma-workspace.po summit/messages/kde-workspace/plasma-workspace.desktop.po move summit/messages/kde-workspace/desktop_workspace_systemsettings.po summit/messages/kde-workspace/systemsettings.desktop.po move summit/messages/playground-accessibility/desktop_playground-accessibility.po summit/messages/playground-accessibility/playground-accessibility.desktop.po move summit/messages/playground-accessibility/desktop_playground-accessibility_simon-tools.po summit/messages/playground-accessibility/simon-tools.desktop.po move summit/messages/playground-artwork/desktop_playground-artwork_dekorator.po summit/messages/playground-artwork/dekorator.desktop.po move summit/messages/playground-artwork/desktop_playground-artwork_kde-artwork-active.po summit/messages/playground-artwork/kde-artwork-active.desktop.po move summit/messages/playground-artwork/desktop_playground-artwork_oxygen-transparent.po summit/messages/playground-artwork/oxygen-transparent.desktop.po move summit/messages/playground-artwork/desktop_playground-artwork.po summit/messages/playground-artwork/playground-artwork.desktop.po move summit/messages/playground-artwork/desktop_playground-artwork_smaragd.po summit/messages/playground-artwork/smaragd.desktop.po move summit/messages/playground-base/desktop_playground-base_about-distro.po summit/messages/playground-base/about-distro.desktop.po move summit/messages/playground-base/desktop_playground-base_appmenu-runner.po summit/messages/playground-base/appmenu-runner.desktop.po move summit/messages/playground-base/desktop_playground-base_colibri.po summit/messages/playground-base/colibri.desktop.po move summit/messages/playground-base/desktop_playground-base_declarative-plasmoids.po summit/messages/playground-base/declarative-plasmoids.desktop.po move summit/messages/playground-base/desktop_playground-base_flickr-runner.po summit/messages/playground-base/flickr-runner.desktop.po move summit/messages/playground-base/desktop_playground-base_gestures-kde.po summit/messages/playground-base/gestures-kde.desktop.po move summit/messages/playground-base/desktop_playground-base_homerun.po summit/messages/playground-base/homerun.desktop.po move summit/messages/playground-base/desktop_playground-base_kaccounts-integration.po summit/messages/playground-base/kaccounts-integration.desktop.po move summit/messages/playground-base/desktop_playground-base_kdeconnect-kde.po summit/messages/playground-base/kdeconnect-kde.desktop.po move summit/messages/playground-base/desktop_playground-base_kio-mtp.po summit/messages/playground-base/kio-mtp.desktop.po move summit/messages/playground-base/desktop_playground-base_krono.po summit/messages/playground-base/krono.desktop.po move summit/messages/playground-base/desktop_playground-base_lightdm.po summit/messages/playground-base/lightdm.desktop.po move summit/messages/playground-base/desktop_playground-base_nepomukannotation.po summit/messages/playground-base/nepomukannotation.desktop.po move summit/messages/playground-base/desktop_playground-base_nepomuk-system-tray.po summit/messages/playground-base/nepomuk-system-tray.desktop.po move summit/messages/playground-base/desktop_playground-base_nepomuk-web-extractor.po summit/messages/playground-base/nepomuk-web-extractor.desktop.po move summit/messages/playground-base/desktop_playground-base_plasma-crystal.po summit/messages/playground-base/plasma-crystal.desktop.po move summit/messages/playground-base/desktop_playground-base_plasma-lionmail.po summit/messages/playground-base/plasma-lionmail.desktop.po move summit/messages/playground-base/desktop_playground-base.po summit/messages/playground-base/playground-base.desktop.po move summit/messages/playground-base/desktop_playground-base_publictransport.po summit/messages/playground-base/publictransport.desktop.po move summit/messages/playground-base/desktop_playground-base_scribo.po summit/messages/playground-base/scribo.desktop.po move summit/messages/playground-base/desktop_playground-base_silk.po summit/messages/playground-base/silk.desktop.po move summit/messages/playground-base/desktop_playground-base_stackfolder.po summit/messages/playground-base/stackfolder.desktop.po move summit/messages/playground-base/desktop_playground-base_user-manager.po summit/messages/playground-base/user-manager.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdesvn.po summit/messages/playground-devtools/kdesvn.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-clang.po summit/messages/playground-devtools/kdev-clang.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-control-flow-graph.po summit/messages/playground-devtools/kdev-control-flow-graph.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-cppcheck.po summit/messages/playground-devtools/kdev-cppcheck.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-crossfire.po summit/messages/playground-devtools/kdev-crossfire.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-css.po summit/messages/playground-devtools/kdev-css.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-executebrowser.po summit/messages/playground-devtools/kdev-executebrowser.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-java.po summit/messages/playground-devtools/kdev-java.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-krazy2.po summit/messages/playground-devtools/kdev-krazy2.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-mercurial.po summit/messages/playground-devtools/kdev-mercurial.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-php-formatter.po summit/messages/playground-devtools/kdev-php-formatter.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-qmake.po summit/messages/playground-devtools/kdev-qmake.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-qmljs.po summit/messages/playground-devtools/kdev-qmljs.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-ruby.po summit/messages/playground-devtools/kdev-ruby.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-sql.po summit/messages/playground-devtools/kdev-sql.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-upload.po summit/messages/playground-devtools/kdev-upload.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-valgrind.po summit/messages/playground-devtools/kdev-valgrind.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-xdebug.po summit/messages/playground-devtools/kdev-xdebug.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-xml.po summit/messages/playground-devtools/kdev-xml.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_kdev-xtest.po summit/messages/playground-devtools/kdev-xtest.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools.po summit/messages/playground-devtools/playground-devtools.desktop.po move summit/messages/playground-devtools/desktop_playground-devtools_quanta.po summit/messages/playground-devtools/quanta.desktop.po move summit/messages/playground-edu/desktop_playground-edu_conquirere.po summit/messages/playground-edu/conquirere.desktop.po move summit/messages/playground-edu/desktop_playground-edu_ebookreader.po summit/messages/playground-edu/ebookreader.desktop.po move summit/messages/playground-edu/desktop_playground-edu_kard.po summit/messages/playground-edu/kard.desktop.po move summit/messages/playground-edu/desktop_playground-edu_kartesio.po summit/messages/playground-edu/kartesio.desktop.po move summit/messages/playground-edu/desktop_playground-edu_khipu.po summit/messages/playground-edu/khipu.desktop.po move summit/messages/playground-edu/desktop_playground-edu_mula.po summit/messages/playground-edu/mula.desktop.po move summit/messages/playground-edu/desktop_playground-edu.po summit/messages/playground-edu/playground-edu.desktop.po move summit/messages/playground-games/desktop_playground-games_gluon.po summit/messages/playground-games/gluon.desktop.po move summit/messages/playground-games/desktop_playground-games_kdots.po summit/messages/playground-games/kdots.desktop.po move summit/messages/playground-games/desktop_playground-games_kmuddy.po summit/messages/playground-games/kmuddy.desktop.po move summit/messages/playground-games/desktop_playground-games_ksokoban.po summit/messages/playground-games/ksokoban.desktop.po move summit/messages/playground-games/desktop_playground-games_libtagaro.po summit/messages/playground-games/libtagaro.desktop.po move summit/messages/playground-games/desktop_playground-games.po summit/messages/playground-games/playground-games.desktop.po move summit/messages/playground-graphics/desktop_playground-graphics_bookmanager.po summit/messages/playground-graphics/bookmanager.desktop.po move summit/messages/playground-graphics/desktop_playground-graphics_cirkuit.po summit/messages/playground-graphics/cirkuit.desktop.po move summit/messages/playground-graphics/desktop_playground-graphics_colord-kde.po summit/messages/playground-graphics/colord-kde.desktop.po move summit/messages/playground-graphics/desktop_playground-graphics_kooka.po summit/messages/playground-graphics/kooka.desktop.po move summit/messages/playground-graphics/desktop_playground-graphics.po summit/messages/playground-graphics/playground-graphics.desktop.po move summit/messages/playground-ioslaves/desktop_playground-ioslaves.po summit/messages/playground-ioslaves/playground-ioslaves.desktop.po move summit/messages/playground-libs/desktop_playground-libs_ktutorial.po summit/messages/playground-libs/ktutorial.desktop.po move summit/messages/playground-libs/desktop_playground-libs.po summit/messages/playground-libs/playground-libs.desktop.po move summit/messages/playground-libs/desktop_playground-libs_predicate.po summit/messages/playground-libs/predicate.desktop.po move summit/messages/playground-libs/desktop_playground-libs_sprinter.po summit/messages/playground-libs/sprinter.desktop.po move summit/messages/playground-multimedia/desktop_playground-multimedia_audex.po summit/messages/playground-multimedia/audex.desktop.po move summit/messages/playground-multimedia/desktop_playground-multimedia_bangarang.po summit/messages/playground-multimedia/bangarang.desktop.po move summit/messages/playground-multimedia/desktop_playground-multimedia_kubeplayer.po summit/messages/playground-multimedia/kubeplayer.desktop.po move summit/messages/playground-multimedia/desktop_playground-multimedia_nepomuktvnamer.po summit/messages/playground-multimedia/nepomuktvnamer.desktop.po move summit/messages/playground-multimedia/desktop_playground-multimedia.po summit/messages/playground-multimedia/playground-multimedia.desktop.po move summit/messages/playground-network/desktop_playground-network_aki.po summit/messages/playground-network/aki.desktop.po move summit/messages/playground-network/desktop_playground-network_kfritz.po summit/messages/playground-network/kfritz.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-pimpresence.po summit/messages/playground-network/kopete-pimpresence.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-scripting.po summit/messages/playground-network/kopete-scripting.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-sharemydesktop.po summit/messages/playground-network/kopete-sharemydesktop.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-smpppdcs.po summit/messages/playground-network/kopete-smpppdcs.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-thinklight.po summit/messages/playground-network/kopete-thinklight.desktop.po move summit/messages/playground-network/desktop_playground-network_kopete-whiteboard.po summit/messages/playground-network/kopete-whiteboard.desktop.po move summit/messages/playground-network/desktop_playground-network_kte-collaborative.po summit/messages/playground-network/kte-collaborative.desktop.po move summit/messages/playground-network/desktop_playground-network_ktp-active.po summit/messages/playground-network/ktp-active.desktop.po move summit/messages/playground-network/desktop_playground-network_ktp-kipi-plugin.po summit/messages/playground-network/ktp-kipi-plugin.desktop.po move summit/messages/playground-network/desktop_playground-network_ktp-ssh-contact.po summit/messages/playground-network/ktp-ssh-contact.desktop.po move summit/messages/playground-network/desktop_playground-network_kwhiteboard.po summit/messages/playground-network/kwhiteboard.desktop.po merge summit/messages/playground-network/desktop_playground-network_plasma-nm.po summit/messages/kdereview/plasma-nm.desktop.po move summit/messages/playground-network/desktop_playground-network.po summit/messages/playground-network/playground-network.desktop.po move summit/messages/playground-network/desktop_playground-network_sflphone-kde.po summit/messages/playground-network/sflphone-kde.desktop.po move summit/messages/playground-office/desktop_playground-office_knipptasch.po summit/messages/playground-office/knipptasch.desktop.po move summit/messages/playground-office/desktop_playground-office_kraft.po summit/messages/playground-office/kraft.desktop.po move summit/messages/playground-office/desktop_playground-office.po summit/messages/playground-office/playground-office.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akonadi-exchange.po summit/messages/playground-pim/akonadi-exchange.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akonadi-git-resource.po summit/messages/playground-pim/akonadi-git-resource.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akonadi-google-applets.po summit/messages/playground-pim/akonadi-google-applets.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akonadi-sugarcrm.po summit/messages/playground-pim/akonadi-sugarcrm.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akonadi-vkontakte.po summit/messages/playground-pim/akonadi-vkontakte.desktop.po move summit/messages/playground-pim/desktop_playground-pim_akunambol.po summit/messages/playground-pim/akunambol.desktop.po move summit/messages/playground-pim/desktop_playground-pim_person-viewer.po summit/messages/playground-pim/person-viewer.desktop.po move summit/messages/playground-pim/desktop_playground-pim_plasmoid-eventlist.po summit/messages/playground-pim/plasmoid-eventlist.desktop.po move summit/messages/playground-pim/desktop_playground-pim.po summit/messages/playground-pim/playground-pim.desktop.po move summit/messages/playground-pim/desktop_playground-pim_rekollect.po summit/messages/playground-pim/rekollect.desktop.po move summit/messages/playground-pim/desktop_playground-pim_zanshin.po summit/messages/playground-pim/zanshin.desktop.po move summit/messages/playground-sdk/desktop_playground-sdk_cocoon.po summit/messages/playground-sdk/cocoon.desktop.po move summit/messages/playground-sdk/desktop_playground-sdk_dferry.po summit/messages/playground-sdk/dferry.desktop.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_kalternatives.po summit/messages/playground-sysadmin/kalternatives.desktop.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_kcmgrub2.po summit/messages/playground-sysadmin/kcmgrub2.desktop.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_kdisksutilities.po summit/messages/playground-sysadmin/kdisksutilities.desktop.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin.po summit/messages/playground-sysadmin/playground-sysadmin.desktop.po move summit/messages/playground-sysadmin/desktop_playground-sysadmin_ufw-kde.po summit/messages/playground-sysadmin/ufw-kde.desktop.po move summit/messages/playground-utils/desktop_playground-utils_abakus.po summit/messages/playground-utils/abakus.desktop.po move summit/messages/playground-utils/desktop_playground-utils_kcm-touchpad.po summit/messages/playground-utils/kcm-touchpad.desktop.po move summit/messages/playground-utils/desktop_playground-utils_kontaminuti.po summit/messages/playground-utils/kontaminuti.desktop.po move summit/messages/playground-utils/desktop_playground-utils_kregexpeditor.po summit/messages/playground-utils/kregexpeditor.desktop.po move summit/messages/playground-utils/desktop_playground-utils_ksaolaji.po summit/messages/playground-utils/ksaolaji.desktop.po move summit/messages/playground-utils/desktop_playground-utils_ksecrets.po summit/messages/playground-utils/ksecrets.desktop.po move summit/messages/playground-utils/desktop_playground-utils_kvkbd.po summit/messages/playground-utils/kvkbd.desktop.po move summit/messages/playground-utils/desktop_playground-utils_notificationsurvey.po summit/messages/playground-utils/notificationsurvey.desktop.po move summit/messages/playground-utils/desktop_playground-utils.po summit/messages/playground-utils/playground-utils.desktop.po move summit/messages/qt/desktop_kdesupport-phonon_phonon-gstreamer.po summit/messages/qt/phonon-gstreamer.desktop.po move summit/messages/qt/desktop_kdesupport-phonon_phonon-vlc.po summit/messages/qt/phonon-vlc.desktop.po move summit/messages/qt/desktop_oxygen-icons.po summit/messages/qt/oxygen-icons.desktop.po move summit/messages/kde-workspace/plasma_shell_org.kde.desktop.po summit/messages/kde-workspace/plasma_shell_org.kde__desktop.po move summit/docmessages/kdereview/kbibtex.po summit/docmessages/extragear-office/kbibtex.po move summit/docmessages/kdereview/kbibtex_man-kbibtex.1.po summit/docmessages/extragear-office/kbibtex_man-kbibtex.1.po move summit/messages/kdereview/kde5-nm-connection-editor.po summit/messages/kde-workspace/kde5-nm-connection-editor.po move summit/messages/kdereview/libplasmanm_editor.po summit/messages/kde-workspace/libplasmanm_editor.po move summit/messages/kdereview/plasma-nm.desktop.po summit/messages/kde-workspace/plasma-nm.desktop.po move summit/messages/kdereview/plasma_applet_org.kde.plasma.networkmanagement.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.networkmanagement.po move summit/messages/kdereview/plasmanetworkmanagement-kded.po summit/messages/kde-workspace/plasmanetworkmanagement-kded.po move summit/messages/kdereview/plasmanetworkmanagement_l2tpui.po summit/messages/kde-workspace/plasmanetworkmanagement_l2tpui.po move summit/messages/kdereview/plasmanetworkmanagement_openconnectui.po summit/messages/kde-workspace/plasmanetworkmanagement_openconnectui.po move summit/messages/kdereview/plasmanetworkmanagement_openswanui.po summit/messages/kde-workspace/plasmanetworkmanagement_openswanui.po move summit/messages/kdereview/plasmanetworkmanagement_openvpnui.po summit/messages/kde-workspace/plasmanetworkmanagement_openvpnui.po move summit/messages/kdereview/plasmanetworkmanagement_pptpui.po summit/messages/kde-workspace/plasmanetworkmanagement_pptpui.po move summit/messages/kdereview/plasmanetworkmanagement_strongswanui.po summit/messages/kde-workspace/plasmanetworkmanagement_strongswanui.po move summit/messages/kdereview/plasmanetworkmanagement_vpncui.po summit/messages/kde-workspace/plasmanetworkmanagement_vpncui.po move summit/messages/applications/kate.desktop.po summit/messages/frameworks/kate.desktop.po move summit/messages/applications/katepart4.po summit/messages/frameworks/katepart4.po move summit/messages/kde-runtime/kde-runtime.desktop.po summit/messages/frameworks/kde-runtime.desktop.po move summit/messages/kde-runtime/kdebugdialog.po summit/messages/frameworks/kdebugdialog.po move summit/messages/kde-runtime/kdesud.po summit/messages/frameworks/kdesud.po move summit/messages/kde-runtime/kquitapp.po summit/messages/frameworks/kquitapp.po move summit/messages/kde-runtime/kshorturifilter.po summit/messages/frameworks/kshorturifilter.po move summit/messages/kde-runtime/kurifilter.po summit/messages/frameworks/kurifilter.po move summit/messages/kde-runtime/kwalletd.po summit/messages/frameworks/kwalletd.po move summit/messages/kde-runtime/plasmapkg.po summit/messages/frameworks/plasmapkg.po move summit/docmessages/kde-runtime/kcontrol_kcm_ssl.po summit/docmessages/frameworks/kcontrol_kcm_ssl.po move summit/docmessages/kde-runtime/kdebugdialog.po summit/docmessages/frameworks/kdebugdialog.po move summit/docmessages/kde-runtime/plasmapkg_man-plasmapkg.1.po summit/docmessages/frameworks/plasmapkg_man-plasmapkg.1.po move summit/messages/applications/kate.desktop.po summit/messages/frameworks/kate.desktop.po move summit/messages/applications/katepart4.po summit/messages/frameworks/katepart4.po move summit/messages/kde-runtime/kde-runtime.desktop.po summit/messages/frameworks/kde-runtime.desktop.po move summit/messages/kde-runtime/kdebugdialog.po summit/messages/frameworks/kdebugdialog.po move summit/messages/kde-runtime/kdesud.po summit/messages/frameworks/kdesud.po move summit/messages/kde-runtime/kquitapp.po summit/messages/frameworks/kquitapp.po move summit/messages/kde-runtime/kshorturifilter.po summit/messages/frameworks/kshorturifilter.po move summit/messages/kde-runtime/kurifilter.po summit/messages/frameworks/kurifilter.po move summit/messages/kde-runtime/kwalletd.po summit/messages/frameworks/kwalletd.po move summit/messages/kde-runtime/plasmapkg.po summit/messages/frameworks/plasmapkg.po move summit/messages/playground-network/kde-nm-connection-editor.po summit/messages/extragear-base/kde-nm-connection-editor.po move summit/messages/playground-network/libplasmanetworkmanagement-editor.po summit/messages/extragear-base/libplasmanetworkmanagement-editor.po move summit/messages/playground-network/plasma_applet_org.kde.networkmanagement.po summit/messages/extragear-base/plasma_applet_org.kde.networkmanagement.po move summit/docmessages/kde-runtime/kcontrol_kcm_ssl.po summit/docmessages/frameworks/kcontrol_kcm_ssl.po move summit/docmessages/kde-runtime/kdebugdialog.po summit/docmessages/frameworks/kdebugdialog.po move summit/docmessages/kde-runtime/plasmapkg_man-plasmapkg.1.po summit/docmessages/frameworks/plasmapkg_man-plasmapkg.1.po copy summit/messages/extragear-base/wacomtablet.po summit/messages/extragear-base/plasma_applet_tabletsettings.po copy summit/messages/kdepim-runtime/akonadi_imap_resource.po summit/messages/kdepim-runtime/akonadi_gmail_resource.po move summit/messages/kdereview/SymbolEditor.po summit/messages/extragear-graphics/SymbolEditor.po move summit/messages/kdereview/kxstitch.desktop.po summit/messages/extragear-graphics/kxstitch.desktop.po move summit/messages/kdereview/kxstitch.po summit/messages/extragear-graphics/kxstitch.po move summit/messages/kdereview/symboleditor.desktop.po summit/messages/extragear-graphics/symboleditor.desktop.po move summit/docmessages/kdereview/SymbolEditor.po summit/docmessages/extragear-graphics/SymbolEditor.po move summit/docmessages/kdereview/SymbolEditor_commands.po summit/docmessages/extragear-graphics/SymbolEditor_commands.po move summit/docmessages/kdereview/SymbolEditor_credits.po summit/docmessages/extragear-graphics/SymbolEditor_credits.po move summit/docmessages/kdereview/SymbolEditor_dialogs.po summit/docmessages/extragear-graphics/SymbolEditor_dialogs.po move summit/docmessages/kdereview/SymbolEditor_introduction.po summit/docmessages/extragear-graphics/SymbolEditor_introduction.po move summit/docmessages/kdereview/SymbolEditor_symbols.po summit/docmessages/extragear-graphics/SymbolEditor_symbols.po move summit/docmessages/kdereview/SymbolEditor_ui.po summit/docmessages/extragear-graphics/SymbolEditor_ui.po move summit/docmessages/kdereview/kxstitch.po summit/docmessages/extragear-graphics/kxstitch.po move summit/docmessages/kdereview/kxstitch_commands.po summit/docmessages/extragear-graphics/kxstitch_commands.po move summit/docmessages/kdereview/kxstitch_credits.po summit/docmessages/extragear-graphics/kxstitch_credits.po move summit/docmessages/kdereview/kxstitch_dialogs.po summit/docmessages/extragear-graphics/kxstitch_dialogs.po move summit/docmessages/kdereview/kxstitch_faq.po summit/docmessages/extragear-graphics/kxstitch_faq.po move summit/docmessages/kdereview/kxstitch_features.po summit/docmessages/extragear-graphics/kxstitch_features.po move summit/docmessages/kdereview/kxstitch_install.po summit/docmessages/extragear-graphics/kxstitch_install.po move summit/docmessages/kdereview/kxstitch_introduction.po summit/docmessages/extragear-graphics/kxstitch_introduction.po move summit/docmessages/kdereview/kxstitch_man-kxstitch.1.po summit/docmessages/extragear-graphics/kxstitch_man-kxstitch.1.po move summit/docmessages/kdereview/kxstitch_patterns.po summit/docmessages/extragear-graphics/kxstitch_patterns.po move summit/docmessages/kdereview/kxstitch_printing.po summit/docmessages/extragear-graphics/kxstitch_printing.po move summit/docmessages/kdereview/kxstitch_ui.po summit/docmessages/extragear-graphics/kxstitch_ui.po move summit/messages/kdereview/kronometer.desktop.po summit/messages/extragear-utils/kronometer.desktop.po move summit/messages/kdereview/kronometer.po summit/messages/extragear-utils/kronometer.po move summit/docmessages/kdereview/kronometer.po summit/docmessages/extragear-utils/kronometer.po move summit/messages/applications/useraccount.po summit/messages/kde-workspace/useraccount.po move summit/messages/kdepimlibs/libkxmlrpcclient.po summit/messages/kde-workspace/libkxmlrpcclient.po delete summit/messages/kde-workspace/plasma_toolbox_org.kde.desktoptoolbox.po # Summit catalogs left behind on 4.14->4.15 switch, 2014-07-16. delete summit/messages/kdelibs/kactivitymanagerd_plugin_globalshortcuts.po delete summit/messages/kdeedu/kanagram-active.po delete summit/messages/kdeedu/kanagram-engine.po delete summit/messages/kdeedu/kanagram-harmattan.po delete summit/messages/extragear-multimedia/kplayer.desktop.po delete summit/messages/extragear-multimedia/kplayer.po delete summit/docmessages/extragear-multimedia/kplayer.po delete summit/docmessages/extragear-multimedia/kplayer_basics.po delete summit/docmessages/extragear-multimedia/kplayer_commands.po delete summit/docmessages/extragear-multimedia/kplayer_configuration.po delete summit/docmessages/extragear-multimedia/kplayer_introduction.po delete summit/docmessages/extragear-multimedia/kplayer_properties.po delete summit/docmessages/extragear-multimedia/kplayer_settings.po delete summit/messages/playground-base/plasma_applet_recentappdocuments.po move summit/messages/applications/kcmkurifilt.po summit/messages/frameworks/kcmkurifilt.po delete summit/messages/playground-libs/playground-libs.desktop.po move summit/messages/www/okular_www.po summit/messages/www/okular-kde-org_www.po move summit/messages/www/edu_www.po summit/messages/www/edu-kde-org_www.po move summit/messages/kde-workspace/balooctl.po summit/messages/kdelibs/balooctl.po move summit/messages/calligra/okular_odt.po summit/messages/calligra/okularGenerator_odt.po move summit/messages/kdelibs/balooctl.po summit/messages/kde-workspace/balooctl.po delete summit/messages/calligra/keximigrate_spreadsheet.po delete summit/messages/calligra/keximysqldriver.po delete summit/messages/calligra/kexipostgresqldriver.po delete summit/messages/calligra/kexisybasedriver.po delete summit/messages/playground-base/org.kde.kdecorationviewer.po move summit/messages/kdeplasma-addons/kdeplasma-addons.desktop.po summit/messages/kde-workspace/kdeplasma-addons.desktop.po move summit/messages/kdeplasma-addons/konqprofiles.po summit/messages/kde-workspace/konqprofiles.po move summit/messages/kdeplasma-addons/konsoleprofiles.po summit/messages/kde-workspace/konsoleprofiles.po move summit/messages/kdeplasma-addons/lancelot.po summit/messages/kde-workspace/lancelot.po move summit/messages/kdeplasma-addons/liblancelot-datamodels.po summit/messages/kde-workspace/liblancelot-datamodels.po move summit/messages/kdeplasma-addons/libplasma_groupingcontainment.po summit/messages/kde-workspace/libplasma_groupingcontainment.po move summit/messages/kdeplasma-addons/libplasmaweather.po summit/messages/kde-workspace/libplasmaweather.po move summit/messages/kdeplasma-addons/plasma_applet_CharSelectApplet.po summit/messages/kde-workspace/plasma_applet_CharSelectApplet.po move summit/messages/kdeplasma-addons/plasma_applet_binaryclock.po summit/messages/kde-workspace/plasma_applet_binaryclock.po move summit/messages/kdeplasma-addons/plasma_applet_bookmarks.po summit/messages/kde-workspace/plasma_applet_bookmarks.po move summit/messages/kdeplasma-addons/plasma_applet_bubblemon.po summit/messages/kde-workspace/plasma_applet_bubblemon.po move summit/messages/kdeplasma-addons/plasma_applet_calculator.po summit/messages/kde-workspace/plasma_applet_calculator.po move summit/messages/kdeplasma-addons/plasma_applet_comic.po summit/messages/kde-workspace/plasma_applet_comic.po move summit/messages/kdeplasma-addons/plasma_applet_fifteenPuzzle.po summit/messages/kde-workspace/plasma_applet_fifteenPuzzle.po move summit/messages/kdeplasma-addons/plasma_applet_fileWatcher.po summit/messages/kde-workspace/plasma_applet_fileWatcher.po move summit/messages/kdeplasma-addons/plasma_applet_frame.po summit/messages/kde-workspace/plasma_applet_frame.po move summit/messages/kdeplasma-addons/plasma_applet_fuzzy_clock.po summit/messages/kde-workspace/plasma_applet_fuzzy_clock.po move summit/messages/kdeplasma-addons/plasma_applet_groupingpanel.po summit/messages/kde-workspace/plasma_applet_groupingpanel.po move summit/messages/kdeplasma-addons/plasma_applet_icontasks.po summit/messages/kde-workspace/plasma_applet_icontasks.po move summit/messages/kdeplasma-addons/plasma_applet_incomingmsg.po summit/messages/kde-workspace/plasma_applet_incomingmsg.po move summit/messages/kdeplasma-addons/plasma_applet_kdeobservatory.po summit/messages/kde-workspace/plasma_applet_kdeobservatory.po move summit/messages/kdeplasma-addons/plasma_applet_kimpanel.po summit/messages/kde-workspace/plasma_applet_kimpanel.po move summit/messages/kdeplasma-addons/plasma_applet_knowledgebase.po summit/messages/kde-workspace/plasma_applet_knowledgebase.po move summit/messages/kdeplasma-addons/plasma_applet_kolourpicker.po summit/messages/kde-workspace/plasma_applet_kolourpicker.po move summit/messages/kdeplasma-addons/plasma_applet_leavenote.po summit/messages/kde-workspace/plasma_applet_leavenote.po move summit/messages/kdeplasma-addons/plasma_applet_life.po summit/messages/kde-workspace/plasma_applet_life.po move summit/messages/kdeplasma-addons/plasma_applet_luna.po summit/messages/kde-workspace/plasma_applet_luna.po move summit/messages/kdeplasma-addons/plasma_applet_magnifique.po summit/messages/kde-workspace/plasma_applet_magnifique.po move summit/messages/kdeplasma-addons/plasma_applet_microblog.po summit/messages/kde-workspace/plasma_applet_microblog.po move summit/messages/kdeplasma-addons/plasma_applet_news.po summit/messages/kde-workspace/plasma_applet_news.po move summit/messages/kdeplasma-addons/plasma_applet_notes.po summit/messages/kde-workspace/plasma_applet_notes.po move summit/messages/kdeplasma-addons/plasma_applet_nowplaying.po summit/messages/kde-workspace/plasma_applet_nowplaying.po move summit/messages/kdeplasma-addons/plasma_applet_opendesktop.po summit/messages/kde-workspace/plasma_applet_opendesktop.po move summit/messages/kdeplasma-addons/plasma_applet_opendesktop_activities.po summit/messages/kde-workspace/plasma_applet_opendesktop_activities.po move summit/messages/kdeplasma-addons/plasma_applet_org.kde.plasma.quickshare.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.quickshare.po move summit/messages/kdeplasma-addons/plasma_applet_paste.po summit/messages/kde-workspace/plasma_applet_paste.po move summit/messages/kdeplasma-addons/plasma_applet_pastebin.po summit/messages/kde-workspace/plasma_applet_pastebin.po move summit/messages/kdeplasma-addons/plasma_applet_plasmaboard.po summit/messages/kde-workspace/plasma_applet_plasmaboard.po move summit/messages/kdeplasma-addons/plasma_applet_previewer.po summit/messages/kde-workspace/plasma_applet_previewer.po move summit/messages/kdeplasma-addons/plasma_applet_qalculate.po summit/messages/kde-workspace/plasma_applet_qalculate.po move summit/messages/kdeplasma-addons/plasma_applet_qstardict.po summit/messages/kde-workspace/plasma_applet_qstardict.po move summit/messages/kdeplasma-addons/plasma_applet_rssnow.po summit/messages/kde-workspace/plasma_applet_rssnow.po move summit/messages/kdeplasma-addons/plasma_applet_rtm.po summit/messages/kde-workspace/plasma_applet_rtm.po move summit/messages/kdeplasma-addons/plasma_applet_showdashboard.po summit/messages/kde-workspace/plasma_applet_showdashboard.po move summit/messages/kdeplasma-addons/plasma_applet_showdesktop.po summit/messages/kde-workspace/plasma_applet_showdesktop.po move summit/messages/kdeplasma-addons/plasma_applet_spellcheck.po summit/messages/kde-workspace/plasma_applet_spellcheck.po move summit/messages/kdeplasma-addons/plasma_applet_systemloadviewer.po summit/messages/kde-workspace/plasma_applet_systemloadviewer.po move summit/messages/kdeplasma-addons/plasma_applet_timer.po summit/messages/kde-workspace/plasma_applet_timer.po move summit/messages/kdeplasma-addons/plasma_applet_unitconverter.po summit/messages/kde-workspace/plasma_applet_unitconverter.po move summit/messages/kdeplasma-addons/plasma_applet_weather.po summit/messages/kde-workspace/plasma_applet_weather.po move summit/messages/kdeplasma-addons/plasma_applet_weatherstation.po summit/messages/kde-workspace/plasma_applet_weatherstation.po move summit/messages/kdeplasma-addons/plasma_applet_webslice.po summit/messages/kde-workspace/plasma_applet_webslice.po move summit/messages/kdeplasma-addons/plasma_engine_kdeobservatory.po summit/messages/kde-workspace/plasma_engine_kdeobservatory.po move summit/messages/kdeplasma-addons/plasma_packagestructure_comic.po summit/messages/kde-workspace/plasma_packagestructure_comic.po move summit/messages/kdeplasma-addons/plasma_runner_CharacterRunner.po summit/messages/kde-workspace/plasma_runner_CharacterRunner.po move summit/messages/kdeplasma-addons/plasma_runner_audioplayercontrol.po summit/messages/kde-workspace/plasma_runner_audioplayercontrol.po move summit/messages/kdeplasma-addons/plasma_runner_browserhistory.po summit/messages/kde-workspace/plasma_runner_browserhistory.po move summit/messages/kdeplasma-addons/plasma_runner_contacts.po summit/messages/kde-workspace/plasma_runner_contacts.po move summit/messages/kdeplasma-addons/plasma_runner_converterrunner.po summit/messages/kde-workspace/plasma_runner_converterrunner.po move summit/messages/kdeplasma-addons/plasma_runner_datetime.po summit/messages/kde-workspace/plasma_runner_datetime.po move summit/messages/kdeplasma-addons/plasma_runner_events.po summit/messages/kde-workspace/plasma_runner_events.po move summit/messages/kdeplasma-addons/plasma_runner_katesessions.po summit/messages/kde-workspace/plasma_runner_katesessions.po move summit/messages/kdeplasma-addons/plasma_runner_konquerorsessions.po summit/messages/kde-workspace/plasma_runner_konquerorsessions.po move summit/messages/kdeplasma-addons/plasma_runner_konsolesessions.po summit/messages/kde-workspace/plasma_runner_konsolesessions.po move summit/messages/kdeplasma-addons/plasma_runner_kopete.po summit/messages/kde-workspace/plasma_runner_kopete.po move summit/messages/kdeplasma-addons/plasma_runner_krunner_dictionary.po summit/messages/kde-workspace/plasma_runner_krunner_dictionary.po move summit/messages/kdeplasma-addons/plasma_runner_mediawiki.po summit/messages/kde-workspace/plasma_runner_mediawiki.po move summit/messages/kdeplasma-addons/plasma_runner_spellcheckrunner.po summit/messages/kde-workspace/plasma_runner_spellcheckrunner.po move summit/messages/kdeplasma-addons/plasma_runner_translator.po summit/messages/kde-workspace/plasma_runner_translator.po move summit/messages/kdeplasma-addons/plasma_runner_youtube.po summit/messages/kde-workspace/plasma_runner_youtube.po move summit/messages/kde-workspace/libkonq.po summit/messages/applications/libkonq.po move summit/messages/extragear-base/kde-gtk-config.desktop.po summit/messages/kde-workspace/kde-gtk-config.desktop.po move summit/messages/extragear-base/kde-gtk-config.po summit/messages/kde-workspace/kde-gtk-config.po move summit/messages/kde-runtime/kio_trash.po summit/messages/frameworks/kio_trash.po move summit/messages/extragear-sysadmin/libmuon.po summit/messages/kde-workspace/libmuon.po move summit/messages/extragear-sysadmin/muon-discover.po summit/messages/kde-workspace/muon-discover.po move summit/messages/extragear-sysadmin/muon-installer.po summit/messages/kde-workspace/muon-installer.po move summit/messages/extragear-sysadmin/muon-updater.po summit/messages/kde-workspace/muon-updater.po move summit/messages/extragear-sysadmin/muon.desktop.po summit/messages/kde-workspace/muon.desktop.po move summit/messages/extragear-sysadmin/muon.po summit/messages/kde-workspace/muon.po delete summit/messages/playground-games/gluonplayer-desktop.po delete summit/messages/playground-games/kpeg.po move summit/messages/frameworks/kcmkurifilt.po summit/messages/applications/kcmkurifilt.po move summit/messages/frameworks/kio_trash.po summit/messages/kde-runtime/kio_trash.po move summit/messages/frameworks/kshorturifilter.po summit/messages/kde-runtime/kshorturifilter.po move summit/messages/frameworks/kurifilter.po summit/messages/kde-runtime/kurifilter.po # Summit catalogs left behind on 4.14->14.12 switch, 2014-11-02. delete summit/messages/applications/katehelloworld.po delete summit/messages/applications/katetabbarextension.po delete summit/messages/applications/katetabifyplugin.po delete summit/messages/applications/ktexteditor_plugins.po delete summit/messages/kdeedu/analitza.po delete summit/messages/kdesdk/okteta-mobile.po delete summit/docmessages/applications/kate_configuring-part.po delete summit/docmessages/applications/kate_highlighting.po delete summit/docmessages/applications/kate_plugins-part.po move summit/messages/kdeedu/libkdeedu.po summit/messages/kdeedu/libkeduvocdocument.po delete summit/messages/kdepim/Kjots.appdata.po move summit/messages/extragear-network/plasma-engine-kmldonkey.po summit/messages/extragear-network/plasma_engine_kmldonkey.po # renamed files in calligra master (2014-11-22) move summit/messages/calligra/ArtisticTextShape.po summit/messages/calligra/calligra_shape_artistictext.po move summit/messages/calligra/AutocorrectPlugin.po summit/messages/calligra/calligra_textediting_autocorrect.po move summit/messages/calligra/CalendarTool.po summit/messages/calligra/sheetscalendartool.po move summit/messages/calligra/ChangecasePlugin.po summit/messages/calligra/calligra_textediting_changecase.po move summit/messages/calligra/ChartShape.po summit/messages/calligra/calligra_shape_chart.po move summit/messages/calligra/CommentShape.po summit/messages/calligra/calligra_shape_comment.po move summit/messages/calligra/FormulaShape.po summit/messages/calligra/calligra_shape_formular.po move summit/messages/calligra/MusicShape.po summit/messages/calligra/calligra_shape_music.po move summit/messages/calligra/PathShapes.po summit/messages/calligra/calligra_shape_paths.po move summit/messages/calligra/PictureShape.po summit/messages/calligra/calligra_shape_picture.po move summit/messages/calligra/PluginShape.po summit/messages/calligra/calligra_shape_plugin.po move summit/messages/calligra/sheetspivottables_plugin.po summit/messages/calligra/sheetspivottables.po move summit/messages/calligra/SpellCheckPlugin.po summit/messages/calligra/calligra_textediting_spellcheck.po move summit/messages/calligra/TableShape.po summit/messages/calligra/calligra_shape_spreadsheet.po move summit/messages/calligra/TemplateShape.po summit/messages/calligra/calligra_shape_template.po move summit/messages/calligra/TextShape.po summit/messages/calligra/calligra_shape_text.po move summit/messages/calligra/thesaurus_tool.po summit/messages/calligra/calligra_textediting_thesaurus.po move summit/messages/calligra/ThreedShape.po summit/messages/calligra/calligra_shape_threed.po move summit/messages/calligra/VariablesPlugin.po summit/messages/calligra/calligra_textinlineobject_variables.po move summit/messages/calligra/VectorShape.po summit/messages/calligra/calligra_shape_vector.po move summit/messages/calligra/VideoShape.po summit/messages/calligra/calligra_shape_video.po merge summit/messages/extragear-sysadmin/partitionmanager.appdata.po summit/messages/extragear-sysadmin/org.kde.PartitionManager.appdata.po merge summit/messages/kdeedu/kbruch.appdata.po summit/messages/kdeedu/org.kde.kbruch.appdata.po merge summit/messages/kdetoys/kteatime.appdata.po summit/messages/kdetoys/org.kde.kteatime.appdata.po move summit/messages/playground-base/kaccounts-integration.desktop.po summit/messages/kdereview/kaccounts-integration.desktop.po move summit/messages/playground-base/kaccounts-integration.po summit/messages/kdereview/kaccounts-integration.po move summit/messages/playground-base/kaccounts-providers.po summit/messages/kdereview/kaccounts-providers.po copy summit/messages/frameworks/plasmapkg.po summit/messages/kdereview/libkpackage5.po copy summit/messages/frameworks/plasma-framework.desktop.po summit/messages/kdereview/kpackage.desktop.po move summit/messages/kde-runtime/kio_trash.po summit/messages/frameworks/kio_trash.po move summit/messages/kdepimlibs/libkpimutils.po summit/messages/frameworks/libkpimutils.po move summit/messages/kde-runtime/kshorturifilter.po summit/messages/frameworks/kshorturifilter.po move summit/messages/kde-runtime/kurifilter.po summit/messages/frameworks/kurifilter.po move summit/messages/kde-runtime/kioexec.po summit/messages/frameworks/kioexec.po move summit/messages/playground-base/kio_mtp.po summit/messages/kde-workspace/kio_mtp.po # kdepimlibs split, phase #1 move summit/messages/kdepimlibs/kontactinterfaces.po summit/messages/pim/kontactinterfaces.po move summit/messages/kdepimlibs/libkalarmcal.po summit/messages/pim/libkalarmcal.po move summit/messages/kdepimlibs/libkblog.po summit/messages/pim/libkblog.po move summit/messages/kdepimlibs/libkcalutils.po summit/messages/pim/libkcalutils.po move summit/messages/kdepimlibs/libkholidays.po summit/messages/pim/libkholidays.po move summit/messages/kdepimlibs/libkimap.po summit/messages/pim/libkimap.po move summit/messages/kdepimlibs/libkldap.po summit/messages/pim/libkldap.po move summit/messages/kdepimlibs/libkmime.po summit/messages/pim/libkmime.po move summit/messages/kdepimlibs/libkpimidentities.po summit/messages/pim/libkpimidentities.po move summit/messages/kdepimlibs/libkpimtextedit.po summit/messages/pim/libkpimtextedit.po move summit/messages/kdepimlibs/libktnef.po summit/messages/pim/libktnef.po move summit/messages/kdepimlibs/libmailtransport.po summit/messages/pim/libmailtransport.po copy summit/messages/kdepimlibs/kdepimlibs.desktop.po summit/messages/pim/kontactinterface.desktop.po copy summit/messages/kdepimlibs/kdepimlibs.desktop.po summit/messages/pim/kmailtransport.desktop.po move summit/messages/kdepimlibs/kabc.po summit/messages/pim/kabc.po move summit/messages/kdereview/kcm_sddm.po summit/messages/kde-workspace/kcm_sddm.po move summit/messages/kdereview/sddm-kcm.desktop.po summit/messages/kde-workspace/sddm-kcm.desktop.po move summit/messages/pim/mailtransport.desktop.po summit/messages/pim/kmailtransport.desktop.po # kdepimlibs split, phase 1a move summit/messages/kdepimlibs/libakonadi-calendar5.po summit/messages/pim/libakonadi-calendar5.po move summit/messages/applications/kcmkio.po summit/messages/frameworks/kcmkio.po move summit/messages/applications/kde-baseapps.desktop.po summit/messages/frameworks/kde-baseapps.desktop.po move summit/messages/playground-base/user-manager.desktop.po summit/messages/kdereview/user-manager.desktop.po move summit/messages/playground-base/user_manager.po summit/messages/kdereview/user_manager.po move summit/messages/playground-utils/kcm-touchpad.desktop.po summit/messages/kdereview/kcm-touchpad.desktop.po move summit/messages/playground-utils/kcm_touchpad.po summit/messages/kdereview/kcm_touchpad.po move summit/messages/playground-utils/plasma_applet_touchpad.po summit/messages/kdereview/plasma_applet_touchpad.po move summit/messages/kdereview/kpackage.desktop.po summit/messages/frameworks/kpackage.desktop.po merge summit/messages/kde-runtime/libkpackage5.po summit/messages/frameworks/plasmapkg.po merge summit/messages/kdereview/libkpackage5.po summit/messages/frameworks/plasmapkg.po move summit/messages/frameworks/kio_help5.po summit/messages/frameworks/kdoctools5.po move summit/messages/kdelibs/baloo_queryparser.po summit/messages/kdelibs/baloo_naturalqueryparser.po move summit/messages/extragear-base/polkit-kde-agent-1.desktop.po summit/messages/kde-workspace/polkit-kde-agent-1.desktop.po move summit/messages/extragear-base/polkit-kde-authentication-agent-1.po summit/messages/kde-workspace/polkit-kde-authentication-agent-1.po move summit/messages/kde-runtime/kglobalaccel.po summit/messages/frameworks/kglobalaccel.po move summit/messages/kde-workspace/plasma-workspace.desktop.po summit/messages/frameworks/plasma-workspace.desktop.po move summit/messages/extragear-base/bluedevil.desktop.po summit/messages/kde-workspace/bluedevil.desktop.po move summit/messages/extragear-base/bluedevil.po summit/messages/kde-workspace/bluedevil.po move summit/messages/extragear-base/bluedevil_xml_mimetypes.po summit/messages/kde-workspace/bluedevil_xml_mimetypes.po move summit/messages/extragear-base/kcm_displayconfiguration.po summit/messages/kde-workspace/kcm_displayconfiguration.po move summit/messages/extragear-base/kscreen.desktop.po summit/messages/kde-workspace/kscreen.desktop.po move summit/messages/extragear-base/kscreen.po summit/messages/kde-workspace/kscreen.po move summit/messages/extragear-base/plasma_applet_org.kde.plasma.kscreen.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.kscreen.po move summit/messages/kdereview/kcm-touchpad.desktop.po summit/messages/kde-workspace/kcm-touchpad.desktop.po move summit/messages/kdereview/kcm_touchpad.po summit/messages/kde-workspace/kcm_touchpad.po move summit/messages/kdereview/plasma_applet_touchpad.po summit/messages/kde-workspace/plasma_applet_touchpad.po move summit/messages/kdereview/user-manager.desktop.po summit/messages/kde-workspace/user-manager.desktop.po move summit/messages/kdereview/user_manager.po summit/messages/kde-workspace/user_manager.po merge summit/messages/playground-devtools/kdev-clang.desktop.po summit/messages/extragear-kdevelop/kdevelop.desktop.po move summit/messages/playground-edu/gcompris_qt.po summit/messages/kdereview/gcompris_qt.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kcmutils.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kconfig.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kded.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kdelibs4support.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kemoticons.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/khtml.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kio.desktop.po mergekeep summit/messages/frameworks/kde-baseapps.desktop.po summit/messages/frameworks/kio.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/knotifyconfig.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kparts.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kservice.desktop.po copy summit/messages/kdelibs/kdelibs.desktop.po summit/messages/frameworks/kxmlgui.desktop.po delete summit/messages/kdelibs/kdelibs.desktop.po delete summit/messages/frameworks/kde-baseapps.desktop.po move summit/messages/kdelibs/kactivities.desktop.po summit/messages/frameworks/kactivities.desktop.po move summit/messages/kdelibs/kcm_activities.po summit/messages/frameworks/kcm_activities.po move summit/messages/kdelibs/kdecalendarsystems.po summit/messages/frameworks/kdecalendarsystems.po move summit/messages/kdelibs/kdelibs_colors4.po summit/messages/frameworks/kdelibs_colors4.po move summit/messages/kdelibs/kdelibs4.po summit/messages/frameworks/kdelibs4.po move summit/messages/kdelibs/kio4.po summit/messages/frameworks/kio4.po move summit/messages/kdelibs/l10n.desktop.po summit/messages/frameworks/l10n.desktop.po move summit/messages/kdelibs/libkunitconversion.po summit/messages/frameworks/libkunitconversion.po move summit/messages/kdelibs/solid_qt.po summit/messages/frameworks/solid_qt.po move summit/messages/kdelibs/timezones4.po summit/messages/frameworks/timezones4.po move summit/docmessages/kdelibs/checkXML_man-checkXML.1.po summit/docmessages/frameworks/checkXML_man-checkXML.1.po move summit/docmessages/kdelibs/kbuildsycoca4_man-kbuildsycoca4.8.po summit/docmessages/frameworks/kbuildsycoca4_man-kbuildsycoca4.8.po move summit/docmessages/kdelibs/kcookiejar4_man-kcookiejar4.8.po summit/docmessages/frameworks/kcookiejar4_man-kcookiejar4.8.po move summit/docmessages/kdelibs/kde4-config_man-kde4-config.1.po summit/docmessages/frameworks/kde4-config_man-kde4-config.1.po move summit/docmessages/kdelibs/kded4_man-kded4.8.po summit/docmessages/frameworks/kded4_man-kded4.8.po move summit/docmessages/kdelibs/kdeinit4_man-kdeinit4.8.po summit/docmessages/frameworks/kdeinit4_man-kdeinit4.8.po move summit/docmessages/kdelibs/kdeoptions_man-kdeoptions.7.po summit/docmessages/frameworks/kdeoptions_man-kdeoptions.7.po move summit/docmessages/kdelibs/kioslave_data.po summit/docmessages/frameworks/kioslave_data.po move summit/docmessages/kdelibs/kioslave_file.po summit/docmessages/frameworks/kioslave_file.po move summit/docmessages/kdelibs/kioslave_ftp.po summit/docmessages/frameworks/kioslave_ftp.po move summit/docmessages/kdelibs/kioslave_help.po summit/docmessages/frameworks/kioslave_help.po move summit/docmessages/kdelibs/kioslave_http.po summit/docmessages/frameworks/kioslave_http.po move summit/docmessages/kdelibs/kioslave_mailto.po summit/docmessages/frameworks/kioslave_mailto.po move summit/docmessages/kdelibs/kioslave_telnet.po summit/docmessages/frameworks/kioslave_telnet.po move summit/docmessages/kdelibs/kioslave_webdav.po summit/docmessages/frameworks/kioslave_webdav.po move summit/docmessages/kdelibs/kjscmd_man-kjscmd.1.po summit/docmessages/frameworks/kjscmd_man-kjscmd.1.po move summit/docmessages/kdelibs/kross_man-kross.1.po summit/docmessages/frameworks/kross_man-kross.1.po move summit/docmessages/kdelibs/makekdewidgets_man-makekdewidgets.1.po summit/docmessages/frameworks/makekdewidgets_man-makekdewidgets.1.po move summit/docmessages/kdelibs/meinproc4_man-meinproc4.8.po summit/docmessages/frameworks/meinproc4_man-meinproc4.8.po move summit/docmessages/kdelibs/preparetips_man-preparetips.1.po summit/docmessages/frameworks/preparetips_man-preparetips.1.po move summit/docmessages/kdelibs/qtoptions_man-qtoptions.7.po summit/docmessages/frameworks/qtoptions_man-qtoptions.7.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kauth5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kdelibs4support.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kcmutils5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kcodecs5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kcompletion5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kconfigwidgets5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kcoreaddons5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kdeclarative5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kdesignerplugin5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kdnssd5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kglobalaccel5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/khtml5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/ki18n5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kinit5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kitemviews5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kjobwidgets5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kjsembed5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/knewstuff5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/knotifications5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/knotifyconfig5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kparts5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kpty5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kross5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kservice5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/ktextwidgets5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kwidgetsaddons5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kwindowsystem5_qt.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/kxmlgui5.po copy summit/messages/frameworks/kdelibs4.po summit/messages/frameworks/sonnet5_qt.po delete summit/messages/frameworks/kdelibs4.po mergekeep summit/messages/frameworks/kio4.po summit/messages/frameworks/kdelibs4support.po copy summit/messages/frameworks/kio4.po summit/messages/frameworks/kbookmarks5_qt.po copy summit/messages/frameworks/kio4.po summit/messages/frameworks/kiconthemes5.po copy summit/messages/frameworks/kio4.po summit/messages/frameworks/kio5.po delete summit/messages/frameworks/kio4.po merge summit/messages/frameworks/kdecalendarsystems.po summit/messages/frameworks/kdelibs4support.po merge summit/messages/frameworks/kdelibs_colors4.po summit/messages/frameworks/kdelibs4support.po merge summit/messages/frameworks/timezones4.po summit/messages/frameworks/kdelibs4support.po merge summit/messages/frameworks/kdebugdialog.po summit/messages/frameworks/kdelibs4support.po merge summit/messages/frameworks/kcmkio.po summit/messages/frameworks/kio5.po merge summit/messages/frameworks/kio_trash.po summit/messages/frameworks/kio5.po merge summit/messages/frameworks/kurifilter.po summit/messages/frameworks/kio5.po merge summit/messages/frameworks/kshorturifilter.po summit/messages/frameworks/kio5.po merge summit/messages/frameworks/kioexec.po summit/messages/frameworks/kio5.po mergekeep summit/messages/frameworks/libkpimutils.po summit/messages/frameworks/kcodecs5_qt.po move summit/messages/frameworks/libkpimutils.po summit/messages/kdepimlibs/libkpimutils.po copy summit/messages/kde-workspace/kwin_clients.po summit/messages/kde-workspace/breeze_kwin_deco.po copy summit/messages/kde-workspace/kwin_clients.po summit/messages/kde-workspace/oxygen_kwin_deco.po copy summit/messages/frameworks/kate.desktop.po summit/messages/frameworks/ktexteditor.desktop.po move summit/messages/frameworks/kate.desktop.po summit/messages/applications/kate.desktop.po copy summit/messages/applications/kate.po summit/messages/applications/katefiletree.po move summit/messages/frameworks/katepart4.po summit/messages/frameworks/ktexteditor5.po copy summit/messages/frameworks/kde-runtime.desktop.po summit/messages/frameworks/kwallet.desktop.po delete summit/messages/frameworks/kde-runtime.desktop.po move summit/messages/frameworks/plasma-workspace.desktop.po summit/messages/kde-workspace/plasma-workspace.desktop.po copy summit/messages/frameworks/plasma-workspace.desktop.po summit/messages/frameworks/kglobalaccel.desktop.po move summit/messages/frameworks/kglobalaccel.po summit/messages/frameworks/kglobalaccel5.po move summit/messages/kdepimlibs/akonadicontact.po summit/messages/kdepimlibs/akonadicontact5.po move summit/messages/kdepimlibs/akonadinotes.po summit/messages/kdepimlibs/akonadinotes5.po move summit/messages/pim/libakonadi-calendar.po summit/messages/pim/libakonadi-calendar5.po move summit/messages/kdepimlibs/libakonadi-kmime.po summit/messages/kdepimlibs/libakonadi-kmime5.po move summit/messages/kdepimlibs/libakonadi.po summit/messages/kdepimlibs/libakonadi5.po move summit/messages/pim/kabc.po summit/messages/pim/kcontacts5.po move summit/messages/pim/kontactinterfaces.po summit/messages/pim/kontactinterfaces5.po move summit/messages/pim/libkalarmcal.po summit/messages/pim/libkalarmcal5.po move summit/messages/pim/libkblog.po summit/messages/pim/libkblog5.po move summit/messages/pim/libkcalutils.po summit/messages/pim/libkcalutils5.po move summit/messages/pim/libkholidays.po summit/messages/pim/libkholidays5.po move summit/messages/pim/libkimap.po summit/messages/pim/libkimap5.po move summit/messages/pim/libkldap.po summit/messages/pim/libkldap5.po move summit/messages/pim/libkmime.po summit/messages/pim/libkmime5.po move summit/messages/pim/libkpimidentities.po summit/messages/pim/libkpimidentities5.po move summit/messages/pim/libktnef.po summit/messages/pim/libktnef5.po move summit/messages/kde-workspace/libkxmlrpcclient.po summit/messages/kde-workspace/libkxmlrpcclient5.po move summit/messages/pim/libmailtransport.po summit/messages/pim/libmailtransport5.po move summit/messages/kdelibs/kfileaudiopreview4.po summit/messages/kde-workspace/kfileaudiopreview5.po move summit/messages/frameworks/kcm_activities.po summit/messages/frameworks/kactivities5.po move summit/messages/frameworks/kquitapp.po summit/messages/frameworks/kdbusaddons5_qt.po move summit/messages/frameworks/kdesud.po summit/messages/frameworks/kdesud5.po move summit/messages/kde-runtime/kuiserver.po summit/messages/kde-runtime/kuiserver5.po move summit/messages/frameworks/libkunitconversion.po summit/messages/frameworks/kunitconversion5.po move summit/messages/frameworks/kwalletd.po summit/messages/frameworks/kwalletd5.po move summit/messages/frameworks/solid_qt.po summit/messages/frameworks/solid5_qt.po copy summit/messages/kde-workspace/kstyle_config.po summit/messages/kde-workspace/oxygen_style_config.po copy summit/messages/kde-workspace/kstyle_config.po summit/messages/kde-workspace/oxygen_style_demo.po delete summit/messages/kde-workspace/kstyle_config.po copy summit/messages/frameworks/plasmapkg.po summit/messages/frameworks/libkpackage5.po copy summit/messages/frameworks/plasmapkg.po summit/messages/frameworks/libplasma5.po delete summit/messages/frameworks/plasmapkg.po move summit/messages/kde-workspace/widgetexplorer.po summit/messages/kde-workspace/plasmashellprivateplugin.po move summit/messages/kde-workspace/libplasmanm_editor.po summit/messages/kde-workspace/plasmanetworkmanagement-libs.po move summit/messages/kde-workspace/plasma_engine_kuiserver.po summit/messages/kde-workspace/plasma_engine_applicationjobs.po move summit/messages/kde-workspace/plasma_shell_org.kde__desktop.po summit/messages/kde-workspace/plasma_shell_org.kde.plasma__desktop.po move summit/messages/kde-workspace/plasma_applet_calculator.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.calculator.po move summit/messages/kde-workspace/plasma_applet_fifteenPuzzle.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.fifteenpuzzle.po move summit/messages/kde-workspace/plasma_applet_folder.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.folder.po move summit/messages/kde-workspace/plasma_applet_fuzzy_clock.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.fuzzyclock.po move summit/messages/kde-workspace/plasma_applet_kicker.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.kicker.po move summit/messages/kde-workspace/plasma_applet_kickoff.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.kickoff.po move summit/messages/kde-workspace/plasma_applet_kimpanel.po summit/messages/kde-workspace/plasma_applet_org.kde.kimpanel.po move summit/messages/kde-workspace/plasma_applet_lockout.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.lock_logout.po move summit/messages/kde-workspace/plasma_applet_milou_applet.po summit/messages/kde-workspace/plasma_applet_org.kde.milou.po move summit/messages/kde-workspace/plasma_applet_notes.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.notes.po move summit/messages/kde-workspace/plasma_applet_showdesktop.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.showdesktop.po move summit/messages/kde-workspace/plasma_applet_systemloadviewer.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.systemloadviewer.po move summit/messages/kde-workspace/plasma_applet_tasks.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.taskmanager.po move summit/messages/kde-workspace/plasma_applet_timer.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.timer.po move summit/messages/kde-workspace/plasma_applet_trash.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.trash.po move summit/messages/kde-workspace/plasma_applet_windowlist.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.windowlist.po move summit/messages/kde-workspace/plasma_wallpaper_image.po summit/messages/kde-workspace/plasma_applet_org.kde.image.po move summit/messages/applications/plasma_applet_katesession.po summit/messages/applications/plasma_applet_org.kde.plasma.katesessions.po move summit/messages/kde-workspace/kfileaudiopreview5.po summit/messages/kdelibs/kfileaudiopreview5.po move summit/messages/frameworks/xml_mimetypes.po summit/messages/frameworks/xml_mimetypes5.po copy summit/docmessages/applications/kwrite.po summit/docmessages/applications/katepart.po move summit/docmessages/applications/kate_advanced.po summit/docmessages/applications/katepart_advanced.po move summit/docmessages/applications/kwrite_configuring.po summit/docmessages/applications/katepart_configuring.po copy summit/docmessages/applications/kate_development.po summit/docmessages/applications/katepart_development.po move summit/docmessages/applications/kwrite_fundamentals.po summit/docmessages/applications/katepart_fundamentals.po move summit/docmessages/applications/kwrite_menus.po summit/docmessages/applications/katepart_menus.po move summit/docmessages/applications/kate_part.po summit/docmessages/applications/katepart_part.po move summit/docmessages/applications/kate_regular-expressions.po summit/docmessages/applications/katepart_regular-expressions.po move summit/docmessages/applications/kate_vi.po summit/docmessages/applications/katepart_vi.po move summit/docmessages/frameworks/checkXML_man-checkXML.1.po summit/docmessages/frameworks/checkXML5_man-checkXML5.1.po move summit/docmessages/frameworks/kbuildsycoca4_man-kbuildsycoca4.8.po summit/docmessages/frameworks/kbuildsycoca5_man-kbuildsycoca5.8.po move summit/docmessages/frameworks/kcookiejar4_man-kcookiejar4.8.po summit/docmessages/frameworks/kcookiejar5_man-kcookiejar5.8.po move summit/docmessages/frameworks/kde4-config_man-kde4-config.1.po summit/docmessages/frameworks/kf5-config_man-kf5-config.1.po move summit/docmessages/frameworks/kdebugdialog.po summit/docmessages/frameworks/kdebugdialog5.po move summit/docmessages/frameworks/kded4_man-kded4.8.po summit/docmessages/frameworks/kded5_man-kded5.8.po move summit/docmessages/frameworks/kdeinit4_man-kdeinit4.8.po summit/docmessages/frameworks/kdeinit5_man-kdeinit5.8.po move summit/docmessages/frameworks/kdeoptions_man-kdeoptions.7.po summit/docmessages/frameworks/kf5options_man-kf5options.7.po move summit/docmessages/frameworks/kioslave_data.po summit/docmessages/frameworks/kioslave5_data.po move summit/docmessages/frameworks/kioslave_file.po summit/docmessages/frameworks/kioslave5_file.po move summit/docmessages/frameworks/kioslave_ftp.po summit/docmessages/frameworks/kioslave5_ftp.po copy summit/docmessages/frameworks/kioslave_help.po summit/docmessages/frameworks/kioslave5_help_documentationnotfound.po move summit/docmessages/frameworks/kioslave_help.po summit/docmessages/frameworks/kioslave5_help.po move summit/docmessages/frameworks/kioslave_http.po summit/docmessages/frameworks/kioslave5_http.po move summit/docmessages/frameworks/kioslave_mailto.po summit/docmessages/frameworks/kioslave5_mailto.po move summit/docmessages/frameworks/kioslave_telnet.po summit/docmessages/frameworks/kioslave5_telnet.po move summit/docmessages/frameworks/kioslave_webdav.po summit/docmessages/frameworks/kioslave5_webdav.po move summit/docmessages/frameworks/kjscmd_man-kjscmd.1.po summit/docmessages/frameworks/kjscmd5_man-kjscmd5.1.po move summit/docmessages/frameworks/kross_man-kross.1.po summit/docmessages/frameworks/kf5kross_man-kf5kross.1.po move summit/docmessages/frameworks/makekdewidgets_man-makekdewidgets.1.po summit/docmessages/frameworks/kgendesignerplugin_man-kgendesignerplugin.1.po move summit/docmessages/frameworks/meinproc4_man-meinproc4.8.po summit/docmessages/frameworks/meinproc5_man-meinproc5.8.po copy summit/docmessages/frameworks/plasmapkg_man-plasmapkg.1.po summit/docmessages/frameworks/kpackagetool_man-kpackagetool5.1.po move summit/docmessages/frameworks/plasmapkg_man-plasmapkg.1.po summit/docmessages/frameworks/plasmapkg2_man-plasmapkg2.1.po move summit/docmessages/frameworks/preparetips_man-preparetips.1.po summit/docmessages/frameworks/preparetips5_man-preparetips5.1.po move summit/docmessages/frameworks/qtoptions_man-qtoptions.7.po summit/docmessages/frameworks/qt5options_man-qt5options.7.po move summit/docmessages/kde-runtime/kioslave_bookmarks.po summit/docmessages/kde-runtime/kioslave5_bookmarks.po move summit/docmessages/kde-runtime/kioslave_bzip2.po summit/docmessages/kde-runtime/kioslave5_bzip2.po move summit/docmessages/kde-runtime/kioslave_cgi.po summit/docmessages/kde-runtime/kioslave5_cgi.po move summit/docmessages/kde-runtime/kioslave_finger.po summit/docmessages/kde-runtime/kioslave5_finger.po move summit/docmessages/kde-runtime/kioslave_fish.po summit/docmessages/kde-runtime/kioslave5_fish.po move summit/docmessages/kde-runtime/kioslave_floppy.po summit/docmessages/kde-runtime/kioslave5_floppy.po move summit/docmessages/kde-runtime/kioslave_gzip.po summit/docmessages/kde-runtime/kioslave5_gzip.po move summit/docmessages/kde-runtime/kioslave_info.po summit/docmessages/kde-runtime/kioslave5_info.po move summit/docmessages/kde-runtime/kioslave_man.po summit/docmessages/kde-runtime/kioslave5_man.po move summit/docmessages/kde-runtime/kioslave_network.po summit/docmessages/kde-runtime/kioslave5_network.po move summit/docmessages/kde-runtime/kioslave_nfs.po summit/docmessages/kde-runtime/kioslave5_nfs.po move summit/docmessages/kde-runtime/kioslave_sftp.po summit/docmessages/kde-runtime/kioslave5_sftp.po move summit/docmessages/kde-runtime/kioslave_smb.po summit/docmessages/kde-runtime/kioslave5_smb.po move summit/docmessages/kde-runtime/kioslave_tar.po summit/docmessages/kde-runtime/kioslave5_tar.po move summit/docmessages/kde-runtime/kioslave_thumbnail.po summit/docmessages/kde-runtime/kioslave5_thumbnail.po move summit/docmessages/kde-runtime/kioslave_xz.po summit/docmessages/kde-runtime/kioslave5_xz.po delete summit/messages/kde-workspace/kglobalaccel5.desktop.po merge summit/messages/playground-network/sflphone-client-kde_qt.po summit/messages/kdereview/ring-kde_qt.po move summit/messages/kdegames/libkdegames.po summit/messages/kdegames/libkdegames5.po move summit/messages/kdegames/libkmahjongg.po summit/messages/kdegames/libkmahjongg5.po move summit/messages/kdereview/kaccounts-integration.desktop.po summit/messages/extragear-base/kaccounts-integration.desktop.po move summit/messages/kdereview/kaccounts-integration.po summit/messages/extragear-base/kaccounts-integration.po move summit/messages/kdereview/kaccounts-providers.po summit/messages/extragear-base/kaccounts-providers.po move summit/messages/extragear-kdevelop/json_extragear-kdevelop_kdevplatform.po summit/messages/extragear-kdevelop/kdevplatform.json.po move summit/messages/playground-devtools/json_playground-devtools_kdev-clang.po summit/messages/playground-devtools/kdev-clang.json.po move summit/messages/kdereview/ring-kde_qt.po summit/messages/extragear-network/ring-kde_qt.po move summit/messages/kde-workspace/libkxmlrpcclient5.po summit/messages/frameworks/libkxmlrpcclient5.po move summit/messages/kdeutils/plasma_applet_org.kde.printmanager.po summit/messages/kdeutils/plasma_applet_org.kde.plasma.printmanager.po # ktron->ksnakeduel move summit/messages/kdegames/ktron.po summit/messages/kdegames/ksnakeduel.po move summit/docmessages/kdegames/ktron.po summit/docmessages/kdegames/ksnakeduel.po move summit/messages/kdereview/kchart_qt.po summit/messages/extragear-graphics/kchart_qt.po move summit/messages/kdereview/kgantt_qt.po summit/messages/extragear-graphics/kgantt_qt.po move summit/messages/extragear-base/kaccounts-integration.desktop.po summit/messages/kdenetwork/kaccounts-integration.desktop.po move summit/messages/extragear-base/kaccounts-integration.po summit/messages/kdenetwork/kaccounts-integration.po move summit/messages/extragear-base/kaccounts-providers.po summit/messages/kdenetwork/kaccounts-providers.po move summit/messages/extragear-libs/libkgeomap.po summit/messages/kdegraphics/libkgeomap.po move summit/messages/extragear-multimedia/kdenlive.desktop.po summit/messages/kdemultimedia/kdenlive.desktop.po move summit/messages/extragear-multimedia/kdenlive.po summit/messages/kdemultimedia/kdenlive.po move summit/messages/extragear-multimedia/kdenlive_xml_mimetypes.po summit/messages/kdemultimedia/kdenlive_xml_mimetypes.po move summit/messages/extragear-network/kcm_ktp_accounts.po summit/messages/kdenetwork/kcm_ktp_accounts.po move summit/messages/extragear-network/kcm_ktp_chat_appearance.po summit/messages/kdenetwork/kcm_ktp_chat_appearance.po move summit/messages/extragear-network/kcm_ktp_chat_behavior.po summit/messages/kdenetwork/kcm_ktp_chat_behavior.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_butterfly.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_butterfly.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_gabble.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_gabble.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_haze.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_haze.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_idle.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_idle.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_pintxo.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_pintxo.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_rakia.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_rakia.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_salut.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_salut.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_sipe.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_sipe.po move summit/messages/extragear-network/kcmtelepathyaccounts_plugin_sunshine.po summit/messages/kdenetwork/kcmtelepathyaccounts_plugin_sunshine.po move summit/messages/extragear-network/kded_ktp_approver.po summit/messages/kdenetwork/kded_ktp_approver.po move summit/messages/extragear-network/kded_ktp_integration_module.po summit/messages/kdenetwork/kded_ktp_integration_module.po move summit/messages/extragear-network/ktp-accounts-kcm.desktop.po summit/messages/kdenetwork/ktp-accounts-kcm.desktop.po move summit/messages/extragear-network/ktp-adiumxtra-protocol-handler.po summit/messages/kdenetwork/ktp-adiumxtra-protocol-handler.po move summit/messages/extragear-network/ktp-approver.desktop.po summit/messages/kdenetwork/ktp-approver.desktop.po move summit/messages/extragear-network/ktp-auth-handler.po summit/messages/kdenetwork/ktp-auth-handler.po move summit/messages/extragear-network/ktp-common-internals.desktop.po summit/messages/kdenetwork/ktp-common-internals.desktop.po move summit/messages/extragear-network/ktp-common-internals.po summit/messages/kdenetwork/ktp-common-internals.po move summit/messages/extragear-network/ktp-contact-list.desktop.po summit/messages/kdenetwork/ktp-contact-list.desktop.po move summit/messages/extragear-network/ktp-contact-runner.desktop.po summit/messages/kdenetwork/ktp-contact-runner.desktop.po move summit/messages/extragear-network/ktp-contactlist.po summit/messages/kdenetwork/ktp-contactlist.po move summit/messages/extragear-network/ktp-debugger.po summit/messages/kdenetwork/ktp-debugger.po move summit/messages/extragear-network/ktp-desktop-applets.desktop.po summit/messages/kdenetwork/ktp-desktop-applets.desktop.po move summit/messages/extragear-network/ktp-filetransfer-handler.po summit/messages/kdenetwork/ktp-filetransfer-handler.po move summit/messages/extragear-network/ktp-filters.po summit/messages/kdenetwork/ktp-filters.po move summit/messages/extragear-network/ktp-kded-module.desktop.po summit/messages/kdenetwork/ktp-kded-module.desktop.po move summit/messages/extragear-network/ktp-log-viewer.po summit/messages/kdenetwork/ktp-log-viewer.po move summit/messages/extragear-network/ktp-send-file.desktop.po summit/messages/kdenetwork/ktp-send-file.desktop.po move summit/messages/extragear-network/ktp-send-file.po summit/messages/kdenetwork/ktp-send-file.po move summit/messages/extragear-network/ktp-text-ui.desktop.po summit/messages/kdenetwork/ktp-text-ui.desktop.po move summit/messages/extragear-network/ktp-text-ui.po summit/messages/kdenetwork/ktp-text-ui.po move summit/messages/extragear-network/ktpchat.po summit/messages/kdenetwork/ktpchat.po move summit/messages/extragear-network/plasma_runner_ktp_contacts.po summit/messages/kdenetwork/plasma_runner_ktp_contacts.po move summit/messages/extragear-multimedia/kdenlive.appdata.po summit/messages/kdemultimedia/kdenlive.appdata.po move summit/docmessages/extragear-multimedia/kdenlive.po summit/docmessages/kdemultimedia/kdenlive.po delete summit/messages/extragear-network/plasma_applet_org.kde.ktp-contact.po delete summit/messages/extragear-network/plasma_applet_org.kde.ktp-presence.po move summit/messages/playground-network/libkpeople.po summit/messages/frameworks/libkpeople.po delete summit/messages/kdeedu/rocscore.po delete summit/messages/kdeedu/rocsvisualeditor.po delete summit/docmessages/kdeedu/rocs_apiLinkedListstructure.po delete summit/docmessages/kdeedu/rocs_apiRootedTreestructure.po copy summit/messages/frameworks/kio.desktop.po summit/messages/applications/dolphin.desktop.po move summit/messages/extragear-multimedia/plasma-mediacenter.desktop.po summit/messages/kde-workspace/plasma-mediacenter.desktop.po move summit/messages/extragear-multimedia/plasma-mediacenter.po summit/messages/kde-workspace/plasma-mediacenter.po move summit/messages/kdepim/KMail2.appdata.po summit/messages/kdepim/org.kde.kmail.appdata.po delete summit/docmessages/kdeedu/rocs_apiConsole.po delete summit/docmessages/kdeedu/rocs_apiDatastructure.po delete summit/docmessages/kdeedu/rocs_apiGraphstructure.po move summit/messages/playground-utils/kdebugsettings.desktop.po summit/messages/kdereview/kdebugsettings.desktop.po move summit/messages/playground-utils/kdebugsettings.po summit/messages/kdereview/kdebugsettings.po move summit/messages/playground-base/kdeconnect-filetiemaction.po summit/messages/playground-base/kdeconnect-fileitemaction.po move summit/messages/extragear-network/ring-kde_qt.po summit/messages/playground-network/ring-kde_qt.po copy summit/messages/playground-network/ring-kde_qt.po summit/messages/extragear-network/libringclient_qt.po move summit/messages/playground-network/sflphone-kde.desktop.po summit/messages/playground-network/ring-kde.desktop.po move summit/messages/playground-network/sflphone-client-kde.po summit/messages/playground-network/ring-kde.po move summit/docmessages/playground-network/sflphone-kde.po summit/docmessages/playground-network/ring-kde.po move summit/docmessages/playground-network/sflphone-kde_advanced-use.po summit/docmessages/playground-network/ring-kde_advanced-use.po move summit/docmessages/playground-network/sflphone-kde_basic-use.po summit/docmessages/playground-network/ring-kde_basic-use.po move summit/docmessages/playground-network/sflphone-kde_common-use.po summit/docmessages/playground-network/ring-kde_common-use.po move summit/docmessages/playground-network/sflphone-kde_credits.po summit/docmessages/playground-network/ring-kde_credits.po move summit/docmessages/playground-network/sflphone-kde_getting-started.po summit/docmessages/playground-network/ring-kde_getting-started.po move summit/docmessages/playground-network/sflphone-kde_introduction.po summit/docmessages/playground-network/ring-kde_introduction.po move summit/docmessages/playground-network/sflphone-kde_man-sflphone-client-kde.1.po summit/docmessages/playground-network/ring-kde_man-ring-kde.1.po move summit/messages/playground-games/kdots.desktop.po summit/messages/kdereview/kdots.desktop.po move summit/messages/playground-games/kdots.po summit/messages/kdereview/kdots.po delete summit/messages/playground-base/about-distro.desktop.po move summit/messages/playground-base/kcm-about-distro.po summit/messages/kde-workspace/kcm-about-distro.po copy summit/messages/calligra/calligra.desktop.po summit/messages/playground-libs/kreport.desktop.po move summit/docmessages/extragear-sdk/plasmate_engineexplorer_man-plasmaengineexplorer.1.po summit/docmessages/extragear-sdk/plasma-sdk_engineexplorer_man-plasmaengineexplorer.1.po move summit/docmessages/extragear-sdk/plasmate_plasmoidviewer_man-plasmoidviewer.1.po summit/docmessages/extragear-sdk/plasma-sdk_plasmoidviewer_man-plasmoidviewer.1.po delete summit/messages/kde-workspace/kcm-touchpad.desktop.po move summit/messages/kde-workspace/muon-installer.po summit/messages/extragear-sysadmin/muon-installer.po move summit/messages/kde-workspace/plasma_applet_org.kde.plasma.folder.po summit/messages/applications/plasma_applet_org.kde.plasma.folder.po move summit/messages/playground-sysadmin/kcmsystemd.po summit/messages/playground-sysadmin/systemd-kcm.po copy summit/messages/kde-workspace/breeze_kwin_deco.po summit/messages/kde-workspace/oxygen_kdecoration.po move summit/messages/frameworks/libkpeople.po summit/messages/frameworks/kpeople5.po move summit/messages/kdereview/gcompris_qt.po summit/messages/extragear-edu/gcompris_qt.po move summit/messages/kde-workspace/plasma_applet_comic.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.comic.po delete summit/messages/calligra/sheetspivottables.po delete summit/messages/extragear-kdevelop/kdev-www.desktop.po delete summit/messages/playground-devtools/kdev-cppcheck.desktop.po move summit/messages/kdereview/kdebugsettings.desktop.po summit/messages/kdeutils/kdebugsettings.desktop.po move summit/messages/kdereview/kdebugsettings.po summit/messages/kdeutils/kdebugsettings.po copy summit/messages/kde-workspace/kcminput.po summit/messages/kde-workspace/kcmmousetheme.po delete summit/messages/calligra/googledocs_plugin.po delete summit/messages/extragear-sdk/plasmate.desktop.po move summit/messages/frameworks/kglobalaccel5.po summit/messages/kde-runtime/kglobalaccel5.po copy summit/messages/kde-runtime/knotify4.po summit/messages/kde-runtime/plasma_engine_devicenotifications.po merge summit/messages/kde-workspace/kcm_infobase.po summit/messages/kde-workspace/kcminfo.po delete summit/messages/kdeedu/cantor.appdata.po copy summit/messages/calligra/calligra.po summit/messages/playground-libs/kreport.po copy summit/messages/calligra/koreport_barcodeplugin.po summit/messages/playground-libs/kreport_barcodeplugin.po copy summit/messages/calligra/koreport_mapsplugin.po summit/messages/playground-libs/kreport_mapsplugin.po move summit/messages/kdesdk/okteta.appdata.po summit/messages/kdesdk/org.kde.okteta.appdata.po move summit/messages/kde-workspace/plasma_engine_devicenotifications.po summit/messages/kde-runtime/plasma_engine_devicenotifications.po move summit/messages/playground-games/kpeg.po summit/messages/kdereview/kpeg.po move summit/messages/kdereview/LabPlot2.po summit/messages/kdereview/labplot2.po move summit/docmessages/kdereview/LabPlot2.po summit/docmessages/kdereview/labplot2.po copy summit/messages/kde-workspace/plasmanetworkmanagement_pptpui.po summit/messages/kde-workspace/plasmanetworkmanagement_sstpui.po delete summit/messages/playground-devtools/kdev-qmake.desktop.po delete summit/messages/playground-devtools/kdev-qmljs.desktop.po delete summit/messages/playground-devtools/kdev-ruby.desktop.po move summit/messages/kdereview/kwallet-query.po summit/messages/frameworks/kwallet-query.po move summit/messages/playground-graphics/kscreengenie.desktop.po summit/messages/kdereview/kscreengenie.desktop.po move summit/messages/playground-graphics/kscreengenie.po summit/messages/kdereview/kscreengenie.po move summit/docmessages/kdereview/kwallet-query_man-kwallet-query.1.po summit/docmessages/frameworks/kwallet-query_man-kwallet-query.1.po move summit/docmessages/playground-graphics/kscreengenie.po summit/docmessages/kdereview/kscreengenie.po copy summit/messages/extragear-sysadmin/partitionmanager.po summit/messages/extragear-sysadmin/kpmcore.po copy summit/messages/extragear-sysadmin/partitionmanager.desktop.po summit/messages/extragear-sysadmin/kpmcore.desktop.po move summit/messages/extragear-network/libringclient_qt.po summit/messages/playground-network/libringclient_qt.po delete summit/messages/extragear-graphics/kipiplugin_picasawebexport.po move summit/messages/playground-libs/kreport.po summit/messages/playground-libs/kreport_qt.po move summit/messages/playground-libs/kreport_barcodeplugin.po summit/messages/playground-libs/kreport_barcodeplugin_qt.po move summit/messages/playground-libs/kreport_chartplugin.po summit/messages/playground-libs/kreport_chartplugin_qt.po move summit/messages/playground-libs/kreport_mapsplugin.po summit/messages/playground-libs/kreport_mapsplugin_qt.po move summit/messages/playground-libs/kreport_webplugin.po summit/messages/playground-libs/kreport_webplugin_qt.po delete summit/messages/extragear-graphics/kipiplugin_wallpaper.po delete summit/messages/extragear-graphics/kipiplugin_photivointegration.po move summit/messages/kdeedu/step.appdata.po summit/messages/kdeedu/org.kde.step.appdata.po move summit/messages/playground-libs/kproperty.po summit/messages/playground-libs/kproperty_qt.po delete summit/messages/playground-libs/kreport_examples.po delete summit/messages/extragear-base/libdatamodelsplugin.po delete summit/messages/extragear-base/libmobilecomponentsplugin.po delete summit/messages/extragear-base/plasma-applet-org.kde.windowstrip.po delete summit/messages/extragear-base/plasma-appletstrip.po delete summit/messages/extragear-base/plasma-device.po delete summit/messages/extragear-base/plasma_applet_mobiledesktop.po delete summit/messages/extragear-base/plasma_applet_org.kde.active.activityscreen.po delete summit/messages/extragear-base/plasma_applet_org.kde.resourcelists.po delete summit/messages/extragear-base/plasma_package_org.kde.active.activityconfiguration.po delete summit/messages/extragear-base/plasma_package_org.kde.active.addresources.po delete summit/messages/extragear-base/plasma_package_org.kde.active.widgetsexplorer.po delete summit/messages/extragear-base/plasma_package_org.kde.activityswitcher.po delete summit/messages/playground-devtools/kdev-krazy2.desktop.po delete summit/messages/playground-libs/sprinter.desktop.po merge summit/messages/kdeedu/kstars.appdata.po summit/messages/kdeedu/org.kde.kstars.appdata.po move summit/messages/kde-workspace/kio_mtp.po summit/messages/kdenetwork/kio_mtp.po move summit/messages/kdepim-runtime/accountwizard.po summit/messages/kdepim/accountwizard.po move summit/messages/kdepim-runtime/accountwizard_tine20.po summit/messages/kdepim/accountwizard_tine20.po delete summit/messages/kdepim-runtime/akonadi_facebook_resource.po delete summit/messages/kdepim-runtime/akonadi_kabc_resource.po delete summit/messages/kdepim-runtime/akonadi_kcal_resource.po delete summit/messages/kdepim-runtime/akonadi_kdeaccounts_resource.po delete summit/messages/kdepim-runtime/akonadi_kolabproxy_resource.po delete summit/messages/kdepim-runtime/akonadi_kresourceassistant.po delete summit/messages/kdepim-runtime/akonadi_localbookmarks_resource.po delete summit/messages/kdepim-runtime/akonadi_mailtransport_resource.po delete summit/messages/kdepim-runtime/akonadi_nntp_resource.po delete summit/messages/kdepim-runtime/akonaditray.po delete summit/messages/kdepim-runtime/kabc_akonadi.po delete summit/messages/kdepim-runtime/kaddressbookmigrator.po delete summit/messages/kdepim-runtime/kcal_akonadi.po delete summit/messages/kdepim-runtime/kdepim-runtime-qml.po delete summit/messages/kdepim-runtime/kjotsmigrator.po delete summit/messages/kdepim-runtime/kmail-migrator.po delete summit/messages/kdepim-runtime/knotes-migrator.po delete summit/messages/kdepim-runtime/kres-migrator.po delete summit/messages/kdepim-runtime/kresources_shared_akonadi.po delete summit/messages/kdepim/akonadi_next.po delete summit/messages/kdepim/kabcclient.po delete summit/messages/kdepim/kaddressbook-mobile.po delete summit/messages/kdepim/kjots.po delete summit/messages/kdepim/kmail-mobile.po delete summit/messages/kdepim/kmailcvt.po delete summit/messages/kdepim/knode.po delete summit/messages/kdepim/korganizer-mobile.po delete summit/messages/kdepim/kres_blog.po delete summit/messages/kdepim/kres_remote.po delete summit/messages/kdepim/ksendemail.po delete summit/messages/kdepim/ktexteditorkabcbridge_plugin.po delete summit/messages/kdepim/ktimetracker.po delete summit/messages/kdepim/libkdepimmobileui.po delete summit/messages/kdepim/libpimprint.po delete summit/messages/kdepim/messageviewer_text_xdiff_plugin.po delete summit/messages/kdepim/notes-mobile.po delete summit/messages/kdepim/plasma_applet_akonotes_note.po delete summit/messages/kdepim/plasma_applet_kpapplet.po delete summit/messages/kdepim/tasks-mobile.po delete summit/messages/kdepimlibs/kabc_dir.po delete summit/messages/kdepimlibs/kabc_file.po delete summit/messages/kdepimlibs/kabc_ldapkio.po delete summit/messages/kdepimlibs/kabc_net.po delete summit/messages/kdepimlibs/kabcformat_binary.po delete summit/messages/kdepimlibs/kio_imap4.po delete summit/messages/kdepimlibs/libakonadi-xml.po delete summit/messages/kdepimlibs/libkpimutils.po delete summit/messages/kdepimlibs/libkresources.po move summit/docmessages/kde-runtime/kcontrol_ebrowsing.po summit/docmessages/kde-workspace/kcontrol_webshortcuts.po delete summit/docmessages/kde-runtime/kcontrol_ebrowsing.po delete summit/docmessages/kdepim/kabcclient.po delete summit/docmessages/kdepim/kabcclient_man-kabcclient.1.po delete summit/docmessages/kdepim/kioslave_news.po delete summit/docmessages/kdepim/kjots.po delete summit/docmessages/kdepim/kmailcvt.po delete summit/docmessages/kdepim/knode.po delete summit/docmessages/kdepim/knode_commands.po delete summit/docmessages/kdepim/knode_credits.po delete summit/docmessages/kdepim/knode_faq.po delete summit/docmessages/kdepim/knode_gloss.po delete summit/docmessages/kdepim/knode_install.po delete summit/docmessages/kdepim/knode_introduction.po delete summit/docmessages/kdepim/knode_journey.po delete summit/docmessages/kdepim/knode_more.po delete summit/docmessages/kdepim/knode_using-firststart.po delete summit/docmessages/kdepim/knode_using-morefeatures.po delete summit/docmessages/kdepim/knode_using-subscribing.po delete summit/docmessages/kdepim/ktimetracker.po delete summit/docmessages/kdepimlibs/kcontrol_kresources.po move summit/messages/playground-pim/akonadi-search.desktop.po summit/messages/pim/akonadi-search.desktop.po delete summit/messages/kdeedu/pairs.appdata.po delete summit/messages/kdeedu/pairs.desktop.po delete summit/messages/kdeedu/pairs.po delete summit/messages/kdeedu/pairseditor.po delete summit/docmessages/kdeedu/pairseditor.po move summit/docmessages/kdelibs/kjs_man-kjs.1.po summit/docmessages/kdelibs/kjs5_man-kjs5.1.po move summit/messages/extragear-libs/libkgapi.po summit/messages/extragear-libs/libkgapi_qt.po move summit/messages/kdegraphics/kcmkgamma.po summit/messages/kde-workspace/kcmkgamma.po move summit/messages/kdegraphics/kgamma.desktop.po summit/messages/kde-workspace/kgamma.desktop.po move summit/docmessages/kdegraphics/kcontrol_kgamma.po summit/docmessages/kde-workspace/kcontrol_kgamma.po move summit/messages/kdeedu/rocs.appdata.po summit/messages/kdeedu/org.kde.rocs.appdata.po delete summit/messages/calligra/KexiRelationDesignShapePlugin.po move summit/messages/kde-workspace/balooctl.po summit/messages/frameworks/balooctl.po move summit/messages/kdelibs/baloo.desktop.po summit/messages/frameworks/baloo.desktop.po move summit/messages/kdelibs/baloo_file.po summit/messages/frameworks/baloo_file.po move summit/messages/kdelibs/baloo_file_extractor.po summit/messages/frameworks/baloo_file_extractor.po move summit/messages/kdelibs/baloo_naturalqueryparser.po summit/messages/frameworks/baloo_naturalqueryparser.po move summit/messages/kdelibs/baloosearch.po summit/messages/frameworks/baloosearch.po move summit/messages/kdelibs/balooshow.po summit/messages/frameworks/balooshow.po move summit/messages/kdelibs/baloowidgets.po summit/messages/frameworks/baloowidgets.po move summit/messages/kdelibs/kfilemetadata.po summit/messages/frameworks/kfilemetadata.po move summit/messages/kdelibs/kio_baloosearch.po summit/messages/frameworks/kio_baloosearch.po move summit/messages/kdelibs/kio_tags.po summit/messages/frameworks/kio_tags.po move summit/messages/kdelibs/kio_timeline.po summit/messages/frameworks/kio_timeline.po move summit/messages/extragear-office/skrooge.appdata.po summit/messages/extragear-office/org.kde.skrooge.appdata.po move summit/messages/frameworks/baloo_naturalqueryparser.po summit/messages/kdelibs/baloo_naturalqueryparser.po move summit/messages/frameworks/baloowidgets.po summit/messages/kdelibs/baloowidgets.po move summit/messages/extragear-utils/krusader.appdata.po summit/messages/extragear-utils/org.kde.krusader.appdata.po delete summit/messages/extragear-sdk/plasma_shell_org.kde__desktop.po move summit/docmessages/kdeutils/kwalletmanager.po summit/docmessages/kdeutils/kwallet5.po move summit/docmessages/kdelibs/kjs5_man-kjs5.1.po summit/docmessages/frameworks/kjs5_man-kjs5.1.po # the following have should been copied before, as it happened for the other # plugins, but at least few (fuzzy) messages can be reused with this copy copy summit/messages/calligra/koreport_chartplugin.po summit/messages/playground-libs/kreport_chartplugin_qt.po copy summit/messages/calligra/koreport_webplugin.po summit/messages/playground-libs/kreport_webplugin_qt.po # json plugin (and their translations) were originally desktop plugin copy summit/messages/kdeedu/rocs.desktop.po summit/messages/kdeedu/rocs.json.po move summit/messages/kde-workspace/kgamma.desktop.po summit/messages/kde-workspace/kgamma5.desktop.po move summit/docmessages/kde-workspace/kcontrol_kgamma.po summit/docmessages/kde-workspace/kcontrol_kgamma5.po delete summit/messages/playground-utils/ksecretsservice_api.po move summit/docmessages/kde-workspace/kcontrol_webshortcuts.po summit/docmessages/kde-runtime/kcontrol_webshortcuts.po move summit/docmessages/playground-games/kpeg.po summit/docmessages/kdereview/kpeg.po move summit/messages/kdereview/plasma-pa.desktop.po summit/messages/kde-workspace/plasma-pa.desktop.po move summit/messages/kdereview/kcm_pulseaudio.po summit/messages/kde-workspace/kcm_pulseaudio.po move summit/messages/kdereview/plasma_applet_org.kde.plasma.volume.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.volume.po move summit/docmessages/kdereview/plasma-pa.po summit/docmessages/kde-workspace/plasma-pa.po move summit/messages/playground-devtools/kdevqmakebuilder.po summit/messages/extragear-kdevelop/kdevqmakebuilder.po move summit/messages/playground-devtools/kdevqmake.po summit/messages/extragear-kdevelop/kdevqmakemanager.po move summit/messages/playground-devtools/kdevqmljssupport.po summit/messages/extragear-kdevelop/kdevqmljs.po merge summit/messages/extragear-utils/kronometer.appdata.po summit/messages/extragear-utils/org.kde.kronometer.appdata.po delete summit/messages/playground-devtools/kdev-qmake.json.po delete summit/messages/playground-devtools/kdev-qmljs.json.po move summit/messages/kdetoys/kteatime.desktop.po summit/messages/kdeutils/kteatime.desktop.po move summit/messages/kdetoys/kteatime.po summit/messages/kdeutils/kteatime.po move summit/messages/kdetoys/org.kde.kteatime.appdata.po summit/messages/kdeutils/org.kde.kteatime.appdata.po move summit/docmessages/kdetoys/kteatime.po summit/docmessages/kdeutils/kteatime.po move summit/messages/applications/dolphin.appdata.po summit/messages/applications/org.kde.dolphin.appdata.po move summit/messages/kdeedu/kig.appdata.po summit/messages/kdeedu/org.kde.kig.appdata.po move summit/messages/kdegames/picmi.appdata.po summit/messages/kdegames/org.kde.picmi.appdata.po move summit/messages/kdemultimedia/dragonplayer.appdata.po summit/messages/kdemultimedia/org.kde.dragonplayer.appdata.po move summit/messages/kdeutils/ark.appdata.po summit/messages/kdeutils/org.kde.ark.appdata.po move summit/messages/playground-base/kdeconnect-kde.desktop.po summit/messages/kdereview/kdeconnect-kde.desktop.po move summit/messages/playground-base/kdeconnect-cli.po summit/messages/kdereview/kdeconnect-cli.po move summit/messages/playground-base/kdeconnect-core.po summit/messages/kdereview/kdeconnect-core.po move summit/messages/playground-base/kdeconnect-fileitemaction.po summit/messages/kdereview/kdeconnect-fileitemaction.po move summit/messages/playground-base/kdeconnect-kcm.po summit/messages/kdereview/kdeconnect-kcm.po move summit/messages/playground-base/kdeconnect-kded.po summit/messages/kdereview/kdeconnect-kded.po move summit/messages/playground-base/kdeconnect-kio.po summit/messages/kdereview/kdeconnect-kio.po move summit/messages/playground-base/kdeconnect-plugins.po summit/messages/kdereview/kdeconnect-plugins.po move summit/messages/playground-base/plasma_applet_org.kde.kdeconnect.po summit/messages/kdereview/plasma_applet_org.kde.kdeconnect.po move summit/messages/playground-base/kdeconnect-kde.json.po summit/messages/kdereview/kdeconnect-kde.json.po move summit/messages/playground-base/kdeconnect-android-store.po summit/messages/kdereview/kdeconnect-android-store.po move summit/messages/playground-base/kdeconnect-android.po summit/messages/kdereview/kdeconnect-android.po move summit/messages/playground-libs/purpose.desktop.po summit/messages/playground-libs/purpose.json.po # moved to unmaintained; the removed kdereview.desktop file contain # only message strings from the removed applet. delete summit/messages/kdereview/plasma_applet_adjustableclock.po delete summit/messages/kdereview/kdereview.desktop.po # moved from SVN to git and as part of workspace move summit/messages/qt/oxygen-icons.desktop.po summit/messages/kde-workspace/oxygen-icons.desktop.po delete summit/messages/extragear-artwork/kannasaver.desktop.po delete summit/messages/extragear-artwork/kannasaver.po move summit/messages/kdereview/kscreengenie.desktop.po summit/messages/kdereview/kapture.desktop.po move summit/messages/kdereview/kscreengenie.po summit/messages/kdereview/kapture.po move summit/docmessages/kdereview/kscreengenie.po summit/docmessages/kdereview/kapture.po move summit/messages/kdereview/heaptrack.po summit/messages/extragear-sdk/heaptrack.po delete summit/messages/playground-libs/predicate.desktop.po move summit/messages/kdegames/bovo.appdata.po summit/messages/kdegames/org.kde.bovo.appdata.po move summit/messages/kdegames/bomber.appdata.po summit/messages/kdegames/org.kde.bomber.appdata.po move summit/messages/kdereview/kapture.po summit/messages/kdegraphics/spectacle.po move summit/messages/kdereview/kapture.desktop.po summit/messages/kdegraphics/spectacle.desktop.po move summit/docmessages/kdereview/kapture.po summit/docmessages/kdegraphics/spectacle.po move summit/messages/extragear-kdevelop/kdevreviewboard.po summit/messages/extragear-kdevelop/purpose_reviewboard.po move summit/messages/playground-libs/purpose_reviewboard.po summit/messages/extragear-kdevelop/purpose_reviewboard.po move summit/messages/kdeedu/artikulate.appdata.po summit/messages/kdeedu/org.kde.artikulate.appdata.po delete summit/messages/playground-libs/libpurpose.po copy summit/messages/calligra/artwork.po summit/messages/calligra/KarbonFilterEffects.po copy summit/messages/calligra/artwork.po summit/messages/calligra/kritafiltereffects.po copy summit/messages/calligra/calligra.po summit/messages/calligra/kritalibs.po copy summit/messages/calligra/calligra.desktop.po summit/messages/calligra/krita.desktop.po copy summit/messages/calligra/calligra-dockers.po summit/messages/calligra/krita-dockers.po copy summit/messages/calligra/calligra-defaulttools.po summit/messages/calligra/krita_flaketools.po copy summit/messages/calligra/KarbonTools.po summit/messages/calligra/krita_karbontools.po copy summit/messages/calligra/calligra_shape_artistictext.po summit/messages/calligra/krita_shape_artistictext.po copy summit/messages/calligra/calligra_shape_paths.po summit/messages/calligra/krita_shape_paths.po copy summit/messages/calligra/calligra_shape_text.po summit/messages/calligra/krita_shape_text.po copy summit/messages/calligra/calligra_shape_vector.po summit/messages/calligra/krita_shape_vector.po copy summit/messages/calligra/kocolorspaces.po summit/messages/calligra/kritacolorspaces.po move summit/messages/extragear-graphics/kipiplugin_flickrexport.po summit/messages/extragear-graphics/kipiplugin_flickr.po move summit/messages/extragear-graphics/kipiplugin_imageshackexport.po summit/messages/extragear-graphics/kipiplugin_imageshack.po move summit/messages/extragear-graphics/kipiplugin_imgurexport.po summit/messages/extragear-graphics/kipiplugin_imgur.po move summit/messages/extragear-graphics/kipiplugin_wikimedia.po summit/messages/extragear-graphics/kipiplugin_mediawiki.po move summit/messages/extragear-graphics/kipiplugin_piwigoexport.po summit/messages/extragear-graphics/kipiplugin_piwigo.po move summit/messages/extragear-graphics/kipiplugin_rajceexport.po summit/messages/extragear-graphics/kipiplugin_rajce.po move summit/messages/extragear-graphics/kipiplugin_kioexportimport.po summit/messages/extragear-graphics/kipiplugin_remotestorage.po move summit/messages/extragear-office/kbibtex.appdata.po summit/messages/extragear-office/org.kde.kbibtex.appdata.po delete summit/messages/playground-devtools/kdev-clang.json.po delete summit/docmessages/playground-edu/kartesio.po delete summit/docmessages/playground-edu/kartesio_man-kartesio.1.po move summit/messages/kdereview/kdeconnect-android-store.po summit/messages/extragear-network/kdeconnect-android-store.po move summit/messages/kdereview/kdeconnect-android.po summit/messages/extragear-network/kdeconnect-android.po move summit/messages/kdereview/kdeconnect-cli.po summit/messages/extragear-network/kdeconnect-cli.po move summit/messages/kdereview/kdeconnect-core.po summit/messages/extragear-network/kdeconnect-core.po move summit/messages/kdereview/kdeconnect-fileitemaction.po summit/messages/extragear-network/kdeconnect-fileitemaction.po move summit/messages/kdereview/kdeconnect-kcm.po summit/messages/extragear-network/kdeconnect-kcm.po move summit/messages/kdereview/kdeconnect-kde.desktop.po summit/messages/extragear-network/kdeconnect-kde.desktop.po move summit/messages/kdereview/kdeconnect-kded.po summit/messages/extragear-network/kdeconnect-kded.po move summit/messages/kdereview/kdeconnect-kio.po summit/messages/extragear-network/kdeconnect-kio.po move summit/messages/kdereview/kdeconnect-plugins.po summit/messages/extragear-network/kdeconnect-plugins.po move summit/messages/kdereview/kdeconnect.appdata.po summit/messages/extragear-network/kdeconnect.appdata.po move summit/messages/kdereview/plasma_applet_org.kde.kdeconnect.po summit/messages/extragear-network/plasma_applet_org.kde.kdeconnect.po delete summit/messages/extragear-graphics/kipiplugin_acquireimages.po delete summit/messages/extragear-graphics/kipiplugin_batchprocessimages.po delete summit/messages/extragear-graphics/kipiplugin_debianscreenshots.po delete summit/messages/extragear-graphics/kipiplugin_dlnaexport.po delete summit/messages/extragear-graphics/kipiplugin_dngconverter.po delete summit/messages/extragear-graphics/kipiplugin_galleryexport.po delete summit/messages/extragear-graphics/kipiplugin_gpssync.po delete summit/messages/extragear-graphics/kipiplugin_htmlexport.po delete summit/messages/extragear-graphics/kipiplugin_ipodexport.po delete summit/messages/extragear-graphics/kipiplugin_jalbumexport.po delete summit/messages/extragear-graphics/kipiplugin_jpeglossless.po delete summit/messages/extragear-graphics/kipiplugin_kopete.po delete summit/messages/extragear-graphics/kipiplugin_metadataedit.po delete summit/messages/extragear-graphics/kipiplugin_photolayouteditor.po delete summit/messages/extragear-graphics/kipiplugin_rawconverter.po delete summit/messages/extragear-graphics/kipiplugin_removeredeyes.po delete summit/messages/extragear-graphics/kipiplugin_shwup.po delete summit/messages/extragear-graphics/kipiplugin_videoslideshow.po delete summit/messages/extragear-kdevelop/kdev-php-docs.desktop.po delete summit/messages/playground-base/plasma_applet_kdeconnect.po delete summit/messages/playground-devtools/kdev-css.desktop.po move summit/messages/extragear-sdk/cuttlefish.po summit/messages/kde-workspace/cuttlefish.po move summit/messages/extragear-sdk/cuttlefish_editorplugin.po summit/messages/kde-workspace/cuttlefish_editorplugin.po move summit/messages/extragear-sdk/kdevpackagemanagerview.po summit/messages/kde-workspace/kdevpackagemanagerview.po move summit/messages/extragear-sdk/plasma-sdk.desktop.po summit/messages/kde-workspace/plasma-sdk.desktop.po move summit/messages/extragear-sdk/plasma_shell_org.kde.plasmoidviewershell.po summit/messages/kde-workspace/plasma_shell_org.kde.plasmoidviewershell.po move summit/messages/extragear-sdk/plasmaengineexplorer.po summit/messages/kde-workspace/plasmaengineexplorer.po move summit/messages/extragear-sdk/plasmate.po summit/messages/kde-workspace/plasmate.po move summit/messages/extragear-sdk/plasmawallpaperviewer.po summit/messages/kde-workspace/plasmawallpaperviewer.po move summit/messages/extragear-sdk/plasmoidviewer.po summit/messages/kde-workspace/plasmoidviewer.po move summit/messages/extragear-sdk/remote-widgets-browser.po summit/messages/kde-workspace/remote-widgets-browser.po move summit/messages/extragear-sdk/themeexplorer.po summit/messages/kde-workspace/themeexplorer.po move summit/messages/kde-workspace/plasma_applet_icontasks.po summit/messages/kdeplasma-addons/plasma_applet_icontasks.po move summit/messages/kde-workspace/plasma_applet_kdeobservatory.po summit/messages/kdeplasma-addons/plasma_applet_kdeobservatory.po move summit/messages/kde-workspace/plasma_applet_nowplaying.po summit/messages/kdeplasma-addons/plasma_applet_nowplaying.po move summit/messages/kde-workspace/plasma_applet_opendesktop.po summit/messages/kdeplasma-addons/plasma_applet_opendesktop.po move summit/messages/kde-workspace/plasma_applet_opendesktop_activities.po summit/messages/kdeplasma-addons/plasma_applet_opendesktop_activities.po move summit/messages/kde-workspace/plasma_applet_paste.po summit/messages/kdeplasma-addons/plasma_applet_paste.po move summit/messages/kde-workspace/plasma_applet_pastebin.po summit/messages/kdeplasma-addons/plasma_applet_pastebin.po move summit/messages/kde-workspace/plasma_applet_rtm.po summit/messages/kdeplasma-addons/plasma_applet_rtm.po move summit/messages/kde-workspace/plasma_engine_kdeobservatory.po summit/messages/kdeplasma-addons/plasma_engine_kdeobservatory.po move summit/messages/kdereview/kdeconnect-kde.json.po summit/messages/extragear-network/kdeconnect-kde.json.po move summit/docmessages/extragear-sdk/plasma-sdk_engineexplorer_man-plasmaengineexplorer.1.po summit/docmessages/kde-workspace/plasma-sdk_engineexplorer_man-plasmaengineexplorer.1.po move summit/docmessages/extragear-sdk/plasma-sdk_plasmoidviewer_man-plasmoidviewer.1.po summit/docmessages/kde-workspace/plasma-sdk_plasmoidviewer_man-plasmoidviewer.1.po delete summit/docmessages/kdereview/kdeconnect.po copy summit/messages/kde-workspace/plasma-workspace.desktop.po summit/messages/kde-workspace/kscreenlocker.desktop.po copy summit/messages/kde-workspace/muon.desktop.po summit/messages/kde-workspace/discover.desktop.po move summit/messages/kde-workspace/libmuon.po summit/messages/kde-workspace/libdiscover.po move summit/messages/kdereview/labplot2.po summit/messages/extragear-edu/labplot2.po move summit/messages/kdereview/labplot.appdata.po summit/messages/extragear-edu/labplot.appdata.po move summit/messages/kdereview/labplot.desktop.po summit/messages/extragear-edu/labplot.desktop.po move summit/docmessages/kdereview/labplot2.po summit/docmessages/extragear-edu/labplot2.po # Summit catalogs left behind on 15.08->15.12 switch, 2015-11-15. delete summit/messages/applications/kate_kttsd.po delete summit/messages/applications/katefiletemplates.po delete summit/messages/applications/katemailfilesplugin.po delete summit/messages/applications/katexmlcheck.po delete summit/messages/applications/pate.po delete summit/messages/kde-wallpapers/kde-wallpapers.desktop.po delete summit/messages/kdeartwork/kdeartwork.desktop.po delete summit/messages/kdeartwork/kdeasciiquarium.po delete summit/messages/kdeartwork/klock.po delete summit/messages/kdeartwork/kpartsaver.po delete summit/messages/kdeartwork/kstyle_phase_config.po delete summit/messages/kdeartwork/kwin_art_clients.po delete summit/messages/kdeartwork/kxsconfig.po delete summit/messages/kdegraphics/kipiplugin_kxmlhelloworld.po delete summit/messages/kdegraphics/libkdcraw.po delete summit/messages/kdegraphics/libkexiv2.po delete summit/messages/kdegraphics/libkface.po delete summit/messages/kdegraphics/libkipi.po delete summit/messages/kdepim-runtime/kcm_akonadi.po delete summit/messages/kdepim/libkpgp.po delete summit/messages/kdetoys/amor.desktop.po delete summit/messages/kdetoys/amor.po delete summit/messages/kdetoys/ktux.desktop.po delete summit/messages/kdetoys/ktux.po delete summit/messages/kdeutils/superkaramba.desktop.po delete summit/messages/kdeutils/superkaramba.po delete summit/messages/pim/libkholidays5.po delete summit/messages/kdeutils/plasma_applet_skapplet.po move summit/messages/kde-workspace/muon.desktop.po summit/messages/extragear-sysadmin/muon.desktop.po move summit/messages/kde-workspace/muon.po summit/messages/extragear-sysadmin/muon.po move summit/messages/kdegraphics/ksnapshot.desktop.po summit/messages/extragear-graphics/ksnapshot.desktop.po move summit/messages/kdegraphics/ksnapshot.po summit/messages/extragear-graphics/ksnapshot.po move summit/docmessages/kdegraphics/ksnapshot.po summit/docmessages/extragear-graphics/ksnapshot.po move summit/messages/kde-workspace/plasma_applet_showdashboard.po summit/messages/kdeplasma-addons/plasma_applet_showdashboard.po delete summit/messages/playground-libs/kdb.desktop.po move summit/docmessages/playground-devtools/kdesvn.po summit/docmessages/kdereview/kdesvn.po move summit/docmessages/playground-devtools/kdesvn_man-kdesvn.1.po summit/docmessages/kdereview/kdesvn_man-kdesvn.1.po move summit/docmessages/playground-devtools/kdesvn_man-kdesvnaskpass.1.po summit/docmessages/kdereview/kdesvn_man-kdesvnaskpass.1.po move summit/messages/kdepim/akonadi_sendlater_agent.po summit/messages/pim/akonadi_sendlater_agent.po move summit/messages/kdepim/calendarsupport.po summit/messages/pim/calendarsupport.po move summit/messages/kdepim/cryptopageplugin.po summit/messages/pim/cryptopageplugin.po move summit/messages/kdepim/kdgantt2.po summit/messages/pim/kdgantt2.po move summit/messages/kdepim/libcomposereditorng.po summit/messages/pim/libcomposereditorng.po move summit/messages/kdepim/libeventviews.po summit/messages/pim/libeventviews.po move summit/messages/kdepim/libgrantleetheme.po summit/messages/pim/libgrantleetheme.po move summit/messages/kdepim/libgravatar.po summit/messages/pim/libgravatar.po move summit/messages/kdepim/libincidenceeditors.po summit/messages/pim/libincidenceeditors.po move summit/messages/kdepim/libkaddressbookgrantlee.po summit/messages/pim/libkaddressbookgrantlee.po move summit/messages/kdepim/libkdepim.po summit/messages/pim/libkdepim.po move summit/messages/kdepim/libkleopatra.po summit/messages/pim/libkleopatra.po move summit/messages/kdepim/libksieve.po summit/messages/pim/libksieve.po move summit/messages/kdepim/libmailcommon.po summit/messages/pim/libmailcommon.po move summit/messages/kdepim/libmailimporter.po summit/messages/pim/libmailimporter.po move summit/messages/kdepim/libmessagecomposer.po summit/messages/pim/libmessagecomposer.po move summit/messages/kdepim/libmessagecore.po summit/messages/pim/libmessagecore.po move summit/messages/kdepim/libmessagelist.po summit/messages/pim/libmessagelist.po move summit/messages/kdepim/libmessageviewer.po summit/messages/pim/libmessageviewer.po move summit/messages/kdepim/libpimcommon.po summit/messages/pim/libpimcommon.po move summit/messages/kdepim/libtemplateparser.po summit/messages/pim/libtemplateparser.po move summit/messages/kdepim/mailreader.po summit/messages/pim/mailreader.po move summit/messages/playground-base/customtoolsplugin.po summit/messages/pim/customtoolsplugin.po move summit/messages/playground-base/kaddressbook_plugins.po summit/messages/pim/kaddressbook_plugins.po move summit/messages/playground-base/kdepim-addons.desktop.po summit/messages/pim/kdepim-addons.desktop.po move summit/messages/playground-base/kdepim-addons.json.po summit/messages/pim/kdepim-addons.json.po move summit/messages/playground-base/kmail_plugins.po summit/messages/pim/kmail_plugins.po move summit/messages/playground-base/messageviewerheaderplugins.po summit/messages/pim/messageviewerheaderplugins.po move summit/messages/playground-base/messageviewerplugins.po summit/messages/pim/messageviewerplugins.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/calendarsupport.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/eventviews.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/libkdepim.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/libkleo.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/libksieve.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/messagelib.desktop.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kdepim-addons.desktop.po move summit/messages/playground-devtools/kdesvn.po summit/messages/kdereview/kdesvn.po move summit/messages/playground-devtools/kdesvn.desktop.po summit/messages/kdereview/kdesvn.desktop.po move summit/messages/kdepim/messageviewer_application_mstnef_plugin.po summit/messages/pim/messageviewer_application_mstnef_plugin.po move summit/messages/kdepim/messageviewer_text_vcard_plugin.po summit/messages/pim/messageviewer_text_vcard_plugin.po move summit/messages/kdeedu/kalgebra.appdata.po summit/messages/kdeedu/org.kde.kalgebra.appdata.po move summit/messages/kdegraphics/kolourpaint.appdata.po summit/messages/kdegraphics/org.kde.kolourpaint.appdata.po copy summit/messages/calligra/calligra.desktop.po summit/messages/calligra/kexi.desktop.po delete summit/messages/kdereview/kdev-perforce.desktop.po move summit/messages/kdeedu/kanagram.appdata.po summit/messages/kdeedu/org.kde.kanagram.appdata.po move summit/messages/kdeedu/khangman.appdata.po summit/messages/kdeedu/org.kde.khangman.appdata.po move summit/messages/kdeedu/klettres.appdata.po summit/messages/kdeedu/org.kde.klettres.appdata.po move summit/messages/kdeedu/kmplot.appdata.po summit/messages/kdeedu/org.kde.kmplot.appdata.po move summit/messages/kdeedu/parley.appdata.po summit/messages/kdeedu/org.kde.parley.appdata.po move summit/messages/kdeedu/kwordquiz.appdata.po summit/messages/kdeedu/org.kde.kwordquiz.appdata.po move summit/messages/kdereview/kdesvn.desktop.po summit/messages/extragear-sdk/kdesvn.desktop.po move summit/messages/kdereview/kdesvn.po summit/messages/extragear-sdk/kdesvn.po move summit/docmessages/kdereview/kdesvn.po summit/docmessages/extragear-sdk/kdesvn.po move summit/docmessages/kdereview/kdesvn_man-kdesvn.1.po summit/docmessages/extragear-sdk/kdesvn_man-kdesvn.1.po move summit/docmessages/kdereview/kdesvn_man-kdesvnaskpass.1.po summit/docmessages/extragear-sdk/kdesvn_man-kdesvnaskpass.1.po move summit/messages/kde-workspace/muon-updater.po summit/messages/kde-workspace/plasma-discover-updater.po move summit/messages/kde-workspace/muon-discover.po summit/messages/kde-workspace/plasma-discover.po move summit/messages/kde-workspace/muon-exporter.po summit/messages/kde-workspace/plasma-discover-exporter.po move summit/messages/kde-workspace/muon-notifier.po summit/messages/kde-workspace/plasma-discover-notifier.po delete summit/messages/frameworks/kcoreaddons.desktop.po delete summit/messages/frameworks/kdeclarative.desktop.po move summit/messages/frameworks/knotifyconfig.desktop.po summit/messages/kdelibs/knotifyconfig.desktop.po move summit/messages/frameworks/kxmlgui.desktop.po summit/messages/kdelibs/kxmlgui.desktop.po move summit/messages/kdepimlibs/akonadi_knut_resource.po summit/messages/pim/akonadi_knut_resource.po move summit/messages/kdepimlibs/libakonadi5.po summit/messages/pim/libakonadi5.po delete summit/messages/playground-sdk/dferry.desktop.po move summit/messages/extragear-multimedia/kamoso.appdata.po summit/messages/extragear-multimedia/org.kde.kamoso.appdata.po move summit/messages/kdegames/granatier.appdata.po summit/messages/kdegames/org.kde.granatier.appdata.po move summit/messages/kdegames/kapman.appdata.po summit/messages/kdegames/org.kde.kapman.appdata.po move summit/messages/kdegames/katomic.appdata.po summit/messages/kdegames/org.kde.katomic.appdata.po move summit/messages/kdegames/kblackbox.appdata.po summit/messages/kdegames/org.kde.kblackbox.appdata.po move summit/messages/kdegames/kblocks.appdata.po summit/messages/kdegames/org.kde.kblocks.appdata.po move summit/messages/kdegraphics/org.kde.kolourpaint.appdata.po summit/messages/kdegraphics/kolourpaint.appdata.po move summit/messages/kdereview/minuet.desktop.po summit/messages/kdeedu/minuet.desktop.po move summit/messages/kdereview/minuet.po summit/messages/kdeedu/minuet.po move summit/messages/kdereview/org.kde.minuet.appdata.po summit/messages/kdeedu/org.kde.minuet.appdata.po move summit/docmessages/kdereview/minuet.po summit/docmessages/kdeedu/minuet.po move summit/messages/extragear-network/ktp-call-ui.po summit/messages/kdenetwork/ktp-call-ui.po move summit/messages/extragear-utils/yakuake.appdata.po summit/messages/extragear-utils/org.kde.yakuake.appdata.po move summit/messages/frameworks/kactivities5.po summit/messages/kdelibs/kactivities5.po move summit/messages/kde-workspace/plasma_applet_weather.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.weather.po copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kleopatra.desktop.po move summit/messages/kdepim/kleopatra.appdata.po summit/messages/pim/kleopatra.appdata.po move summit/messages/kdepim/kleopatra.po summit/messages/pim/kleopatra.po move summit/messages/kdepim/kwatchgnupg.po summit/messages/pim/kwatchgnupg.po move summit/docmessages/kdepim/kleopatra.po summit/docmessages/pim/kleopatra.po move summit/docmessages/kdepim/kwatchgnupg.po summit/docmessages/pim/kwatchgnupg.po copy summit/messages/kdelibs/kactivities5.po summit/messages/kdenetwork/kio5_activities.po move summit/messages/kde-workspace/plasma_applet_org.kde.plasma.systemtray.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.private.systemtray.po copy summit/messages/kdeutils/ark.desktop.po summit/messages/kdeutils/ark.json.po move summit/messages/pim/kleopatra.appdata.po summit/messages/pim/org.kde.kleopatra.appdata.po move summit/messages/kdepim/akregator.appdata.po summit/messages/kdepim/org.kde.akregator.appdata.po move summit/messages/kdepim/blogilo.appdata.po summit/messages/kdepim/org.kde.blogilo.appdata.po move summit/messages/kdepim/kaddressbook.appdata.po summit/messages/kdepim/org.kde.kaddressbook.appdata.po move summit/messages/kdepim/kalarm.appdata.po summit/messages/kdepim/org.kde.kalarm.appdata.po move summit/messages/kdepim/knotes.appdata.po summit/messages/kdepim/org.kde.knotes.appdata.po move summit/messages/kdepim/Kontact.appdata.po summit/messages/kdepim/org.kde.kontact.appdata.po move summit/messages/kdepim/korganizer.appdata.po summit/messages/kdepim/org.kde.korganizer.appdata.po move summit/messages/playground-pim/Kjots.appdata.po summit/messages/playground-pim/org.kde.kjots.appdata.po delete summit/messages/extragear-base/plasma_applet_org.kde.digital-clock.po copy summit/messages/pim/libcomposereditorng.po summit/messages/pim/libcomposereditorwebengine.po delete summit/docmessages/kdetoys/amor.po delete summit/docmessages/kdetoys/amor_man-amor.6.po move summit/docmessages/kdepimlibs/kioslave_smtp.po summit/docmessages/pim/kioslave5_smtp.po move summit/docmessages/kdepimlibs/kioslave_ldap.po summit/docmessages/pim/kioslave5_ldap.po delete summit/messages/calligra/krita-dockers.po delete summit/messages/calligra/krita_flaketools.po delete summit/messages/calligra/krita_karbontools.po delete summit/messages/calligra/krita_shape_artistictext.po delete summit/messages/calligra/krita_shape_paths.po delete summit/messages/calligra/krita_shape_text.po delete summit/messages/calligra/krita_shape_vector.po delete summit/messages/calligra/kritacolorspaces.po delete summit/messages/calligra/kritafiltereffects.po delete summit/messages/calligra/kritalibs.po move summit/messages/kdepimlibs/kio_ldap.po summit/messages/pim/kio_ldap.po move summit/messages/kdepimlibs/kio_smtp.po summit/messages/pim/kio_smtp.po move summit/docmessages/pim/kioslave5_smtp.po summit/docmessages/kdepimlibs/kioslave5_smtp.po delete summit/messages/extragear-graphics/kipiplugin_advancedslideshow.po delete summit/messages/extragear-graphics/kipiplugin_calendar.po delete summit/messages/extragear-graphics/kipiplugin_expoblending.po delete summit/messages/extragear-graphics/kipiplugin_panorama.po move summit/messages/kdepimlibs/kio_sieve.po summit/messages/pim/kio_sieve.po move summit/docmessages/kdepimlibs/kioslave5_smtp.po summit/docmessages/pim/kioslave5_smtp.po move summit/docmessages/kdepimlibs/kioslave_pop3.po summit/docmessages/kdepimlibs/kioslave5_pop3.po move summit/docmessages/kdepimlibs/kioslave_sieve.po summit/docmessages/kdepimlibs/kioslave5_sieve.po move summit/messages/playground-pim/zanshin.po summit/messages/playground-pim/zanshin_qt.po move summit/messages/playground-pim/renku.appdata.po summit/messages/playground-pim/org.kde.renku.appdata.po move summit/messages/playground-pim/zanshin.appdata.po summit/messages/playground-pim/org.kde.zanshin.appdata.po move summit/messages/kde-workspace/themeexplorer.po summit/messages/kde-workspace/org.kde.plasma.themeexplorer.po move summit/docmessages/kde-workspace/plasma-pa.po summit/docmessages/kde-workspace/kcontrol_plasma-pa.po copy summit/messages/pim/libpimcommon.po summit/messages/pim/storageservices.po move summit/messages/pim/messageviewerwebengineurlinterceptor.po summit/messages/pim/webengineurlinterceptor.po move summit/docmessages/kdepimlibs/kioslave5_pop3.po summit/docmessages/kdepim-runtime/kioslave5_pop3.po move summit/docmessages/kdepimlibs/kioslave5_sieve.po summit/docmessages/pim/kioslave5_sieve.po copy summit/messages/kdepim/korganizer.po summit/messages/pim/korganizer_plugins.po delete summit/messages/pim/messageviewerwebengineurlinterceptor.po move summit/messages/kdepimlibs/kio_pop3.po summit/messages/kdepim-runtime/kio_pop3.po move summit/messages/frameworks/kactivities.desktop.po summit/messages/kdelibs/kactivities.desktop.po move summit/messages/frameworks/kactivities.json.po summit/messages/kde-workspace/kactivities.json.po move summit/messages/kde-workspace/kcm_desktopthemedetails.po summit/messages/kde-workspace/kcm_desktoptheme.po move summit/messages/kdepim/messageviewer_text_calendar_plugin.po summit/messages/pim/messageviewer_text_calendar_plugin.po move summit/messages/frameworks/frameworkintegration5.po summit/messages/kde-workspace/plasmaintegration5.po move summit/messages/kde-workspace/kcm_activities.po summit/messages/kde-workspace/kcm_activities5.po merge summit/messages/extragear-graphics/kipiplugin_timeadjust.po summit/messages/extragear-graphics/digikam.po move summit/messages/extragear-kdevelop/kdevelop.appdata.po summit/messages/extragear-kdevelop/org.kde.kdevelop.appdata.po copy summit/messages/pim/libmessageviewer.po summit/messages/pim/libmimetreeparser.po move summit/messages/extragear-multimedia/kaffeine.appdata.po summit/messages/extragear-multimedia/org.kde.kaffeine.appdata.po move summit/messages/kdesdk/cervisia.appdata.po summit/messages/kdesdk/org.kde.cervisia.appdata.po move summit/messages/extragear-graphics/kipiplugin_googledrive.po summit/messages/extragear-graphics/kipiplugin_googleservices.po move summit/messages/extragear-edu/gcompris.appdata.po summit/messages/extragear-edu/org.kde.gcompris.appdata.po delete summit/messages/playground-edu/kartesio.po move summit/messages/kde-workspace/plasma-discover-exporter.po summit/messages/extragear-sysadmin/plasma-discover-exporter.po move summit/messages/kde-workspace/plasma-discover-updater.po summit/messages/extragear-sysadmin/plasma-discover-updater.po move summit/messages/kde-workspace/plasma_applet_org.kde.muonnotifier.po summit/messages/extragear-sysadmin/plasma_applet_org.kde.muonnotifier.po move summit/messages/extragear-sysadmin/plasma_applet_org.kde.muonnotifier.po summit/messages/kde-workspace/plasma_applet_org.kde.discovernotifier.po delete summit/messages/kde-workspace/ksshaskpass.desktop.po delete summit/messages/kde-workspace/oxygen-icons.desktop.po delete summit/messages/pim/akonadi.desktop.po delete summit/messages/pim/grantleetheme.desktop.po delete summit/messages/playground-multimedia/macaw-movies.desktop.po move summit/messages/kdepimlibs/kdepimlibs.desktop.po summit/messages/pim/akonadi-contacts.desktop.po move summit/messages/kdepimlibs/kcm_akonadicontact_actions.po summit/messages/pim/kcm_akonadicontact_actions.po move summit/messages/kdepimlibs/akonadicontact5.po summit/messages/pim/akonadicontact5.po move summit/messages/kdepimlibs/akonadinotes5.po summit/messages/pim/akonadinotes5.po move summit/messages/kdepimlibs/libakonadi-kmime5.po summit/messages/pim/libakonadi-kmime5.po move summit/messages/calligra/crashhandler.po summit/messages/calligra/kritacrashhandler.po move summit/messages/calligra/krita.appdata.po summit/messages/calligra/org.kde.krita.appdata.po move summit/messages/kdereview/kwave.appdata.po summit/messages/kdereview/org.kde.kwave.appdata.po move summit/messages/kdeedu/plasma_runner_marblerunner.po summit/messages/kdeedu/plasma_runner_marble.po move summit/messages/extragear-multimedia/k3b.appdata.po summit/messages/extragear-multimedia/org.kde.k3b.appdata.po move summit/messages/calligra/words.po summit/messages/calligra/calligrawords.po move summit/messages/calligra/words.appdata.po summit/messages/calligra/org.kde.calligrawords.appdata.po move summit/messages/calligra/calligra_shape_formular.po summit/messages/calligra/calligra_shape_formula.po move summit/messages/calligra/stage.appdata.po summit/messages/calligra/org.kde.calligrastage.appdata.po move summit/messages/calligra/stage.po summit/messages/calligra/calligrastage.po move summit/messages/calligra/sheets.appdata.po summit/messages/calligra/org.kde.calligrasheets.appdata.po move summit/messages/calligra/sheets.po summit/messages/calligra/calligrasheets.po move summit/messages/calligra/braindump.appdata.po summit/messages/calligra/org.kde.braindump.appdata.po move summit/messages/calligra/karbon.appdata.po summit/messages/calligra/org.kde.karbon.appdata.po move summit/messages/calligra/plan.appdata.po summit/messages/calligra/org.kde.calligraplan.appdata.po move summit/messages/calligra/plan.po summit/messages/calligra/calligraplan.po move summit/messages/calligra/planlibs.po summit/messages/calligra/calligraplanlibs.po move summit/messages/calligra/planwork.po summit/messages/calligra/calligraplanwork.po move summit/messages/calligra/flow.appdata.po summit/messages/calligra/org.kde.calligraflow.appdata.po move summit/messages/calligra/planrcpsplugin.po summit/messages/calligra/calligraplan_scheduler_rcps.po move summit/messages/calligra/plantjplugin.po summit/messages/calligra/calligraplan_scheduler_tj.po move summit/messages/calligra/sheetscalendartool.po summit/messages/calligra/calligrasheets_calendar.po move summit/messages/calligra/sheetssolver.po summit/messages/calligra/calligrasheets_solver.po delete summit/messages/kdepimlibs/kio_mbox.po delete summit/messages/kdepimlibs/kio_nntp.po delete summit/messages/pim/libcomposereditorng.po move summit/messages/pim/libcomposereditorwebengine.po summit/messages/kdepim/libcomposereditorwebengine.po delete summit/docmessages/kdeedu/kmplot_commands.po delete summit/docmessages/kdeedu/kmplot_configuration.po delete summit/docmessages/kdeedu/kmplot_credits.po delete summit/docmessages/kdeedu/kmplot_dcop.po delete summit/docmessages/kdeedu/kmplot_developer.po delete summit/docmessages/kdeedu/kmplot_firststeps.po delete summit/docmessages/kdeedu/kmplot_install.po delete summit/docmessages/kdeedu/kmplot_introduction.po delete summit/docmessages/kdeedu/kmplot_reference.po delete summit/docmessages/kdeedu/kmplot_using.po delete summit/docmessages/kdeedu/rocs_chapterImportExport.po delete summit/docmessages/kdepimlibs/kioslave_imap.po delete summit/docmessages/kdepimlibs/kioslave_mbox.po delete summit/docmessages/kdepimlibs/kioslave_nntp.po move summit/messages/pim/kdgantt2.po summit/messages/pim/kdgantt2_qt.po move summit/messages/kdeedu/marble.appdata.po summit/messages/kdeedu/org.kde.marble.appdata.po delete summit/messages/kdegraphics/kdegraphics-strigi-analyzer.desktop.po delete summit/messages/kdegraphics/kfile_dds.po delete summit/messages/kdegraphics/kfile_exr.po delete summit/messages/kdegraphics/kfile_pnm.po delete summit/messages/kdegraphics/kfile_raw.po delete summit/messages/kdegraphics/kfile_rgb.po delete summit/messages/kdegraphics/kfile_tiff.po delete summit/messages/kdegraphics/kfile_xps.po delete summit/messages/kdemultimedia/mplayerthumbs.desktop.po delete summit/messages/kdemultimedia/mplayerthumbs.po delete summit/messages/kdemultimedia/mplayerthumbsconfig.po delete summit/messages/kdesdk/strigila_diff.po move summit/messages/calligra/kformdesigner_mapbrowser.po summit/messages/calligra/kexiforms_mapwidgetplugin.po move summit/messages/calligra/kformdesigner_webbrowser.po summit/messages/calligra/kexiforms_webbrowserwidgetplugin.po delete summit/messages/extragear-multimedia/k3b.appdata.po copy summit/messages/extragear-kdevelop/kdevgdb.po summit/messages/extragear-kdevelop/kdevdebuggercommon.po copy summit/messages/frameworks/kio.desktop.po summit/messages/applications/kde-baseapps.desktop.po copy summit/messages/frameworks/kio5.po summit/messages/applications/kcmbookmarks.po move summit/messages/applications/kfindpart.po summit/messages/applications/kfind.po move summit/messages/applications/kfind.appdata.po summit/messages/applications/org.kde.kfind.appdata.po move summit/messages/kdereview/kirigami.desktop.po summit/messages/extragear-libs/kirigami.desktop.po move summit/messages/kdereview/libkirigamiplugin_qt.po summit/messages/extragear-libs/libkirigamiplugin_qt.po delete summit/messages/frameworks/testfallbackpackage.appdata.po delete summit/messages/frameworks/testjsonmetadatapackage.appdata.po delete summit/messages/frameworks/testpackage.appdata.po move summit/docmessages/kdemultimedia/kioslave_audiocd.po summit/docmessages/kdemultimedia/kioslave5_audiocd.po move summit/messages/calligra/kexi.appdata.po summit/messages/calligra/org.kde.kexi.appdata.po delete summit/messages/extragear-graphics/digiKam-ImagePlugin_Decorate.metainfo.po delete summit/messages/extragear-graphics/digiKam-ImagePlugin_Enhance.metainfo.po delete summit/messages/extragear-graphics/digiKam-ImagePlugin_FxFilters.metainfo.po delete summit/messages/extragear-graphics/digiKam-ImagePlugin_Transform.metainfo.po delete summit/messages/extragear-graphics/digiKam-ImagePlugin_Color.metainfo.po move summit/docmessages/extragear-graphics/kipi-plugins_rawconverter.po summit/docmessages/extragear-graphics/digikam_bqm-rawconverter.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_intro-background.po move summit/docmessages/extragear-graphics/kipi-plugins_acquireimages.po summit/docmessages/extragear-graphics/digikam_tool-acquireimages.po move summit/docmessages/extragear-graphics/kipi-plugins_renameimages.po summit/docmessages/extragear-graphics/digikam_tool-advrename.po move summit/docmessages/extragear-graphics/kipi-plugins_geolocation.po summit/docmessages/extragear-graphics/digikam_tool-geolocationeditor.po move summit/docmessages/extragear-graphics/kipi-plugins_metadataeditor.po summit/docmessages/extragear-graphics/digikam_tool-metadataeditor.po move summit/docmessages/extragear-graphics/kipi-plugins_slideshow.po summit/docmessages/extragear-graphics/digikam_tool-presentation.po delete summit/docmessages/extragear-graphics/kipi-plugins_colorimages.po delete summit/docmessages/extragear-graphics/kipi-plugins_convertimages.po delete summit/docmessages/extragear-graphics/kipi-plugins_effectimages.po delete summit/docmessages/extragear-graphics/kipi-plugins_filterimages.po delete summit/docmessages/extragear-graphics/kipi-plugins_imageviewer.po delete summit/docmessages/extragear-graphics/kipi-plugins_jpeglossless.po delete summit/docmessages/extragear-graphics/kipi-plugins_recompressimages.po delete summit/docmessages/extragear-graphics/kipi-plugins_resizeimages.po move summit/docmessages/extragear-graphics/digikam_color-management.po summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po move summit/docmessages/extragear-graphics/digikam_credits-annex.po summit/docmessages/extragear-graphics/digikam_annexes-credits.po move summit/docmessages/extragear-graphics/digikam_photo-editing.po summit/docmessages/extragear-graphics/digikam_editor-photoediting.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_editor-using.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_intro-camerasupport.po move summit/docmessages/extragear-graphics/digikam_file-formats.po summit/docmessages/extragear-graphics/digikam_intro-fileformats.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_intro-firstrun.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_intro-pluginsupport.po copy summit/docmessages/extragear-graphics/digikam_bqm-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-tagsmngr.po move summit/docmessages/extragear-graphics/digikam_bqm-mainwindow.po summit/docmessages/extragear-graphics/digikam_menu-bqm.po move summit/docmessages/extragear-graphics/digikam_ie-menu.po summit/docmessages/extragear-graphics/digikam_menu-editor.po move summit/docmessages/extragear-graphics/digikam_menu-descriptions.po summit/docmessages/extragear-graphics/digikam_menu-mainwindow.po move summit/docmessages/extragear-graphics/digikam_bqm-rawconverter.po summit/docmessages/extragear-graphics/digikam_using-bqm.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_using-camera.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_using-dam.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_using-lighttable.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_using-mainwindow.po copy summit/docmessages/extragear-graphics/digikam.po summit/docmessages/extragear-graphics/digikam_using-setup.po move summit/docmessages/extragear-graphics/digikam_sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar.po move summit/docmessages/extragear-graphics/kipi-plugins_flickrexport.po summit/docmessages/extragear-graphics/digikam_tool-flickrexport.po move summit/docmessages/extragear-graphics/kipi-plugins_printwizard.po summit/docmessages/extragear-graphics/digikam_tool-printwizard.po move summit/docmessages/extragear-graphics/kipi-plugins_sendimages.po summit/docmessages/extragear-graphics/digikam_tool-sendimages.po delete summit/docmessages/extragear-graphics/kipi-plugins.po delete summit/docmessages/extragear-graphics/kipi-plugins_imagesgallery.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-distortion.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-hotpixels.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-inpaint.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-nr.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-redeyes.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-restoration.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-sharpen.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-vignetting.po copy summit/docmessages/extragear-graphics/digikam_intro-fileformats.po summit/docmessages/extragear-graphics/digikam_intro-imageformats.po copy summit/docmessages/extragear-graphics/digikam_intro-fileformats.po summit/docmessages/extragear-graphics/digikam_intro-movieformats.po delete summit/docmessages/extragear-graphics/digikam_intro-fileformats.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-auto.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-bw.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-correction.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-curves.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-exposure.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-levels.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-mixer.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-neg.po copy summit/docmessages/extragear-graphics/digikam_editor-color.po summit/docmessages/extragear-graphics/digikam_editor-color-wb.po copy summit/docmessages/extragear-graphics/digikam_editor-decorate.po summit/docmessages/extragear-graphics/digikam_editor-decorate-border.po copy summit/docmessages/extragear-graphics/digikam_editor-decorate.po summit/docmessages/extragear-graphics/digikam_editor-decorate-inserttext.po copy summit/docmessages/extragear-graphics/digikam_editor-decorate.po summit/docmessages/extragear-graphics/digikam_editor-decorate-texture.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-blur.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-lenscorrection.po copy summit/docmessages/extragear-graphics/digikam_editor-enhance.po summit/docmessages/extragear-graphics/digikam_editor-enhance-localcontrast.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-blurfx.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-charcoal.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-colorsfx.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-distortionfx.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-emboss.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-filmgrain.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-oilpaint.po copy summit/docmessages/extragear-graphics/digikam_editor-filters.po summit/docmessages/extragear-graphics/digikam_editor-filters-raindrops.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-crop.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-freerotation.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-liquid.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-perspective.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-resize.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-rotateflip.po copy summit/docmessages/extragear-graphics/digikam_editor-transform.po summit/docmessages/extragear-graphics/digikam_editor-transform-shear.po # kdepim split: # akonadi-calendar-tools copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/akonadi-calendar-tools.desktop.po move summit/messages/kdepim/calendarjanitor.po summit/messages/pim/calendarjanitor.po move summit/messages/kdepim/konsolekalendar.po summit/messages/pim/konsolekalendar.po move summit/docmessages/kdepim/konsolekalendar.po summit/docmessages/pim/konsolekalendar.po # akonadi-import-wizard copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/akonadi-import-wizard.desktop.po move summit/messages/kdepim/importwizard.po summit/messages/pim/importwizard.po move summit/docmessages/kdepim/importwizard.po summit/docmessages/pim/importwizard.po # akregator copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/akregator.desktop.po move summit/messages/kdepim/akregator.po summit/messages/pim/akregator.po move summit/messages/kdepim/org.kde.akregator.appdata.po summit/messages/pim/org.kde.akregator.appdata.po move summit/docmessages/kdepim/akregator.po summit/docmessages/pim/akregator.po # blogilo copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/blogilo.desktop.po move summit/messages/kdepim/blogilo.po summit/messages/pim/blogilo.po move summit/messages/kdepim/libcomposereditorwebengine.po summit/messages/pim/libcomposereditorwebengine.po move summit/messages/kdepim/org.kde.blogilo.appdata.po summit/messages/pim/org.kde.blogilo.appdata.po move summit/docmessages/kdepim/blogilo.po summit/docmessages/pim/blogilo.po # grantlee-editor copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/grantlee-editor.desktop.po move summit/messages/kdepim/contactprintthemeeditor.po summit/messages/pim/contactprintthemeeditor.po move summit/messages/kdepim/contactthemeeditor.po summit/messages/pim/contactthemeeditor.po move summit/messages/kdepim/headerthemeeditor.po summit/messages/pim/headerthemeeditor.po move summit/messages/kdepim/libgrantleethemeeditor.po summit/messages/pim/libgrantleethemeeditor.po move summit/docmessages/kdepim/contactthemeeditor.po summit/docmessages/pim/contactthemeeditor.po move summit/docmessages/kdepim/headerthemeeditor.po summit/docmessages/pim/headerthemeeditor.po # kaddressbook copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kaddressbook.desktop.po move summit/messages/kdepim/kaddressbook.po summit/messages/pim/kaddressbook.po move summit/messages/kdepim/org.kde.kaddressbook.appdata.po summit/messages/pim/org.kde.kaddressbook.appdata.po # kalarm copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kalarm.desktop.po move summit/messages/kdepim/kalarm.po summit/messages/pim/kalarm.po move summit/messages/kdepim/org.kde.kalarm.appdata.po summit/messages/pim/org.kde.kalarm.appdata.po move summit/docmessages/kdepim/kalarm.po summit/docmessages/pim/kalarm.po # kmail-account-wizard copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kmail-account-wizard.desktop.po move summit/messages/kdepim/accountwizard.po summit/messages/pim/accountwizard.po move summit/messages/kdepim/accountwizard_tine20.po summit/messages/pim/accountwizard_tine20.po # kmail copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kmail.desktop.po move summit/messages/kdepim/akonadi_archivemail_agent.po summit/messages/pim/akonadi_archivemail_agent.po move summit/messages/kdepim/akonadi_followupreminder_agent.po summit/messages/pim/akonadi_followupreminder_agent.po move summit/messages/kdepim/akonadi_mailfilter_agent.po summit/messages/pim/akonadi_mailfilter_agent.po move summit/messages/kdepim/akonadi_sendlater_agent.po summit/messages/pim/akonadi_sendlater_agent.po move summit/messages/kdepim/kmail.po summit/messages/pim/kmail.po move summit/messages/kdepim/ktnef.po summit/messages/pim/ktnef.po move summit/messages/kdepim/org.kde.kmail.appdata.po summit/messages/pim/org.kde.kmail.appdata.po move summit/docmessages/kdepim/akonadi_archivemail_agent.po summit/docmessages/pim/akonadi_archivemail_agent.po move summit/docmessages/kdepim/akonadi_sendlater_agent.po summit/docmessages/pim/akonadi_sendlater_agent.po move summit/docmessages/kdepim/akonadi_followupreminder_agent.po summit/docmessages/pim/akonadi_followupreminder_agent.po move summit/docmessages/kdepim/kmail_configure.po summit/docmessages/pim/kmail_configure.po move summit/docmessages/kdepim/kmail_credits-and-licenses.po summit/docmessages/pim/kmail_credits-and-licenses.po move summit/docmessages/kdepim/kmail_faq.po summit/docmessages/pim/kmail_faq.po move summit/docmessages/kdepim/kmail_getting-started.po summit/docmessages/pim/kmail_getting-started.po move summit/docmessages/kdepim/kmail_intro.po summit/docmessages/pim/kmail_intro.po move summit/docmessages/kdepim/kmail_menus.po summit/docmessages/pim/kmail_menus.po move summit/docmessages/kdepim/kmail.po summit/docmessages/pim/kmail.po move summit/docmessages/kdepim/kmail_troubleshooting.po summit/docmessages/pim/kmail_troubleshooting.po move summit/docmessages/kdepim/kmail_using-kmail.po summit/docmessages/pim/kmail_using-kmail.po move summit/docmessages/kdepim/ktnef.po summit/docmessages/pim/ktnef.po # knotes copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/knotes.desktop.po move summit/messages/kdepim/akonadi_notes_agent.po summit/messages/pim/akonadi_notes_agent.po move summit/messages/kdepim/libnoteshared.po summit/messages/pim/libnoteshared.po move summit/messages/kdepim/org.kde.knotes.appdata.po summit/messages/pim/org.kde.knotes.appdata.po move summit/messages/kdepim/knotes.po summit/messages/pim/knotes.po move summit/docmessages/kdepim/knotes.po summit/docmessages/pim/knotes.po move summit/docmessages/kdepim/akonadi_notes_agent.po summit/docmessages/pim/akonadi_notes_agent.po # kontact copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/kontact.desktop.po move summit/messages/kdepim/org.kde.kontact.appdata.po summit/messages/pim/org.kde.kontact.appdata.po move summit/messages/kdepim/kontact.po summit/messages/pim/kontact.po move summit/docmessages/kdepim/kontact.po summit/docmessages/pim/kontact.po move summit/docmessages/kdepim/kontact-admin.po summit/docmessages/pim/kontact-admin.po # korganizer copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/korganizer.desktop.po move summit/messages/kdepim/korganizer.po summit/messages/pim/korganizer.po move summit/messages/kdepim/korgac.po summit/messages/pim/korgac.po move summit/messages/kdepim/org.kde.korganizer.appdata.po summit/messages/pim/org.kde.korganizer.appdata.po move summit/docmessages/kdepim/korganizer.po summit/docmessages/pim/korganizer.po # mbox-importer copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/mbox-importer.desktop.po move summit/messages/kdepim/mboximporter.po summit/messages/pim/mboximporter.po # pim-data-exporter copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/pim-data-exporter.desktop.po move summit/messages/kdepim/pimsettingexporter.po summit/messages/pim/pimsettingexporter.po move summit/docmessages/kdepim/pimsettingexporter.po summit/docmessages/pim/pimsettingexporter.po # pim-sieve-editor copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/pim-sieve-editor.desktop.po move summit/messages/kdepim/sieveeditor.po summit/messages/pim/sieveeditor.po move summit/docmessages/kdepim/sieveeditor.po summit/docmessages/pim/sieveeditor.po # pim-storage-service-manager copy summit/messages/kdepim/kdepim.desktop.po summit/messages/pim/pim-storage-service-manager.desktop.po move summit/messages/kdepim/storageservicemanager.po summit/messages/pim/storageservicemanager.po # kdepim split cleanup delete summit/messages/kdepim/kdepim.desktop.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-connection.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-definitions.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-intro.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-monitor.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-pcs.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-rawfile.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-rendering.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-srgb.po copy summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm-wkspace.po move summit/docmessages/extragear-graphics/digikam_editor-colormanagement.po summit/docmessages/extragear-graphics/digikam_editor-cm.po copy summit/docmessages/extragear-graphics/digikam_using-camera.po summit/docmessages/extragear-graphics/digikam_using-camera-basis.po copy summit/docmessages/extragear-graphics/digikam_using-camera.po summit/docmessages/extragear-graphics/digikam_using-camera-gps.po copy summit/docmessages/extragear-graphics/digikam_using-camera.po summit/docmessages/extragear-graphics/digikam_using-camera-intro.po copy summit/docmessages/extragear-graphics/digikam_using-camera.po summit/docmessages/extragear-graphics/digikam_using-camera-processing.po copy summit/docmessages/extragear-graphics/digikam_using-dam.po summit/docmessages/extragear-graphics/digikam_using-dam-build.po copy summit/docmessages/extragear-graphics/digikam_using-dam.po summit/docmessages/extragear-graphics/digikam_using-dam-copyright.po copy summit/docmessages/extragear-graphics/digikam_using-dam.po summit/docmessages/extragear-graphics/digikam_using-dam-corruption.po copy summit/docmessages/extragear-graphics/digikam_using-dam.po summit/docmessages/extragear-graphics/digikam_using-dam-intro.po copy summit/docmessages/extragear-graphics/digikam_using-dam.po summit/docmessages/extragear-graphics/digikam_using-dam-workflow.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-album.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-camera.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-cm.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-collections.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-database.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-editor.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-intro.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-lighttable.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-metadata.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-mimetype.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-misc.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-plugins.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-quality.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-raw.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-saveimages.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-slideshow.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-templates.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-theme.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-tooltip.po copy summit/docmessages/extragear-graphics/digikam_using-setup.po summit/docmessages/extragear-graphics/digikam_using-setup-versioning.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-captions.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-colors.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-filters.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-intro.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-maps.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-metadata.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-properties.po copy summit/docmessages/extragear-graphics/digikam_using-sidebar.po summit/docmessages/extragear-graphics/digikam_using-sidebar-tools.po move summit/docmessages/extragear-graphics/digikam_using-setup-editor.po summit/docmessages/extragear-graphics/digikam_using-setup-editor-iface.po move summit/docmessages/extragear-graphics/digikam_using-setup-saveimages.po summit/docmessages/extragear-graphics/digikam_using-setup-editor-save.po move summit/docmessages/extragear-graphics/digikam_using-setup-versioning.po summit/docmessages/extragear-graphics/digikam_using-setup-editor-version.po move summit/docmessages/kdepim/kontact.po summit/docmessages/pim/kontact.po move summit/docmessages/extragear-graphics/digikam_using-setup-raw.po summit/docmessages/extragear-graphics/digikam_using-setup-editor-raw.po copy summit/docmessages/extragear-graphics/digikam_intro-background.po summit/docmessages/extragear-graphics/digikam_intro-contrib.po copy summit/messages/frameworks/ktexteditor5.po summit/messages/frameworks/syntaxhighlighting.po move summit/messages/frameworks/syntaxhighlighting.po summit/messages/frameworks/syntaxhighlighting5_qt.po move summit/messages/extragear-network/smb4k.appdata.po summit/messages/extragear-network/org.kde.smb4k.appdata.po move summit/docmessages/kdemultimedia/kcontrol_cddbretrieval.po summit/docmessages/kdemultimedia/kcontrol_cddbretrieval5.po delete summit/messages/extragear-kdevelop/kdevphpdocs.po move summit/messages/kdeedu/kiten.appdata.po summit/messages/kdeedu/org.kde.kiten.appdata.po move summit/messages/kdeedu/blinken.appdata.po summit/messages/kdeedu/org.kde.blinken.appdata.po move summit/messages/extragear-network/choqok.appdata.po summit/messages/extragear-network/org.kde.choqok.appdata.po move summit/messages/kdegraphics/kolourpaint.appdata.po summit/messages/kdegraphics/org.kde.kolourpaint.appdata.po move summit/messages/extragear-multimedia/kaudiocreator.appdata.po summit/messages/extragear-multimedia/org.kde.kaudiocreator.appdata.po move summit/messages/kdesdk/lokalize.appdata.po summit/messages/kdesdk/org.kde.lokalize.appdata.po delete summit/messages/kde-workspace/plasma_applet_org.kde.plasma.activitypager.po move summit/messages/kde-workspace/plasma-mediacenter.desktop.po summit/messages/extragear-multimedia/plasma-mediacenter.desktop.po move summit/messages/kde-workspace/plasma-mediacenter.po summit/messages/extragear-multimedia/plasma-mediacenter.po move summit/messages/extragear-network/kdeconnect.appdata.po summit/messages/extragear-network/org.kde.kdeconnect.kcm.appdata.po move summit/messages/extragear-graphics/digikam.appdata.po summit/messages/extragear-graphics/org.kde.digikam.appdata.po move summit/messages/extragear-graphics/showfoto.appdata.po summit/messages/extragear-graphics/org.kde.showfoto.appdata.po move summit/messages/extragear-office/kmymoney.appdata.po summit/messages/extragear-office/org.kde.kmymoney.appdata.po move summit/messages/kdegraphics/gwenview.appdata.po summit/messages/kdegraphics/org.kde.gwenview.appdata.po move summit/messages/kdemultimedia/kdenlive.appdata.po summit/messages/kdemultimedia/org.kde.kdenlive.appdata.po move summit/messages/kdesdk/kapptemplate.appdata.po summit/messages/kdesdk/org.kde.kapptemplate.appdata.po move summit/messages/extragear-sysadmin/apper.appdata.po summit/messages/extragear-sysadmin/org.kde.apper.appdata.po move summit/messages/kdeedu/kalzium.appdata.po summit/messages/kdeedu/org.kde.kalzium.appdata.po move summit/messages/kdeedu/ktouch.appdata.po summit/messages/kdeedu/org.kde.ktouch.appdata.po move summit/messages/kdegames/ksudoku.appdata.po summit/messages/kdegames/org.kde.ksudoku.appdata.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-albumsview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-datesview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-fuzzysearches.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-imageview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-intro.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-labelsview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-peopleview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-searchesview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-tagsview.po copy summit/docmessages/extragear-graphics/digikam_using-mainwindow.po summit/docmessages/extragear-graphics/digikam_using-mainwindow-timelineview.po move summit/messages/kdereview/kwave.desktop.po summit/messages/kdemultimedia/kwave.desktop.po move summit/messages/kdereview/kwave.po summit/messages/kdemultimedia/kwave.po move summit/messages/kdereview/org.kde.kwave.appdata.po summit/messages/kdemultimedia/org.kde.kwave.appdata.po move summit/docmessages/kdereview/kwave.po summit/docmessages/kdemultimedia/kwave.po move summit/messages/kdereview/kdevperforce.po summit/messages/extragear-kdevelop/kdevperforce.po move summit/messages/extragear-office/tellico.appdata.po summit/messages/extragear-office/org.kde.tellico.appdata.po move summit/messages/kdemultimedia/juk.appdata.po summit/messages/kdemultimedia/org.kde.juk.appdata.po move summit/messages/kdemultimedia/kwave.po summit/messages/kdereview/kwave.po move summit/messages/kdemultimedia/kwave.desktop.po summit/messages/kdereview/kwave.desktop.po move summit/messages/kdemultimedia/org.kde.kwave.appdata.po summit/messages/kdereview/org.kde.kwave.appdata.po move summit/docmessages/kdemultimedia/kwave.po summit/docmessages/kdereview/kwave.po merge summit/docmessages/extragear-graphics/digikam_intro-contrib.po summit/docmessages/extragear-graphics/digikam_intro-background.po delete summit/docmessages/extragear-graphics/digikam_intro-info.po move summit/messages/playground-network/kio5_gdrive.po summit/messages/kdereview/kio5_gdrive.po move summit/messages/playground-network/kio-gdrive.desktop.po summit/messages/kdereview/kio-gdrive.desktop.po delete summit/messages/playground-devtools/kdev-mercurial.desktop.po move summit/messages/extragear-pim/trojita.appdata.po summit/messages/extragear-pim/org.kde.trojita.appdata.po move summit/messages/playground-libs/kdb.json.po summit/messages/kdereview/kdb.json.po move summit/messages/playground-libs/kdb_mysqldriver_qt.po summit/messages/kdereview/kdb_mysqldriver_qt.po move summit/messages/playground-libs/kdb_postgresqldriver_qt.po summit/messages/kdereview/kdb_postgresqldriver_qt.po move summit/messages/playground-libs/kdb_qt.po summit/messages/kdereview/kdb_qt.po move summit/messages/playground-libs/kdb_sqlitedriver_qt.po summit/messages/kdereview/kdb_sqlitedriver_qt.po move summit/messages/playground-libs/kdb_sybasedriver_qt.po summit/messages/kdereview/kdb_sybasedriver_qt.po move summit/messages/playground-libs/kdb_xbasedriver_qt.po summit/messages/kdereview/kdb_xbasedriver_qt.po move summit/messages/playground-libs/kproperty_qt.po summit/messages/kdereview/kproperty_qt.po move summit/messages/playground-libs/kreport.desktop.po summit/messages/kdereview/kreport.desktop.po move summit/messages/playground-libs/kreport.json.po summit/messages/kdereview/kreport.json.po move summit/messages/playground-libs/kreport_barcodeplugin_qt.po summit/messages/kdereview/kreport_barcodeplugin_qt.po move summit/messages/playground-libs/kreport_chartplugin_qt.po summit/messages/kdereview/kreport_chartplugin_qt.po move summit/messages/playground-libs/kreport_mapsplugin_qt.po summit/messages/kdereview/kreport_mapsplugin_qt.po move summit/messages/playground-libs/kreport_qt.po summit/messages/kdereview/kreport_qt.po move summit/messages/playground-libs/kreport_webplugin_qt.po summit/messages/kdereview/kreport_webplugin_qt.po copy summit/messages/pim/kaddressbook.po summit/messages/pim/kaddressbook_importexportplugins.po move summit/messages/kdeutils/kgpg.appdata.po summit/messages/kdeutils/org.kde.kgpg.appdata.po move summit/messages/kde-workspace/kaccounts-mobile.po summit/messages/playground-mobile/kaccounts-mobile.po move summit/messages/extragear-edu/labplot.appdata.po summit/messages/extragear-edu/org.kde.labplot2.appdata.po move summit/messages/kdeaccessibility/jovie.appdata.po summit/messages/kdeaccessibility/org.kde.jovie.appdata.po move summit/messages/extragear-sdk/massif-visualizer.appdata.po summit/messages/extragear-sdk/org.kde.massif-visualizer.appdata.po move summit/messages/kdegames/kajongg.appdata.po summit/messages/kdegames/org.kde.kajongg.appdata.po move summit/messages/extragear-base/kwebkitpart.po summit/messages/applications/webenginepart.po move summit/messages/applications/konqueror.appdata.po summit/messages/applications/org.kde.konqueror.appdata.po copy summit/messages/applications/kde-baseapps.desktop.po summit/messages/applications/konqueror.desktop.po copy summit/docmessages/applications/konqueror.po summit/docmessages/applications/keditbookmarks.po move summit/docmessages/kde-runtime/kcontrol_khtml-adblock.po summit/docmessages/applications/konqueror_kcontrol_khtml-adblock.po move summit/docmessages/kde-runtime/kcontrol_khtml-behavior.po summit/docmessages/applications/konqueror_kcontrol_khtml-behavior.po move summit/docmessages/kde-runtime/kcontrol_khtml-general.po summit/docmessages/applications/konqueror_kcontrol_khtml-general.po move summit/docmessages/kde-runtime/kcontrol_khtml-java-js.po summit/docmessages/applications/konqueror_kcontrol_khtml-java-js.po move summit/docmessages/frameworks/kcontrol_kcm_ssl.po summit/docmessages/frameworks/kcontrol5_kcm_ssl.po delete summit/docmessages/extragear-graphics/digikam_using-setup-album.po move summit/messages/kdereview/kwave.desktop.po summit/messages/kdemultimedia/kwave.desktop.po move summit/messages/kdereview/kwave.po summit/messages/kdemultimedia/kwave.po move summit/messages/kdereview/org.kde.kwave.appdata.po summit/messages/kdemultimedia/org.kde.kwave.appdata.po move summit/docmessages/kde-runtime/kcontrol_bookmarks.po summit/docmessages/kde-runtime/kcontrol5_bookmarks.po move summit/docmessages/kde-runtime/kcontrol_filemanager.po summit/docmessages/kde-runtime/kcontrol5_filemanager.po move summit/docmessages/kde-runtime/kcontrol_history.po summit/docmessages/kde-runtime/kcontrol5_history.po move summit/docmessages/kde-runtime/kcontrol_kcmcss.po summit/docmessages/kde-runtime/kcontrol5_kcmcss.po move summit/docmessages/applications/konqueror_kcontrol_khtml-adblock.po summit/docmessages/kde-runtime/kcontrol5_khtml-adblock.po move summit/docmessages/applications/konqueror_kcontrol_khtml-behavior.po summit/docmessages/kde-runtime/kcontrol5_khtml-behavior.po move summit/docmessages/applications/konqueror_kcontrol_khtml-general.po summit/docmessages/kde-runtime/kcontrol5_khtml-general.po move summit/docmessages/applications/konqueror_kcontrol_khtml-java-js.po summit/docmessages/kde-runtime/kcontrol5_khtml-java-js.po move summit/docmessages/kde-runtime/kcontrol_performance.po summit/docmessages/kde-runtime/kcontrol5_performance.po move summit/docmessages/kde-runtime/kcontrol_cache.po summit/docmessages/frameworks/kcontrol5_cache.po move summit/docmessages/kde-runtime/kcontrol_cookies.po summit/docmessages/frameworks/kcontrol5_cookies.po move summit/docmessages/kde-runtime/kcontrol_netpref.po summit/docmessages/frameworks/kcontrol5_netpref.po move summit/docmessages/kde-runtime/kcontrol_proxy.po summit/docmessages/frameworks/kcontrol5_proxy.po move summit/docmessages/kde-runtime/kcontrol_smb.po summit/docmessages/frameworks/kcontrol5_smb.po move summit/docmessages/kde-runtime/kcontrol_trash.po summit/docmessages/frameworks/kcontrol5_trash.po move summit/docmessages/kde-runtime/kcontrol_useragent.po summit/docmessages/frameworks/kcontrol5_useragent.po move summit/docmessages/kde-runtime/kcontrol_webshortcuts.po summit/docmessages/frameworks/kcontrol5_webshortcuts.po move summit/docmessages/kdereview/kwave.po summit/docmessages/kdemultimedia/kwave.po move summit/docmessages/kde-runtime/kcontrol_filetypes.po summit/docmessages/kde-runtime/kcontrol5_filetypes.po delete summit/docmessages/applications/kdepasswd.po delete summit/messages/applications/kcmkurifilt.po delete summit/messages/applications/kde-baseapps.desktop.po delete summit/messages/applications/kdepasswd.po delete summit/messages/applications/khtmlkttsd.po delete summit/messages/applications/nsplugin.po delete summit/messages/applications/plasma_applet_folderview.po delete summit/messages/applications/plasma_applet_org.kde.plasma.folder.po delete summit/messages/kdegraphics/okular_tiff.po copy summit/messages/kdewebdev/kdewebdev.desktop.po summit/messages/kdewebdev/kfilereplace.desktop.po copy summit/messages/kdewebdev/kdewebdev.desktop.po summit/messages/kdewebdev/kimagemapeditor.desktop.po copy summit/messages/kdewebdev/kdewebdev.desktop.po summit/messages/kdewebdev/klinkstatus.desktop.po copy summit/messages/kdewebdev/kdewebdev.desktop.po summit/messages/kdewebdev/kommander.desktop.po delete summit/messages/kdewebdev/kdewebdev.desktop.po delete summit/messages/kdeadmin/kuser.po delete summit/messages/kdeadmin/kuser.desktop.po move summit/docmessages/applications/konqueror_man-kbookmarkmerger.1.po summit/docmessages/applications/keditbookmarks_man-kbookmarkmerger.1.po delete summit/messages/pim/kdgantt2_qt.po delete summit/docmessages/kdeadmin/kuser.po move summit/docmessages/kdereview/kioslave5_gdrive.po summit/docmessages/extragear-network/kioslave5_gdrive.po move summit/messages/extragear-network/kio_gopher.po summit/messages/extragear-network/kio5_gopher.po move summit/docmessages/extragear-network/kioslave_gopher.po summit/docmessages/extragear-network/kioslave5_gopher.po move summit/messages/kdereview/kio-gdrive.desktop.po summit/messages/extragear-network/kio-gdrive.desktop.po move summit/messages/kdereview/kio5_gdrive.po summit/messages/extragear-network/kio5_gdrive.po delete summit/messages/playground-multimedia/kubeplayer.po delete summit/messages/playground-multimedia/kubeplayer.desktop.po delete summit/docmessages/extragear-sysadmin/partitionmanager_appendix.po move summit/messages/playground-devtools/kdevcppcheck.po summit/messages/extragear-kdevelop/kdevcppcheck.po merge summit/messages/playground-devtools/kdev-cppcheck.json.po summit/messages/extragear-kdevelop/kdevelop.json.po delete summit/messages/calligra/ArtworkTools.po delete summit/messages/calligra/artwork.po delete summit/messages/calligra/calligraactive.po delete summit/messages/calligra/kdgantt.po delete summit/messages/calligra/kexisqlite3driver.po delete summit/messages/calligra/kexixbasedriver.po delete summit/messages/calligra/koproperty.po delete summit/messages/calligra/koreport_barcodeplugin.po delete summit/messages/calligra/koreport_chartplugin.po delete summit/messages/calligra/koreport_mapsplugin.po delete summit/messages/calligra/koreport_webplugin.po delete summit/messages/calligra/kritacrashhandler.po delete summit/messages/kde-workspace/display.po delete summit/messages/kde-workspace/kblankscrn.po delete summit/messages/kde-workspace/kcm_infosummary.po delete summit/messages/kde-workspace/kcmbackground.po delete summit/messages/kde-workspace/kcmbell.po delete summit/messages/kde-workspace/kcmscreensaver.po delete summit/messages/kde-workspace/kcmsmartcard.po delete summit/messages/kde-workspace/kdmconfig.po delete summit/messages/kde-workspace/kdmgreet.po delete summit/messages/kde-workspace/kgreet_classic.po delete summit/messages/kde-workspace/kgreet_generic.po delete summit/messages/kde-workspace/kgreet_winbind.po delete summit/messages/kde-workspace/krandr.po delete summit/messages/kde-workspace/kscreensaver.po delete summit/messages/kde-workspace/ksplashthemes.po delete summit/messages/kde-workspace/ksystraycmd.po delete summit/messages/kde-workspace/ktouchpadenabler.po delete summit/messages/kde-workspace/kxkb.po delete summit/messages/kde-workspace/libkdecorations.po delete summit/messages/kde-workspace/libkscreensaver.po delete summit/messages/kde-workspace/libplasmaclock.po delete summit/messages/kde-workspace/libtaskmanager.po delete summit/messages/kde-workspace/oxygen_kwin_deco.po delete summit/messages/kde-workspace/plasma-desktop.po delete summit/messages/kde-workspace/plasma-netbook.po delete summit/messages/kde-workspace/plasma-overlay.po delete summit/messages/kde-workspace/plasma-windowed.po delete summit/messages/kde-workspace/plasma_applet_currentappcontrol.po delete summit/messages/kde-workspace/plasma_applet_dig_clock.po delete summit/messages/kde-workspace/plasma_applet_icon.po delete summit/messages/kde-workspace/plasma_applet_launcher.po delete summit/messages/kde-workspace/plasma_applet_netpanel.po delete summit/messages/kde-workspace/plasma_applet_panel.po delete summit/messages/kde-workspace/plasma_applet_panelspacer_internal.po delete summit/messages/kde-workspace/plasma_applet_quicklaunch.po delete summit/messages/kde-workspace/plasma_applet_sal.po delete summit/messages/kde-workspace/plasma_applet_saverdesktop.po delete summit/messages/kde-workspace/plasma_applet_searchbox.po delete summit/messages/kde-workspace/plasma_applet_system-monitor.po delete summit/messages/kde-workspace/plasma_applet_systemtray.po delete summit/messages/kde-workspace/plasma_applet_webbrowser.po delete summit/messages/kde-workspace/plasma_appletscriptengine_dashboard.po delete summit/messages/kde-workspace/plasma_containmentactions_switchactivity.po delete summit/messages/kde-workspace/plasma_containmentactions_switchdesktop.po delete summit/messages/kde-workspace/plasma_engine_metadata.po delete summit/messages/kde-workspace/plasma_engine_nowplaying.po delete summit/messages/kde-workspace/plasma_package_org.kde.desktop.activitymanager.po delete summit/messages/kde-workspace/plasma_package_org.kde.desktop.widgetexplorer.po delete summit/messages/kde-workspace/plasma_runner_nepomuksearchrunner.po delete summit/messages/kde-workspace/plasma_toolbox_desktoptoolbox.po delete summit/messages/kde-workspace/plasma_toolbox_paneltoolbox.po delete summit/messages/kde-workspace/plasma_wallpaper_color.po delete summit/messages/kde-workspace/plasmagenericshell.po delete summit/messages/kde-workspace/randrmonitor.po delete summit/messages/kdeplasma-addons/plasma_applet_BbalL.po delete summit/messages/kdeplasma-addons/plasma_applet_icontasks.po delete summit/messages/kdeplasma-addons/plasma_applet_kdeobservatory.po delete summit/messages/kdeplasma-addons/plasma_applet_nowplaying.po delete summit/messages/kdeplasma-addons/plasma_applet_opendesktop.po delete summit/messages/kdeplasma-addons/plasma_applet_opendesktop_activities.po delete summit/messages/kdeplasma-addons/plasma_applet_paste.po delete summit/messages/kdeplasma-addons/plasma_applet_pastebin.po delete summit/messages/kdeplasma-addons/plasma_applet_rtm.po delete summit/messages/kdeplasma-addons/plasma_applet_showdashboard.po delete summit/messages/kdeplasma-addons/plasma_engine_kdeobservatory.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_mandelbrot.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_marble.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_pattern.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_potd.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_virus.po delete summit/messages/kdeplasma-addons/plasma_wallpaper_weather.po delete summit/docmessages/kde-workspace/PolicyKit-kde.po delete summit/docmessages/kde-workspace/PolicyKit-kde_authorization.po delete summit/docmessages/kde-workspace/PolicyKit-kde_authorizationagent.po delete summit/docmessages/kde-workspace/PolicyKit-kde_howitworks.po delete summit/docmessages/kde-workspace/PolicyKit-kde_introduction.po delete summit/docmessages/kde-workspace/kcontrol_kwincompositing.po delete summit/docmessages/kde-workspace/kcontrol_screensaver.po delete summit/docmessages/kde-workspace/kcontrol_workspaceoptions.po delete summit/docmessages/kde-workspace/kdm.po delete summit/docmessages/kde-workspace/kdm_kdmrc-ref.po delete summit/docmessages/kde-workspace/kdm_theme-ref.po copy summit/messages/playground-sysadmin/systemd-kcm.po summit/messages/playground-sysadmin/systemdgenie.po copy summit/messages/playground-sysadmin/systemd-kcm.desktop.po summit/messages/playground-sysadmin/systemdgenie.desktop.po move summit/messages/extragear-libs/libkirigamiplugin_qt.po summit/messages/extragear-libs/libkirigami2plugin_qt.po delete summit/messages/calligra/keximigrate_spreadsheet.po delete summit/messages/kdereview/kdb_sybasedriver_qt.po delete summit/messages/kdereview/kdb_xbasedriver_qt.po delete summit/messages/extragear-utils/nepomukshell.po delete summit/messages/extragear-utils/nepomukshell.desktop.po delete summit/docmessages/extragear-utils/nepomukshell.po delete summit/messages/playground-devtools/kdev-executebrowser.desktop.po delete summit/docmessages/extragear-graphics/digikam_tool-advrename.po copy summit/messages/kdepim-runtime/kdepim-runtime.desktop.po summit/messages/pim/kdav.desktop.po move summit/messages/playground-base/kcm_plymouth.po summit/messages/kdereview/kcm_plymouth.po move summit/messages/playground-base/plymouth-kcm.desktop.po summit/messages/kdereview/plymouth-kcm.desktop.po move summit/messages/kdereview/kcm_plymouth.po summit/messages/kdereview/plymouth_kcm.po move summit/messages/pim/akonadi_davgroupware_resource.po summit/messages/kdepim-runtime/akonadi_davgroupware_resource.po move summit/messages/pim/kdav.desktop.po summit/messages/kdepim-runtime/kdav.desktop.po delete summit/messages/extragear-graphics/kcoloredit.po delete summit/messages/extragear-graphics/kcoloredit.desktop.po delete summit/docmessages/extragear-graphics/kcoloredit.po delete summit/messages/extragear-graphics/kiconedit.po delete summit/messages/extragear-graphics/kiconedit.desktop.po delete summit/docmessages/extragear-graphics/kiconedit.po delete summit/messages/extragear-graphics/kfax.po delete summit/messages/extragear-graphics/kfax.desktop.po move summit/docmessages/pim/kmail.po summit/docmessages/pim/kmail2.po move summit/docmessages/pim/kmail_configure.po summit/docmessages/pim/kmail2_configure.po move summit/docmessages/pim/kmail_credits-and-licenses.po summit/docmessages/pim/kmail2_credits-and-licenses.po move summit/docmessages/pim/kmail_faq.po summit/docmessages/pim/kmail2_faq.po move summit/docmessages/pim/kmail_getting-started.po summit/docmessages/pim/kmail2_getting-started.po move summit/docmessages/pim/kmail_intro.po summit/docmessages/pim/kmail2_intro.po move summit/docmessages/pim/kmail_menus.po summit/docmessages/pim/kmail2_menus.po move summit/docmessages/pim/kmail_troubleshooting.po summit/docmessages/pim/kmail2_troubleshooting.po move summit/docmessages/pim/kmail_using-kmail.po summit/docmessages/pim/kmail2_using-kmail.po move summit/docmessages/kdesdk/umbrello_welcome.po summit/docmessages/kdesdk/umbrello_apphelp.po delete summit/docmessages/extragear-graphics/digikam_using-camera-gps.po delete summit/docmessages/extragear-graphics/digikam_tool-findduplicates.po delete summit/messages/playground-devtools/kdev-valgrind.desktop.po move summit/messages/kdereview/plasmavault-kded.po summit/messages/kdereview/plasmavault-kde.po move summit/messages/extragear-libs/libkgapi_qt.po summit/messages/pim/libkgapi_qt.po move summit/messages/extragear-multimedia/amarok.appdata.po summit/messages/extragear-multimedia/org.kde.amarok.appdata.po move summit/messages/extragear-network/plasma_applet_smb4k-qml.po summit/messages/extragear-network/plasma_applet_org.kde.smb4kqml.po move summit/docmessages/kdeadmin/kcron.po summit/docmessages/kdeadmin/kcontrol5_kcron.po move summit/messages/kdereview/plasma-vault.desktop.po summit/messages/kde-workspace/plasma-vault.desktop.po move summit/messages/kdereview/plasmavault-kde.po summit/messages/kde-workspace/plasmavault-kde.po move summit/messages/extragear-multimedia/k3b.desktop.po summit/messages/kdemultimedia/k3b.desktop.po move summit/messages/extragear-multimedia/org.kde.k3b.appdata.po summit/messages/kdemultimedia/org.kde.k3b.appdata.po move summit/messages/extragear-multimedia/x-k3b_xml_mimetypes.po summit/messages/kdemultimedia/x-k3b_xml_mimetypes.po move summit/messages/extragear-multimedia/k3b.po summit/messages/kdemultimedia/k3b.po move summit/messages/extragear-multimedia/kio_videodvd.po summit/messages/kdemultimedia/kio_videodvd.po move summit/messages/extragear-multimedia/libk3bdevice.po summit/messages/kdemultimedia/libk3bdevice.po move summit/messages/extragear-multimedia/libk3b.po summit/messages/kdemultimedia/libk3b.po move summit/docmessages/extragear-multimedia/k3b.po summit/docmessages/kdemultimedia/k3b.po delete summit/messages/playground-base/kio-mtp.desktop.po move summit/messages/kde-runtime/attica_kde.po summit/messages/kde-workspace/attica_kde.po move summit/messages/kde-runtime/drkonqi.po summit/messages/kde-workspace/drkonqi.po move summit/messages/kde-runtime/filetypes.po summit/messages/kde-workspace/filetypes.po move summit/messages/kde-runtime/kcm_device_automounter.po summit/messages/kde-workspace/kcm_device_automounter.po move summit/messages/kde-runtime/kcm_emoticons.po summit/messages/kde-workspace/kcm_emoticons.po move summit/messages/kde-runtime/kcm_phonon.po summit/messages/kde-workspace/kcm_phonon.po move summit/messages/kde-runtime/kcmcomponentchooser.po summit/messages/kde-workspace/kcmcomponentchooser.po move summit/messages/kde-runtime/kcmicons.po summit/messages/kde-workspace/kcmicons.po move summit/messages/kde-runtime/kcmkded.po summit/messages/kde-workspace/kcmkded.po move summit/messages/kde-runtime/kcmnotify.po summit/messages/kde-workspace/kcmnotify.po move summit/messages/kde-runtime/kcmshell.po summit/messages/kde-workspace/kcmshell.po move summit/messages/kde-runtime/kde-cli-tools.desktop.po summit/messages/kde-workspace/kde-cli-tools.desktop.po move summit/messages/kde-runtime/kdesu.po summit/messages/kde-workspace/kdesu.po move summit/messages/kde-runtime/khelpcenter.desktop.po summit/messages/applications/khelpcenter.desktop.po move summit/messages/kde-runtime/khelpcenter.po summit/messages/applications/khelpcenter.po move summit/messages/kde-runtime/kio-extras.desktop.po summit/messages/kdenetwork/kio-extras.desktop.po move summit/messages/kde-runtime/kio_applications.po summit/messages/kde-workspace/kio_applications.po move summit/messages/kde-runtime/kio_archive.po summit/messages/kdenetwork/kio_archive.po move summit/messages/kde-runtime/kio_bookmarks.po summit/messages/kdenetwork/kio_bookmarks.po move summit/messages/kde-runtime/kio_fish.po summit/messages/kdenetwork/kio_fish.po move summit/messages/kde-runtime/kio_info.po summit/messages/kdenetwork/kio_info.po move summit/messages/kde-runtime/kio_man.po summit/messages/kdenetwork/kio_man.po move summit/messages/kde-runtime/kio_nfs.po summit/messages/kdenetwork/kio_nfs.po move summit/messages/kde-runtime/kio_recentdocuments.po summit/messages/kdenetwork/kio_recentdocuments.po move summit/messages/kde-runtime/kio_remote.po summit/messages/kde-workspace/kio_remote.po move summit/messages/kde-runtime/kio_sftp.po summit/messages/kdenetwork/kio_sftp.po move summit/messages/kde-runtime/kio_smb.po summit/messages/kdenetwork/kio_smb.po move summit/messages/kde-runtime/kio_thumbnail.po summit/messages/kdenetwork/kio_thumbnail.po move summit/messages/kde-runtime/kioclient.po summit/messages/kde-workspace/kioclient.po move summit/messages/kde-runtime/kmimetypefinder.po summit/messages/kde-workspace/kmimetypefinder.po move summit/messages/kde-runtime/knetattach.po summit/messages/kde-workspace/knetattach.po move summit/messages/kde-runtime/kstart.po summit/messages/kde-workspace/kstart.po move summit/messages/kde-runtime/ktraderclient.po summit/messages/kde-workspace/ktraderclient.po move summit/messages/kde-runtime/kuiserver5.po summit/messages/kde-workspace/kuiserver5.po move summit/messages/kde-runtime/phonon_kde.po summit/messages/kde-workspace/phonon_kde.po move summit/messages/kde-runtime/plasma_engine_devicenotifications.po summit/messages/kde-workspace/plasma_engine_devicenotifications.po move summit/messages/kde-runtime/soliduiserver.po summit/messages/kde-workspace/soliduiserver.po move summit/docmessages/kde-runtime/fundamentals.po summit/docmessages/applications/fundamentals.po move summit/docmessages/kde-runtime/fundamentals_config.po summit/docmessages/applications/fundamentals_config.po move summit/docmessages/kde-runtime/fundamentals_install.po summit/docmessages/applications/fundamentals_install.po move summit/docmessages/kde-runtime/fundamentals_tasks.po summit/docmessages/applications/fundamentals_tasks.po move summit/docmessages/kde-runtime/fundamentals_ui.po summit/docmessages/applications/fundamentals_ui.po move summit/docmessages/kde-runtime/glossary.po summit/docmessages/applications/glossary.po move summit/docmessages/kde-runtime/glossary_kdeprintingglossary.po summit/docmessages/applications/glossary_kdeprintingglossary.po move summit/docmessages/kde-runtime/kcontrol5_bookmarks.po summit/docmessages/kde-workspace/kcontrol5_bookmarks.po move summit/docmessages/kde-runtime/kcontrol5_filemanager.po summit/docmessages/kde-workspace/kcontrol5_filemanager.po move summit/docmessages/kde-runtime/kcontrol5_filetypes.po summit/docmessages/kde-workspace/kcontrol5_filetypes.po move summit/docmessages/kde-runtime/kcontrol5_history.po summit/docmessages/kde-workspace/kcontrol5_history.po move summit/docmessages/kde-runtime/kcontrol5_kcmcss.po summit/docmessages/kde-workspace/kcontrol5_kcmcss.po move summit/docmessages/kde-runtime/kcontrol5_khtml-adblock.po summit/docmessages/kde-workspace/kcontrol5_khtml-adblock.po move summit/docmessages/kde-runtime/kcontrol5_khtml-behavior.po summit/docmessages/kde-workspace/kcontrol5_khtml-behavior.po move summit/docmessages/kde-runtime/kcontrol5_khtml-general.po summit/docmessages/kde-workspace/kcontrol5_khtml-general.po move summit/docmessages/kde-runtime/kcontrol5_khtml-java-js.po summit/docmessages/kde-workspace/kcontrol5_khtml-java-js.po move summit/docmessages/kde-runtime/kcontrol5_performance.po summit/docmessages/kde-workspace/kcontrol5_performance.po move summit/docmessages/kde-runtime/kcontrol_componentchooser.po summit/docmessages/kde-workspace/kcontrol_componentchooser.po move summit/docmessages/kde-runtime/kcontrol_emoticons.po summit/docmessages/kde-workspace/kcontrol_emoticons.po move summit/docmessages/kde-runtime/kcontrol_icons.po summit/docmessages/kde-workspace/kcontrol_icons.po move summit/docmessages/kde-runtime/kcontrol_kcmlaunch.po summit/docmessages/kde-workspace/kcontrol_kcmlaunch.po move summit/docmessages/kde-runtime/kcontrol_kcmnotify.po summit/docmessages/kde-workspace/kcontrol_kcmnotify.po move summit/docmessages/kde-runtime/kcontrol_kded.po summit/docmessages/kde-workspace/kcontrol_kded.po move summit/docmessages/kde-runtime/kcontrol_khtml-plugins.po summit/docmessages/kde-workspace/kcontrol_khtml-plugins.po move summit/docmessages/kde-runtime/kcontrol_phonon.po summit/docmessages/kde-workspace/kcontrol_phonon.po move summit/docmessages/kde-runtime/kcontrol_solid-device-automounter.po summit/docmessages/kde-workspace/kcontrol_solid-device-automounter.po move summit/docmessages/kde-runtime/kcontrol_spellchecking.po summit/docmessages/kde-workspace/kcontrol_spellchecking.po move summit/docmessages/kde-runtime/kdesu.po summit/docmessages/kde-workspace/kdesu.po move summit/docmessages/kde-runtime/kdesu_man-kdesu.1.po summit/docmessages/kde-workspace/kdesu_man-kdesu.1.po move summit/docmessages/kde-runtime/khelpcenter.po summit/docmessages/applications/khelpcenter.po move summit/docmessages/kde-runtime/kioslave5_bookmarks.po summit/docmessages/kdenetwork/kioslave5_bookmarks.po move summit/docmessages/kde-runtime/kioslave5_bzip2.po summit/docmessages/kdenetwork/kioslave5_bzip2.po move summit/docmessages/kde-runtime/kioslave5_fish.po summit/docmessages/kdenetwork/kioslave5_fish.po move summit/docmessages/kde-runtime/kioslave5_gzip.po summit/docmessages/kdenetwork/kioslave5_gzip.po move summit/docmessages/kde-runtime/kioslave5_info.po summit/docmessages/kdenetwork/kioslave5_info.po move summit/docmessages/kde-runtime/kioslave5_man.po summit/docmessages/kdenetwork/kioslave5_man.po move summit/docmessages/kde-runtime/kioslave5_network.po summit/docmessages/kdenetwork/kioslave5_network.po move summit/docmessages/kde-runtime/kioslave5_nfs.po summit/docmessages/kdenetwork/kioslave5_nfs.po move summit/docmessages/kde-runtime/kioslave5_sftp.po summit/docmessages/kdenetwork/kioslave5_sftp.po move summit/docmessages/kde-runtime/kioslave5_smb.po summit/docmessages/kdenetwork/kioslave5_smb.po move summit/docmessages/kde-runtime/kioslave5_tar.po summit/docmessages/kdenetwork/kioslave5_tar.po move summit/docmessages/kde-runtime/kioslave5_thumbnail.po summit/docmessages/kdenetwork/kioslave5_thumbnail.po move summit/docmessages/kde-runtime/kioslave5_xz.po summit/docmessages/kdenetwork/kioslave5_xz.po move summit/docmessages/kde-runtime/knetattach.po summit/docmessages/kde-workspace/knetattach.po move summit/docmessages/kde-runtime/onlinehelp.po summit/docmessages/applications/onlinehelp.po move summit/messages/kdesdk/kio_perldoc.po summit/messages/kdesdk/kio5_perldoc.po # Applications 16.12 -> 17.04 delete summit/messages/kdesdk/kdesdk-kioslaves.desktop.po delete summit/messages/kdesdk/kio_svn.po delete summit/messages/kdesdk/kstartperf.po delete summit/messages/kdewebdev/kommander.desktop.po delete summit/messages/kdewebdev/kommander.po delete summit/messages/pim/pim-storage-service-manager.desktop.po delete summit/messages/pim/storageservicemanager.po delete summit/docmessages/kdeedu/kstars_install.po delete summit/docmessages/kdesdk/kmtrace_man-demangle.1.po delete summit/docmessages/kdewebdev/kommander.po delete summit/docmessages/kdewebdev/kommander_basics.po delete summit/docmessages/kdewebdev/kommander_commands.po delete summit/docmessages/kdewebdev/kommander_credits.po delete summit/docmessages/kdewebdev/kommander_dcop.po delete summit/docmessages/kdewebdev/kommander_editor.po delete summit/docmessages/kdewebdev/kommander_extending.po delete summit/docmessages/kdewebdev/kommander_glossary.po delete summit/docmessages/kdewebdev/kommander_installation.po delete summit/docmessages/kdewebdev/kommander_introduction.po delete summit/docmessages/kdewebdev/kommander_q-and-a.po delete summit/docmessages/kdewebdev/kommander_specials.po delete summit/docmessages/kdewebdev/kommander_tutorials.po delete summit/docmessages/kdewebdev/kommander_widgets.po delete summit/docmessages/pim/kontact-admin.po delete summit/messages/playground-network/libringclient_qt.po delete summit/messages/playground-network/ring-kde_qt.po move summit/messages/playground-network/ring-kde.desktop.po summit/messages/playground-pim/ring-kde.desktop.po move summit/messages/playground-network/ring-kde.po summit/messages/playground-pim/ring-kde.po move summit/docmessages/playground-network/ring-kde.po summit/docmessages/playground-pim/ring-kde.po move summit/docmessages/playground-network/ring-kde_advanced-use.po summit/docmessages/playground-pim/ring-kde_advanced-use.po move summit/docmessages/playground-network/ring-kde_basic-use.po summit/docmessages/playground-pim/ring-kde_basic-use.po move summit/docmessages/playground-network/ring-kde_common-use.po summit/docmessages/playground-pim/ring-kde_common-use.po move summit/docmessages/playground-network/ring-kde_credits.po summit/docmessages/playground-pim/ring-kde_credits.po move summit/docmessages/playground-network/ring-kde_getting-started.po summit/docmessages/playground-pim/ring-kde_getting-started.po move summit/docmessages/playground-network/ring-kde_introduction.po summit/docmessages/playground-pim/ring-kde_introduction.po move summit/docmessages/playground-network/ring-kde_man-ring-kde.1.po summit/docmessages/playground-pim/ring-kde_man-ring-kde.1.po delete summit/messages/wikitolearn/contribute0.po move summit/messages/pim/org.kde.kmail.appdata.po summit/messages/pim/org.kde.kmail2.appdata.po move summit/messages/extragear-sysadmin/org.kde.PartitionManager.appdata.po summit/messages/extragear-sysadmin/org.kde.partitionmanager.appdata.po move summit/messages/kdereview/imagewriter.po summit/messages/kdereview/isoimagewriter.po move summit/messages/kdereview/org.kde.imagewriter.appdata.po summit/messages/kdereview/org.kde.isoimagewriter.appdata.po move summit/messages/wikitolearn/guide.po summit/messages/wikitolearn/pages_id.po move summit/messages/wikitolearn/wtl-messages.po summit/messages/wikitolearn/project_messages.po move summit/messages/wikitolearn/courseeditor.po summit/messages/wikitolearn/CourseEditor.po move summit/messages/wikitolearn/skin.po summit/messages/wikitolearn/WikiToLearnSkin.po move summit/messages/applications/khelpcenter.po summit/messages/applications/khelpcenter5.po move summit/messages/kdelibs/baloowidgets.po summit/messages/kdelibs/baloowidgets5.po move summit/messages/frameworks/kfilemetadata.po summit/messages/frameworks/kfilemetadata5.po move summit/messages/kdenetwork/kio_archive.po summit/messages/kdenetwork/kio5_archive.po move summit/messages/kdenetwork/kio_bookmarks.po summit/messages/kdenetwork/kio5_bookmarks.po move summit/messages/kdenetwork/kio_fish.po summit/messages/kdenetwork/kio5_fish.po move summit/messages/kdenetwork/kio_info.po summit/messages/kdenetwork/kio5_info.po move summit/messages/kdenetwork/kio_man.po summit/messages/kdenetwork/kio5_man.po move summit/messages/kdenetwork/kio_mtp.po summit/messages/kdenetwork/kio5_mtp.po move summit/messages/kdenetwork/kio_nfs.po summit/messages/kdenetwork/kio5_nfs.po move summit/messages/kdenetwork/kio_recentdocuments.po summit/messages/kdenetwork/kio5_recentdocuments.po move summit/messages/kdenetwork/kio_sftp.po summit/messages/kdenetwork/kio5_sftp.po move summit/messages/kdenetwork/kio_smb.po summit/messages/kdenetwork/kio5_smb.po move summit/messages/kdenetwork/kio_thumbnail.po summit/messages/kdenetwork/kio5_thumbnail.po move summit/messages/kdelibs/akonadi_baloo_indexer.po summit/messages/pim/akonadi_search.po move summit/messages/kdelibs/baloo_naturalqueryparser.po summit/messages/applications/baloo_naturalqueryparser.po move summit/messages/kdelibs/baloowidgets5.po summit/messages/applications/baloowidgets5.po move summit/messages/kdelibs/kactivities5.po summit/messages/kde-workspace/kactivities5.po move summit/messages/kdelibs/kcm_baloofile.po summit/messages/kde-workspace/kcm_baloofile.po move summit/messages/kdelibs/kfileaudiopreview5.po summit/messages/kdenetwork/kfileaudiopreview5.po move summit/messages/kdelibs/plasma_runner_baloosearchrunner.po summit/messages/kde-workspace/plasma_runner_baloosearchrunner.po move summit/messages/frameworks/baloo_file_extractor.po summit/messages/frameworks/baloo_file_extractor5.po move summit/messages/frameworks/baloo_file.po summit/messages/frameworks/baloo_file5.po move summit/messages/frameworks/baloosearch.po summit/messages/frameworks/baloosearch5.po move summit/messages/frameworks/balooshow.po summit/messages/frameworks/balooshow5.po move summit/messages/frameworks/balooctl.po summit/messages/frameworks/balooctl5.po move summit/messages/frameworks/kio_baloosearch.po summit/messages/frameworks/kio5_baloosearch.po move summit/messages/frameworks/kio_tags.po summit/messages/frameworks/kio5_tags.po move summit/messages/frameworks/kio_timeline.po summit/messages/frameworks/kio5_timeline.po move summit/messages/kdereview/imagewriter.desktop.po summit/messages/extragear-utils/isoimagewriter.desktop.po move summit/messages/kdereview/isoimagewriter.po summit/messages/extragear-utils/isoimagewriter.po move summit/messages/kdereview/org.kde.isoimagewriter.appdata.po summit/messages/extragear-utils/org.kde.isoimagewriter.appdata.po move summit/messages/kdepim-runtime/accountwizard_contacts.po summit/messages/pim/accountwizard_contacts.po move summit/messages/kdepim-runtime/accountwizard_ical.po summit/messages/pim/accountwizard_ical.po move summit/messages/kdepim-runtime/accountwizard_imap.po summit/messages/pim/accountwizard_imap.po move summit/messages/kdepim-runtime/accountwizard_kolab.po summit/messages/pim/accountwizard_kolab.po move summit/messages/kdepim-runtime/accountwizard_mailbox.po summit/messages/pim/accountwizard_mailbox.po move summit/messages/kdepim-runtime/accountwizard_maildir.po summit/messages/pim/accountwizard_maildir.po move summit/messages/kdepim-runtime/accountwizard_pop3.po summit/messages/pim/accountwizard_pop3.po move summit/messages/kdepim-runtime/accountwizard_vcarddir.po summit/messages/pim/accountwizard_vcarddir.po move summit/messages/kdepim-runtime/accountwizard_vcard.po summit/messages/pim/accountwizard_vcard.po move summit/messages/kdepim-runtime/akonadi_birthdays_resource.po summit/messages/pim/akonadi_birthdays_resource.po move summit/messages/kdepim-runtime/akonadi_contacts_resource.po summit/messages/pim/akonadi_contacts_resource.po move summit/messages/kdepim-runtime/akonadi_davgroupware_resource.po summit/messages/pim/akonadi_davgroupware_resource.po move summit/messages/kdepim-runtime/akonadi-filestore.po summit/messages/pim/akonadi-filestore.po move summit/messages/kdepim-runtime/akonadi_gmail_resource.po summit/messages/pim/akonadi_gmail_resource.po move summit/messages/kdepim-runtime/akonadi_googlecalendar_resource.po summit/messages/pim/akonadi_googlecalendar_resource.po move summit/messages/kdepim-runtime/akonadi_googlecontacts_resource.po summit/messages/pim/akonadi_googlecontacts_resource.po move summit/messages/kdepim-runtime/akonadi_icaldir_resource.po summit/messages/pim/akonadi_icaldir_resource.po move summit/messages/kdepim-runtime/akonadi_ical_resource.po summit/messages/pim/akonadi_ical_resource.po move summit/messages/kdepim-runtime/akonadi_imap_resource.po summit/messages/pim/akonadi_imap_resource.po move summit/messages/kdepim-runtime/akonadi_invitations_agent.po summit/messages/pim/akonadi_invitations_agent.po move summit/messages/kdepim-runtime/akonadi_kalarm_resource.po summit/messages/pim/akonadi_kalarm_resource.po move summit/messages/kdepim-runtime/akonadi_maildir_resource.po summit/messages/pim/akonadi_maildir_resource.po move summit/messages/kdepim-runtime/akonadi_maildispatcher_agent.po summit/messages/pim/akonadi_maildispatcher_agent.po move summit/messages/kdepim-runtime/akonadi_mbox_resource.po summit/messages/pim/akonadi_mbox_resource.po move summit/messages/kdepim-runtime/akonadi_migration_agent.po summit/messages/pim/akonadi_migration_agent.po move summit/messages/kdepim-runtime/akonadi_mixedmaildir_resource.po summit/messages/pim/akonadi_mixedmaildir_resource.po move summit/messages/kdepim-runtime/akonadi_newmailnotifier_agent.po summit/messages/pim/akonadi_newmailnotifier_agent.po move summit/messages/kdepim-runtime/akonadi_openxchange_resource.po summit/messages/pim/akonadi_openxchange_resource.po move summit/messages/kdepim-runtime/akonadi_pop3_resource.po summit/messages/pim/akonadi_pop3_resource.po move summit/messages/kdepim-runtime/akonadi_serializer_plugins.po summit/messages/pim/akonadi_serializer_plugins.po move summit/messages/kdepim-runtime/akonadi_singlefile_resource.po summit/messages/pim/akonadi_singlefile_resource.po move summit/messages/kdepim-runtime/akonadi_tomboynotes_resource.po summit/messages/pim/akonadi_tomboynotes_resource.po move summit/messages/kdepim-runtime/akonadi_vcarddir_resource.po summit/messages/pim/akonadi_vcarddir_resource.po move summit/messages/kdepim-runtime/akonadi_vcard_resource.po summit/messages/pim/akonadi_vcard_resource.po move summit/messages/kdepim-runtime/kdepim-runtime.desktop.po summit/messages/pim/kdepim-runtime.desktop.po move summit/messages/kdepim-runtime/gid-migrator.po summit/messages/pim/gid-migrator.po move summit/messages/kdepim-runtime/kio_akonadi.po summit/messages/pim/kio_akonadi.po move summit/messages/kdepim-runtime/kio_pop3.po summit/messages/pim/kio_pop3.po move summit/messages/kdepim-runtime/libfolderarchivesettings.po summit/messages/pim/libfolderarchivesettings.po move summit/docmessages/kdepim-runtime/kioslave5_pop3.po summit/docmessages/pim/kioslave5_pop3.po delete summit/messages/kdepim-runtime/kdav.desktop.po move summit/messages/kdereview/plymouth_kcm.po summit/messages/kde-workspace/kcm_plymouth.po move summit/messages/kdereview/plymouth-kcm.desktop.po summit/messages/kde-workspace/plymouth-kcm.desktop.po move summit/messages/kde-workspace/filetypes.po summit/messages/kde-workspace/kcm5_filetypes.po move summit/messages/kde-workspace/kcmshell.po summit/messages/kde-workspace/kcmshell5.po move summit/messages/kde-workspace/kdesu.po summit/messages/kde-workspace/kdesu5.po move summit/messages/kde-workspace/kioclient.po summit/messages/kde-workspace/kioclient5.po move summit/messages/kde-workspace/kmimetypefinder.po summit/messages/kde-workspace/kmimetypefinder5.po move summit/messages/kde-workspace/kstart.po summit/messages/kde-workspace/kstart5.po move summit/messages/kde-workspace/ktraderclient.po summit/messages/kde-workspace/ktraderclient5.po move summit/messages/kde-workspace/drkonqi.po summit/messages/kde-workspace/drkonqi5.po move summit/messages/kde-workspace/kio_applications.po summit/messages/kde-workspace/kio5_applications.po move summit/messages/kde-workspace/plasma_runner_baloosearchrunner.po summit/messages/kde-workspace/plasma_runner_baloosearch5.po move summit/messages/kde-workspace/phonon_kde.po summit/messages/kde-workspace/phonon_kde_plugin.po move summit/messages/kde-workspace/soliduiserver.po summit/messages/kde-workspace/soliduiserver5.po move summit/messages/kde-workspace/attica_kde.po summit/messages/kde-workspace/attica_kde_plugin.po move summit/messages/kde-workspace/kcmcomponentchooser.po summit/messages/kde-workspace/kcm5_componentchooser.po move summit/messages/kde-workspace/kcm_baloofile.po summit/messages/kde-workspace/kcm5_baloofile.po move summit/messages/kde-workspace/kcm_device_automounter.po summit/messages/kde-workspace/kcm5_device_automounter.po move summit/messages/kde-workspace/kcm_emoticons.po summit/messages/kde-workspace/kcm5_emoticons.po move summit/messages/kde-workspace/kcmicons.po summit/messages/kde-workspace/kcm5_icons.po move summit/messages/kde-workspace/kcmkded.po summit/messages/kde-workspace/kcm5_kded.po move summit/messages/kde-workspace/kcmnotify.po summit/messages/kde-workspace/kcm5_notify.po move summit/messages/kde-workspace/kcm_phonon.po summit/messages/kde-workspace/kcm5_phonon.po move summit/messages/kde-workspace/knetattach.po summit/messages/kde-workspace/knetattach5.po move summit/messages/kde-workspace/plasma_applet_binaryclock.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.binaryclock.po move summit/messages/playground-pim/libksmtp.po summit/messages/playground-pim/libksmtp5.po move summit/messages/playground-pim/libksmtp5.po summit/messages/kdereview/libksmtp5.po move summit/messages/extragear-graphics/kgraphviewer.appdata.po summit/messages/extragear-graphics/org.kde.kgraphviewer.appdata.po move summit/messages/extragear-graphics/kgraphviewer.metainfo.po summit/messages/extragear-graphics/org.kde.libkgraphviewer.metainfo.po move summit/messages/kdereview/xdg-desktop-portal-kde.po summit/messages/kde-workspace/xdg-desktop-portal-kde.po copy summit/messages/kde-workspace/plasma-sdk.desktop.po summit/messages/playground-sdk/plasmate.desktop.po move summit/messages/kde-workspace/plasma-sdk.json.po summit/messages/playground-sdk/plasmate.json.po move summit/messages/kde-workspace/kdevpackagemanagerview.po summit/messages/playground-sdk/kdevpackagemanagerview.po move summit/messages/kde-workspace/plasmate.po summit/messages/playground-sdk/plasmate.po move summit/messages/playground-sdk/kdevpackagemanagerview.po summit/messages/kde-workspace/kdevpackagemanagerview.po move summit/messages/playground-sdk/plasmate.po summit/messages/kde-workspace/plasmate.po move summit/messages/playground-sdk/plasmate.json.po summit/messages/kde-workspace/plasmate.json.po move summit/messages/playground-pim/zanshin_qt.po summit/messages/kdereview/zanshin_qt.po move summit/messages/playground-pim/zanshin.desktop.po summit/messages/kdereview/zanshin.desktop.po move summit/messages/playground-pim/org.kde.zanshin.appdata.po summit/messages/kdereview/org.kde.zanshin.appdata.po move summit/messages/playground-base/qtcurve.po summit/messages/kdereview/qtcurve.po move summit/messages/playground-base/qtcurve.desktop.po summit/messages/kdereview/qtcurve.desktop.po move summit/messages/playground-multimedia/elisa.po summit/messages/kdereview/elisa.po move summit/messages/playground-multimedia/elisa.desktop.po summit/messages/kdereview/elisa.desktop.po move summit/messages/playground-multimedia/org.kde.elisa.appdata.po summit/messages/kdereview/org.kde.elisa.appdata.po delete summit/messages/playground-devtools/kdev-crossfire.desktop.po delete summit/messages/playground-devtools/kdev-java.desktop.po delete summit/messages/playground-devtools/kdev-sql.desktop.po delete summit/messages/playground-devtools/kdev-xml.desktop.po delete summit/messages/playground-devtools/kdev-xtest.desktop.po delete summit/messages/playground-devtools/kdevcrossfire.po delete summit/messages/playground-devtools/kdevjava.po delete summit/messages/playground-devtools/kdevsql.po delete summit/messages/playground-devtools/kdevxml.po delete summit/messages/playground-devtools/kdevxtest.po move summit/messages/kdereview/zanshin_qt.po summit/messages/kdereview/zanshin.po move summit/messages/kdereview/kio-stash.json.po summit/messages/extragear-utils/kio-stash.json.po move summit/messages/extragear-libs/kirigami.desktop.po summit/messages/frameworks/kirigami.desktop.po move summit/messages/extragear-libs/libkirigami2plugin_qt.po summit/messages/frameworks/libkirigami2plugin_qt.po move summit/messages/extragear-kdevelop/kdevphp.po summit/messages/kdesdk/kdevphp.po move summit/messages/kdereview/org.kde.renku.appdata.po summit/messages/extragear-pim/org.kde.renku.appdata.po move summit/messages/kdereview/org.kde.zanshin.appdata.po summit/messages/extragear-pim/org.kde.zanshin.appdata.po move summit/messages/kdereview/zanshin.desktop.po summit/messages/extragear-pim/zanshin.desktop.po move summit/messages/kdereview/zanshin.po summit/messages/extragear-pim/zanshin.po move summit/docmessages/frameworks/meinproc5_man-meinproc5.8.po summit/docmessages/frameworks/meinproc5_man-meinproc5.1.po move summit/messages/kdereview/plasma-browser-extension.po summit/messages/kde-workspace/plasma-browser-extension.po move summit/messages/kdereview/plasma-browser-integration.desktop.po summit/messages/kde-workspace/plasma-browser-integration.desktop.po move summit/messages/kdereview/plasma_runner_browsertabs.po summit/messages/kde-workspace/plasma_runner_browsertabs.po move summit/messages/playground-graphics/libkscan.po summit/messages/playground-graphics/libkookascan.po move summit/messages/kdereview/atcore.desktop.po summit/messages/extragear-base/atcore.desktop.po move summit/messages/kdereview/kuserfeedback.desktop.po summit/messages/extragear-libs/kuserfeedback.desktop.po move summit/messages/kdereview/userfeedbackconsole5_qt.po summit/messages/extragear-libs/userfeedbackconsole5_qt.po move summit/messages/kdereview/userfeedbackprovider5_qt.po summit/messages/extragear-libs/userfeedbackprovider5_qt.po move summit/messages/kdereview/libksmtp5.po summit/messages/pim/libksmtp5.po move summit/messages/kdesdk/kdevphp.po summit/messages/extragear-kdevelop/kdevphp.po move summit/messages/extragear-kdevelop/kdevphp.po summit/messages/kdesdk/kdevphp.po merge summit/messages/extragear-base/kde-nm-connection-editor.po summit/messages/kde-workspace/kde5-nm-connection-editor.po move summit/messages/playground-pim/cx.ring.ring-kde.appdata.po summit/messages/kdereview/cx.ring.ring-kde.appdata.po move summit/messages/playground-pim/ring-kde.desktop.po summit/messages/kdereview/ring-kde.desktop.po move summit/messages/playground-pim/ring-kde.po summit/messages/kdereview/ring-kde.po move summit/docmessages/playground-pim/ring-kde.po summit/docmessages/kdereview/ring-kde.po move summit/docmessages/playground-pim/ring-kde_advanced-use.po summit/docmessages/kdereview/ring-kde_advanced-use.po move summit/docmessages/playground-pim/ring-kde_basic-use.po summit/docmessages/kdereview/ring-kde_basic-use.po move summit/docmessages/playground-pim/ring-kde_common-use.po summit/docmessages/kdereview/ring-kde_common-use.po move summit/docmessages/playground-pim/ring-kde_credits.po summit/docmessages/kdereview/ring-kde_credits.po move summit/docmessages/playground-pim/ring-kde_getting-started.po summit/docmessages/kdereview/ring-kde_getting-started.po move summit/docmessages/playground-pim/ring-kde_introduction.po summit/docmessages/kdereview/ring-kde_introduction.po move summit/docmessages/playground-pim/ring-kde_man-ring-kde.1.po summit/docmessages/kdereview/ring-kde_man-ring-kde.1.po move summit/messages/kdereview/elisa.desktop.po summit/messages/playground-multimedia/elisa.desktop.po move summit/messages/kdereview/elisa.po summit/messages/playground-multimedia/elisa.po move summit/messages/kdereview/org.kde.elisa.appdata.po summit/messages/playground-multimedia/org.kde.elisa.appdata.po move summit/docmessages/kdereview/elisa.po summit/docmessages/playground-multimedia/elisa.po move summit/messages/kdereview/kdb.json.po summit/messages/extragear-libs/kdb.json.po move summit/messages/kdereview/kdb_mysqldriver_qt.po summit/messages/extragear-libs/kdb_mysqldriver_qt.po move summit/messages/kdereview/kdb_postgresqldriver_qt.po summit/messages/extragear-libs/kdb_postgresqldriver_qt.po move summit/messages/kdereview/kdb_qt.po summit/messages/extragear-libs/kdb_qt.po move summit/messages/kdereview/kdb_sqlitedriver_qt.po summit/messages/extragear-libs/kdb_sqlitedriver_qt.po move summit/messages/kdereview/kproperty_qt.po summit/messages/extragear-libs/kproperty_qt.po move summit/messages/kdereview/kreport.desktop.po summit/messages/extragear-libs/kreport.desktop.po move summit/messages/kdereview/kreport.json.po summit/messages/extragear-libs/kreport.json.po move summit/messages/kdereview/kreport_barcodeplugin_qt.po summit/messages/extragear-libs/kreport_barcodeplugin_qt.po move summit/messages/kdereview/kreport_chartplugin_qt.po summit/messages/extragear-libs/kreport_chartplugin_qt.po move summit/messages/kdereview/kreport_mapsplugin_qt.po summit/messages/extragear-libs/kreport_mapsplugin_qt.po move summit/messages/kdereview/kreport_qt.po summit/messages/extragear-libs/kreport_qt.po move summit/messages/kdereview/kreport_webplugin_qt.po summit/messages/extragear-libs/kreport_webplugin_qt.po move summit/messages/extragear-base/plasma_applet_tabletsettings.po summit/messages/extragear-base/plasma_applet_org.kde.wacomtablet.po copy summit/messages/extragear-kdevelop/kdevplatform.po summit/messages/extragear-kdevelop/kdevsourceformatter.po delete summit/messages/kdesdk/kapptemplate.json.po move summit/messages/pim/importwizard.po summit/messages/pim/akonadiimportwizard.po delete summit/messages/kdereview/active-addons.po delete summit/messages/kdereview/bodega-client.desktop.po delete summit/messages/kdereview/bodega_qt.po delete summit/messages/kdereview/kded_bodegaupdater.po delete summit/messages/kdereview/kor.desktop.po delete summit/messages/kdereview/kor.po delete summit/messages/kdereview/plasma_package_com.makeplaylive.addonsapp.po delete summit/messages/kdereview/plasma_package_com.makeplaylive.primavera.po delete summit/messages/kdereview/primavera.po move summit/messages/extragear-network/libktorrent.po summit/messages/extragear-network/libktorrent5.po move summit/messages/kdenetwork/kio_zeroconf.po summit/messages/kdenetwork/kio5_zeroconf.po delete summit/messages/extragear-network/kio_magnet.po move summit/messages/kdereview/kmarkdownwebview.desktop.po summit/messages/extragear-utils/kmarkdownwebview.desktop.po move summit/messages/kdereview/kmarkdownwebview.po summit/messages/extragear-utils/kmarkdownwebview.po move summit/messages/kdereview/org.kde.kmarkdownwebviewpart.appdata.po summit/messages/extragear-utils/org.kde.kmarkdownwebviewpart.appdata.po move summit/messages/kdereview/qtcurve.desktop.po summit/messages/extragear-base/qtcurve.desktop.po move summit/messages/kdereview/qtcurve.po summit/messages/extragear-base/qtcurve.po copy summit/messages/extragear-kdevelop/kdevformatters.po summit/messages/extragear-kdevelop/kdevastyle.po copy summit/messages/extragear-kdevelop/kdevformatters.po summit/messages/extragear-kdevelop/kdevcustomscript.po move summit/messages/playground-devtools/kdev-xdebug.desktop.po summit/messages/playground-devtools/kdev-xdebug.json.po move summit/messages/playground-base/latte-dock.po summit/messages/kdereview/latte-dock.po move summit/messages/playground-base/latte-dock.desktop.po summit/messages/kdereview/latte-dock.desktop.po move summit/messages/playground-base/org.kde.latte-dock.appdata.po summit/messages/kdereview/org.kde.latte-dock.appdata.po move summit/messages/playground-base/plasma_applet_audoban.applet.separator.po summit/messages/kdereview/plasma_applet_audoban.applet.separator.po move summit/messages/playground-base/plasma_applet_org.kde.latte.containment.po summit/messages/kdereview/plasma_applet_org.kde.latte.containment.po move summit/messages/playground-base/plasma_applet_org.kde.latte.plasmoid.po summit/messages/kdereview/plasma_applet_org.kde.latte.plasmoid.po move summit/messages/playground-base/plasma_applet_org.kde.latte.spacer.po summit/messages/kdereview/plasma_applet_org.kde.latte.spacer.po delete summit/messages/frameworks/plasma_runner_example_homefiles.po move summit/messages/kdereview/cx.ring.ring-kde.appdata.po summit/messages/kdereview/org.kde.ring-kde.appdata.po copy summit/messages/pim/akonadicontact5.po summit/messages/pim/kaddressbook_contacteditor.po move summit/messages/calligra/krita.desktop.po summit/messages/extragear-graphics/krita.desktop.po move summit/messages/calligra/krita.po summit/messages/extragear-graphics/krita.po move summit/messages/calligra/org.kde.krita.appdata.po summit/messages/extragear-graphics/org.kde.krita.appdata.po copy summit/messages/extragear-libs/kproperty_qt.po summit/messages/extragear-libs/kpropertycore_qt.po move summit/messages/extragear-libs/kproperty_qt.po summit/messages/extragear-libs/kpropertywidgets_qt.po move summit/messages/kdereview/latte-dock.desktop.po summit/messages/extragear-base/latte-dock.desktop.po move summit/messages/kdereview/latte-dock.po summit/messages/extragear-base/latte-dock.po move summit/messages/kdereview/org.kde.latte-dock.appdata.po summit/messages/extragear-base/org.kde.latte-dock.appdata.po move summit/messages/kdereview/plasma_applet_audoban.applet.separator.po summit/messages/extragear-base/plasma_applet_audoban.applet.separator.po move summit/messages/kdereview/plasma_applet_org.kde.latte.containment.po summit/messages/extragear-base/plasma_applet_org.kde.latte.containment.po move summit/messages/kdereview/plasma_applet_org.kde.latte.plasmoid.po summit/messages/extragear-base/plasma_applet_org.kde.latte.plasmoid.po move summit/messages/kdereview/plasma_applet_org.kde.latte.spacer.po summit/messages/extragear-base/plasma_applet_org.kde.latte.spacer.po copy summit/messages/kde-workspace/plasma_applet_org.kde.plasma.kicker.po summit/messages/kdereview/plasma_applet_org.kde.plasma.simplemenu.po move summit/messages/playground-base/ktexteditorpreviewplugin.json.po summit/messages/applications/ktexteditorpreviewplugin.json.po move summit/messages/playground-base/ktexteditorpreviewplugin.po summit/messages/applications/ktexteditorpreviewplugin.po delete summit/messages/playground-base/org.kde.ktexteditorpreviewplugin.appdata.po move summit/messages/applications/ktexteditorpreviewplugin.json.po summit/messages/applications/kate.json.po delete summit/messages/kdereview/or.qupzilla.QupZilla.appdata.po delete summit/messages/kde-runtime/audiorename_plugin.po delete summit/messages/kde-runtime/htmlsearch.po delete summit/messages/kde-runtime/imagerename_plugin.po delete summit/messages/kde-runtime/kcm_attica.po delete summit/messages/kde-runtime/kcm_nepomuk.po delete summit/messages/kde-runtime/kcmcgi.po delete summit/messages/kde-runtime/kcmhtmlsearch.po delete summit/messages/kde-runtime/kcmkdnssd.po delete summit/messages/kde-runtime/kcmlocale.po delete summit/messages/kde-runtime/kde-menu.po delete summit/messages/kde-runtime/kdontchangethehostname.po delete summit/messages/kde-runtime/kfile.po delete summit/messages/kde-runtime/kglobalaccel5.po delete summit/messages/kde-runtime/khotnewstuff.po delete summit/messages/kde-runtime/kiconfinder.po delete summit/messages/kde-runtime/kio_finger.po delete summit/messages/kde-runtime/kio_floppy.po delete summit/messages/kde-runtime/kio_nepomuk.po delete summit/messages/kde-runtime/kio_nepomuksearch.po delete summit/messages/kde-runtime/kio_nepomuktags.po delete summit/messages/kde-runtime/kio_nepomuktimeline.po delete summit/messages/kde-runtime/knotify4.po delete summit/messages/kde-runtime/kpasswdserver.po delete summit/messages/kde-runtime/kreadconfig.po delete summit/messages/kde-runtime/kwriteconfig.po delete summit/messages/kde-runtime/phononserver.po delete summit/messages/kde-runtime/plasma-remote-helper.po delete summit/messages/kde-runtime/plasma_applet_newspaper.po delete summit/messages/kde-runtime/plasma_scriptengine_qscript.po delete summit/messages/kde-runtime/solid-hardware.po delete summit/messages/kdelibs/kcertpart.po delete summit/messages/kdelibs/kcmcrypto.po delete summit/messages/kdelibs/kfilemetadata.desktop.po delete summit/messages/kdelibs/kio_help4.po delete summit/messages/kdelibs/knotifyconfig.desktop.po delete summit/messages/kdelibs/kxmlgui.desktop.po delete summit/messages/kdelibs/libplasma.po delete summit/messages/pim/kio_smtp.po move summit/messages/kde-runtime/kcm_platform.po summit/messages/playground-base/kcm_platform.po move summit/messages/kde-runtime/kwindowsaddons.desktop.po summit/messages/playground-base/kwindowsaddons.desktop.po move summit/messages/kde-runtime/kwinshutdown.po summit/messages/playground-base/kwinshutdown.po move summit/messages/kde-runtime/kwinstartmenu.po summit/messages/playground-base/kwinstartmenu.po delete summit/docmessages/kde-runtime/documentationnotfound.po delete summit/docmessages/kde-runtime/kcontrol_attica.po delete summit/docmessages/kde-runtime/kcontrol_kcmcgi.po delete summit/docmessages/kde-runtime/kcontrol_language.po delete summit/docmessages/kde-runtime/kcontrol_nepomuk.po delete summit/docmessages/kde-runtime/kioslave5_cgi.po delete summit/docmessages/kde-runtime/kioslave5_finger.po delete summit/docmessages/kde-runtime/kioslave5_floppy.po delete summit/docmessages/kde-runtime/kioslave_nepomuksearch.po delete summit/docmessages/kde-runtime/nepomuk_man-nepomukserver.8.po delete summit/docmessages/kde-runtime/nepomuk_man-nepomukservicestub.8.po delete summit/docmessages/pim/kioslave5_smtp.po move summit/messages/kdeedu/kstars.desktop.po summit/messages/extragear-edu/kstars.desktop.po move summit/messages/kdeedu/kstars.po summit/messages/extragear-edu/kstars.po move summit/messages/kdeedu/org.kde.kstars.appdata.po summit/messages/extragear-edu/org.kde.kstars.appdata.po move summit/docmessages/kdeedu/kstars.po summit/docmessages/extragear-edu/kstars.po move summit/docmessages/kdeedu/kstars_ai-contents.po summit/docmessages/extragear-edu/kstars_ai-contents.po move summit/docmessages/kdeedu/kstars_altvstime.po summit/docmessages/extragear-edu/kstars_altvstime.po move summit/docmessages/kdeedu/kstars_astroinfo.po summit/docmessages/extragear-edu/kstars_astroinfo.po move summit/docmessages/kdeedu/kstars_blackbody.po summit/docmessages/extragear-edu/kstars_blackbody.po move summit/docmessages/kdeedu/kstars_calc-angdist.po summit/docmessages/extragear-edu/kstars_calc-angdist.po move summit/docmessages/kdeedu/kstars_calc-apcoords.po summit/docmessages/extragear-edu/kstars_calc-apcoords.po move summit/docmessages/kdeedu/kstars_calc-dayduration.po summit/docmessages/extragear-edu/kstars_calc-dayduration.po move summit/docmessages/kdeedu/kstars_calc-ecliptic.po summit/docmessages/extragear-edu/kstars_calc-ecliptic.po move summit/docmessages/kdeedu/kstars_calc-eqgal.po summit/docmessages/extragear-edu/kstars_calc-eqgal.po move summit/docmessages/kdeedu/kstars_calc-equinox.po summit/docmessages/extragear-edu/kstars_calc-equinox.po move summit/docmessages/kdeedu/kstars_calc-geodetic.po summit/docmessages/extragear-edu/kstars_calc-geodetic.po move summit/docmessages/kdeedu/kstars_calc-horizontal.po summit/docmessages/extragear-edu/kstars_calc-horizontal.po move summit/docmessages/kdeedu/kstars_calc-julianday.po summit/docmessages/extragear-edu/kstars_calc-julianday.po move summit/docmessages/kdeedu/kstars_calc-planetcoords.po summit/docmessages/extragear-edu/kstars_calc-planetcoords.po move summit/docmessages/kdeedu/kstars_calc-sidereal.po summit/docmessages/extragear-edu/kstars_calc-sidereal.po move summit/docmessages/kdeedu/kstars_calculator.po summit/docmessages/extragear-edu/kstars_calculator.po move summit/docmessages/kdeedu/kstars_cequator.po summit/docmessages/extragear-edu/kstars_cequator.po move summit/docmessages/kdeedu/kstars_colorandtemp.po summit/docmessages/extragear-edu/kstars_colorandtemp.po move summit/docmessages/kdeedu/kstars_commands.po summit/docmessages/extragear-edu/kstars_commands.po move summit/docmessages/kdeedu/kstars_config.po summit/docmessages/extragear-edu/kstars_config.po move summit/docmessages/kdeedu/kstars_cosmicdist.po summit/docmessages/extragear-edu/kstars_cosmicdist.po move summit/docmessages/kdeedu/kstars_cpoles.po summit/docmessages/extragear-edu/kstars_cpoles.po move summit/docmessages/kdeedu/kstars_credits.po summit/docmessages/extragear-edu/kstars_credits.po move summit/docmessages/kdeedu/kstars_csphere.po summit/docmessages/extragear-edu/kstars_csphere.po move summit/docmessages/kdeedu/kstars_darkmatter.po summit/docmessages/extragear-edu/kstars_darkmatter.po move summit/docmessages/kdeedu/kstars_details.po summit/docmessages/extragear-edu/kstars_details.po move summit/docmessages/kdeedu/kstars_dumpmode.po summit/docmessages/extragear-edu/kstars_dumpmode.po move summit/docmessages/kdeedu/kstars_ecliptic.po summit/docmessages/extragear-edu/kstars_ecliptic.po move summit/docmessages/kdeedu/kstars_ellipticalgalaxies.po summit/docmessages/extragear-edu/kstars_ellipticalgalaxies.po move summit/docmessages/kdeedu/kstars_epoch.po summit/docmessages/extragear-edu/kstars_epoch.po move summit/docmessages/kdeedu/kstars_equinox.po summit/docmessages/extragear-edu/kstars_equinox.po move summit/docmessages/kdeedu/kstars_eyepieceview.po summit/docmessages/extragear-edu/kstars_eyepieceview.po move summit/docmessages/kdeedu/kstars_faq.po summit/docmessages/extragear-edu/kstars_faq.po move summit/docmessages/kdeedu/kstars_fitsviewer.po summit/docmessages/extragear-edu/kstars_fitsviewer.po move summit/docmessages/kdeedu/kstars_flux.po summit/docmessages/extragear-edu/kstars_flux.po move summit/docmessages/kdeedu/kstars_geocoords.po summit/docmessages/extragear-edu/kstars_geocoords.po move summit/docmessages/kdeedu/kstars_greatcircle.po summit/docmessages/extragear-edu/kstars_greatcircle.po move summit/docmessages/kdeedu/kstars_horizon.po summit/docmessages/extragear-edu/kstars_horizon.po move summit/docmessages/kdeedu/kstars_hourangle.po summit/docmessages/extragear-edu/kstars_hourangle.po move summit/docmessages/kdeedu/kstars_indi.po summit/docmessages/extragear-edu/kstars_indi.po move summit/docmessages/kdeedu/kstars_jmoons.po summit/docmessages/extragear-edu/kstars_jmoons.po move summit/docmessages/kdeedu/kstars_julianday.po summit/docmessages/extragear-edu/kstars_julianday.po move summit/docmessages/kdeedu/kstars_leapyear.po summit/docmessages/extragear-edu/kstars_leapyear.po move summit/docmessages/kdeedu/kstars_lightcurves.po summit/docmessages/extragear-edu/kstars_lightcurves.po move summit/docmessages/kdeedu/kstars_luminosity.po summit/docmessages/extragear-edu/kstars_luminosity.po move summit/docmessages/kdeedu/kstars_magnitude.po summit/docmessages/extragear-edu/kstars_magnitude.po move summit/docmessages/kdeedu/kstars_meridian.po summit/docmessages/extragear-edu/kstars_meridian.po move summit/docmessages/kdeedu/kstars_obsplanner.po summit/docmessages/extragear-edu/kstars_obsplanner.po move summit/docmessages/kdeedu/kstars_parallax.po summit/docmessages/extragear-edu/kstars_parallax.po move summit/docmessages/kdeedu/kstars_precession.po summit/docmessages/extragear-edu/kstars_precession.po move summit/docmessages/kdeedu/kstars_quicktour.po summit/docmessages/extragear-edu/kstars_quicktour.po move summit/docmessages/kdeedu/kstars_retrograde.po summit/docmessages/extragear-edu/kstars_retrograde.po move summit/docmessages/kdeedu/kstars_scriptbuilder.po summit/docmessages/extragear-edu/kstars_scriptbuilder.po move summit/docmessages/kdeedu/kstars_sidereal.po summit/docmessages/extragear-edu/kstars_sidereal.po move summit/docmessages/kdeedu/kstars_skycoords.po summit/docmessages/extragear-edu/kstars_skycoords.po move summit/docmessages/kdeedu/kstars_solarsys.po summit/docmessages/extragear-edu/kstars_solarsys.po move summit/docmessages/kdeedu/kstars_spiralgalaxies.po summit/docmessages/extragear-edu/kstars_spiralgalaxies.po move summit/docmessages/kdeedu/kstars_stars.po summit/docmessages/extragear-edu/kstars_stars.po move summit/docmessages/kdeedu/kstars_telescopes.po summit/docmessages/extragear-edu/kstars_telescopes.po move summit/docmessages/kdeedu/kstars_timezones.po summit/docmessages/extragear-edu/kstars_timezones.po move summit/docmessages/kdeedu/kstars_tools.po summit/docmessages/extragear-edu/kstars_tools.po move summit/docmessages/kdeedu/kstars_utime.po summit/docmessages/extragear-edu/kstars_utime.po move summit/docmessages/kdeedu/kstars_wut.po summit/docmessages/extragear-edu/kstars_wut.po move summit/docmessages/kdeedu/kstars_zenith.po summit/docmessages/extragear-edu/kstars_zenith.po delete summit/messages/kdelibs/activitymanager_plugin_globalshortcuts.po delete summit/messages/kdelibs/kactivities.desktop.po delete summit/messages/kdelibs/kactivitymanagerd.po delete summit/messages/kdelibs/kactivitymanagerd_fileitem_linking_plugin.po delete summit/messages/kdelibs/kio_activities.po delete summit/messages/kdelibs/nepomuk-core.desktop.po delete summit/messages/kdelibs/nepomukbackup.po delete summit/messages/kdelibs/nepomukcleaner.po delete summit/messages/kdelibs/nepomukfileindexer.po delete summit/messages/kdelibs/nepomukfilewatch.po delete summit/messages/kdelibs/nepomukmigrator.po delete summit/messages/kdelibs/nepomukserver.po delete summit/messages/kdelibs/nepomukservicestub.po delete summit/messages/kdelibs/nepomukstorage.po delete summit/messages/kdelibs/nepomukwidgets.po delete summit/messages/extragear-graphics/kipiplugin_imageviewer.po delete summit/messages/extragear-kdevelop/kdevplatform.json.po delete summit/messages/kdesdk/org.example.%{APPNAMELC}.appdata.po delete summit/messages/frameworks/ktexteditor.json.po move summit/messages/playground-utils/krename.desktop.po summit/messages/kdereview/krename.desktop.po move summit/messages/playground-utils/krename.po summit/messages/kdereview/krename.po move summit/messages/playground-utils/org.kde.krename.appdata.po summit/messages/kdereview/org.kde.krename.appdata.po copy summit/messages/pim/akonadi_davgroupware_resource.po summit/messages/pim/libkdav.po move summit/docmessages/kdegames/ksirk_ksirkskineditor.po summit/docmessages/kdegames/ksirkskineditor.po delete summit/messages/extragear-kdevelop/kdevcpp.po delete summit/messages/extragear-kdevelop/kdevformatters.po delete summit/messages/extragear-kdevelop/kdevgenericprojectmanager.po delete summit/messages/extragear-kdevelop/kdevpastebin.po delete summit/messages/extragear-kdevelop/kdevplatform.desktop.po delete summit/messages/extragear-kdevelop/kdevprojectdashboard.po delete summit/messages/extragear-kdevelop/kdevsnippet.po delete summit/messages/extragear-kdevelop/kdevtemplates_config.po move summit/messages/extragear-kdevelop/purpose_reviewboard.po summit/messages/playground-libs/purpose_reviewboard.po delete summit/docmessages/extragear-graphics/kxstitch_faq.po move summit/messages/extragear-utils/org.kde.kmarkdownwebviewpart.appdata.po summit/messages/extragear-utils/org.kde.kmarkdownwebviewpart.metainfo.po move summit/messages/kdereview/Demo_qt.po summit/messages/kdereview/rqbgdemo_qt.po move summit/messages/kdereview/krename.desktop.po summit/messages/extragear-utils/krename.desktop.po move summit/messages/kdereview/krename.po summit/messages/extragear-utils/krename.po move summit/messages/kdereview/org.kde.krename.appdata.po summit/messages/extragear-utils/org.kde.krename.appdata.po move summit/messages/extragear-kdevelop/org.kde.kdev-python.appdata.po summit/messages/extragear-kdevelop/org.kde.kdev-python.metainfo.po delete summit/messages/qt/kdeqt.po delete summit/messages/playground-sysadmin/kalternatives.desktop.po delete summit/messages/playground-sysadmin/kalternatives.po move summit/messages/extragear-kdevelop/org.kde.kdev-php.metainfo.po summit/messages/kdesdk/org.kde.kdev-php.metainfo.po delete summit/messages/kdeaccessibility/jovie.desktop.po delete summit/messages/kdeaccessibility/jovie.po delete summit/messages/kdeaccessibility/kaccessibleapp.po delete summit/messages/kdeaccessibility/org.kde.jovie.appdata.po delete summit/messages/kdegraphics/ksaneplugin.desktop.po delete summit/messages/kdegraphics/ksaneplugin.po delete summit/messages/kdenetwork/kppp.desktop.po delete summit/messages/kdenetwork/kppp.po delete summit/messages/kdenetwork/kppplogview.po delete summit/messages/kdeutils/kcm_remotecontrol.po delete summit/messages/kdeutils/krcdnotifieritem.po delete summit/messages/kdeutils/kremotecontrol.desktop.po delete summit/messages/kdeutils/kremotecontroldaemon.po delete summit/messages/kdeutils/libkremotecontrol.po delete summit/messages/kdewebdev/kfilereplace.desktop.po delete summit/messages/kdewebdev/kfilereplace.po delete summit/messages/kdewebdev/klinkstatus.desktop.po delete summit/messages/kdewebdev/klinkstatus.po delete summit/messages/playground-devtools/kdev-php-formatter.desktop.po delete summit/messages/playground-devtools/kdevphpformatter.po delete summit/docmessages/kdeaccessibility/jovie.po delete summit/docmessages/kdenetwork/kppp.po delete summit/docmessages/kdenetwork/kppp_accounting.po delete summit/docmessages/kdenetwork/kppp_callback.po delete summit/docmessages/kdenetwork/kppp_chap.po delete summit/docmessages/kdenetwork/kppp_dialog-setup.po delete summit/docmessages/kdenetwork/kppp_getting-online.po delete summit/docmessages/kdenetwork/kppp_global-settings.po delete summit/docmessages/kdenetwork/kppp_hayes.po delete summit/docmessages/kdenetwork/kppp_kppp-faq.po delete summit/docmessages/kdenetwork/kppp_security.po delete summit/docmessages/kdenetwork/kppp_tricks.po delete summit/docmessages/kdenetwork/kppp_wizard.po delete summit/docmessages/kdeutils/kcontrol_kremotecontrol.po delete summit/docmessages/kdewebdev/kfilereplace.po delete summit/docmessages/kdewebdev/klinkstatus.po delete summit/messages/pim/blogilo.po delete summit/messages/pim/libcomposereditorwebengine.po delete summit/messages/pim/org.kde.blogilo.appdata.po delete summit/messages/pim/blogilo.desktop.po delete summit/docmessages/pim/blogilo.po move summit/messages/kdesdk/org.kde.kdev-php.metainfo.po summit/messages/extragear-kdevelop/org.kde.kdev-php.metainfo.po move summit/messages/playground-libs/libpurpose_quick.po summit/messages/frameworks/libpurpose_quick.po move summit/messages/playground-libs/libpurpose_widgets.po summit/messages/frameworks/libpurpose_widgets.po move summit/messages/playground-libs/purpose.json.po summit/messages/frameworks/purpose.json.po move summit/messages/playground-libs/purpose_email.po summit/messages/frameworks/purpose_email.po move summit/messages/playground-libs/purpose_imgur.po summit/messages/frameworks/purpose_imgur.po move summit/messages/playground-libs/purpose_ktp-sendfile.po summit/messages/frameworks/purpose_ktp-sendfile.po move summit/messages/playground-libs/purpose_nextcloud.po summit/messages/frameworks/purpose_nextcloud.po move summit/messages/playground-libs/purpose_pastebin.po summit/messages/frameworks/purpose_pastebin.po move summit/messages/playground-libs/purpose_reviewboard.po summit/messages/frameworks/purpose_reviewboard.po move summit/messages/playground-libs/purpose_saveas.po summit/messages/frameworks/purpose_saveas.po move summit/messages/playground-libs/purpose_youtube.po summit/messages/frameworks/purpose_youtube.po move summit/messages/pim/libkholidays5_qt.po summit/messages/frameworks/libkholidays5_qt.po move summit/messages/kde-workspace/kcmmousetheme.po summit/messages/kde-workspace/kcm_cursortheme.po move summit/messages/kde-workspace/kcmfonts.po summit/messages/kde-workspace/kcm_fonts.po move summit/messages/kdereview/org.kde.Falkon.appdata.po summit/messages/kdereview/org.kde.falkon.appdata.po move summit/messages/kdereview/plasma_applet_org.kde.plasma.mycroftplasmoid.po summit/messages/extragear-utils/plasma_applet_org.kde.plasma.mycroftplasmoid.po move summit/messages/kdereview/plasma-mycroft.desktop.po summit/messages/extragear-utils/plasma-mycroft.desktop.po move summit/messages/kde-workspace/konsoleprofiles.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma.konsoleprofiles.po delete summit/messages/extragear-sysadmin/muon-installer.po delete summit/messages/extragear-base/knetworkmanager.po delete summit/messages/extragear-base/solidcontrol.po copy summit/messages/extragear-base/latte-dock.po summit/messages/extragear-base/plasma_containmentactions_lattecontextmenu.po move summit/messages/playground-multimedia/elisa.desktop.po summit/messages/kdereview/elisa.desktop.po move summit/messages/playground-multimedia/elisa.po summit/messages/kdereview/elisa.po move summit/messages/playground-multimedia/kcm_elisa_local_file.po summit/messages/kdereview/kcm_elisa_local_file.po move summit/messages/playground-multimedia/org.kde.elisa.appdata.po summit/messages/kdereview/org.kde.elisa.appdata.po move summit/docmessages/playground-multimedia/elisa.po summit/docmessages/kdereview/elisa.po move summit/messages/playground-base/kbackup.desktop.po summit/messages/kdeutils/kbackup.desktop.po move summit/messages/playground-base/kbackup.po summit/messages/kdeutils/kbackup.po move summit/messages/playground-base/kbackup_xml_mimetypes.po summit/messages/kdeutils/kbackup_xml_mimetypes.po move summit/messages/playground-base/org.kde.kbackup.appdata.po summit/messages/kdeutils/org.kde.kbackup.appdata.po move summit/docmessages/playground-base/kbackup.po summit/docmessages/kdeutils/kbackup.po delete summit/docmessages/extragear-graphics/digikam_intro-pluginsupport.po delete summit/docmessages/extragear-graphics/digikam_using-setup-plugins.po move summit/messages/kde-workspace/kcmlaunch.po summit/messages/kde-workspace/kcmlaunchfeedback.po move summit/messages/extragear-multimedia/kamoso.desktop.po summit/messages/kdemultimedia/kamoso.desktop.po move summit/messages/extragear-multimedia/kamoso.po summit/messages/kdemultimedia/kamoso.po move summit/messages/extragear-multimedia/org.kde.kamoso.appdata.po summit/messages/kdemultimedia/org.kde.kamoso.appdata.po move summit/docmessages/extragear-multimedia/kamoso.po summit/docmessages/kdemultimedia/kamoso.po move summit/messages/extragear-utils/kdiff3.desktop.po summit/messages/playground-devtools/kdiff3.desktop.po move summit/messages/extragear-utils/kdiff3.po summit/messages/playground-devtools/kdiff3.po move summit/messages/extragear-utils/kdiff3fileitemactionplugin.po summit/messages/playground-devtools/kdiff3fileitemactionplugin.po delete summit/messages/extragear-utils/kdiff3plugin.po move summit/docmessages/extragear-utils/kdiff3.po summit/docmessages/playground-devtools/kdiff3.po delete summit/docmessages/extragear-utils/kdiff3_man-kdiff3.1.po delete summit/messages/extragear-libs/kreport_chartplugin_qt.po move summit/messages/kdereview/elisa.desktop.po summit/messages/extragear-multimedia/elisa.desktop.po move summit/messages/kdereview/elisa.po summit/messages/extragear-multimedia/elisa.po move summit/messages/kdereview/kcm_elisa_local_file.po summit/messages/extragear-multimedia/kcm_elisa_local_file.po move summit/messages/kdereview/org.kde.elisa.appdata.po summit/messages/extragear-multimedia/org.kde.elisa.appdata.po move summit/docmessages/kdereview/elisa.po summit/docmessages/extragear-multimedia/elisa.po move summit/messages/extragear-sysadmin/kpmcore.desktop.po summit/messages/extragear-sysadmin/kpmcore.json.po delete summit/messages/kdereview/falkon_imagefinder_qt.po copy summit/messages/pim/akonadi_serializer_plugins.po summit/messages/pim/akonadicontact5-serializer.po copy summit/messages/pim/akonadi_serializer_plugins.po summit/messages/pim/libakonadi-calendar5-serializer.po copy summit/messages/pim/akonadi_serializer_plugins.po summit/messages/pim/libakonadi-kmime5-serializer.po copy summit/messages/pim/akonadi_serializer_plugins.po summit/messages/pim/libkalarmcal5-serializer.po delete summit/messages/pim/akonadi_serializer_plugins.po copy summit/messages/pim/kdepim-runtime.desktop.po summit/messages/pim/akonadi-mime.desktop.po copy summit/messages/pim/kdepim-runtime.desktop.po summit/messages/pim/akonadi-calendar.desktop.po copy summit/messages/pim/kdepim-runtime.desktop.po summit/messages/pim/kalarmcal.desktop.po delete summit/messages/playground-office/kraft.desktop.po delete summit/messages/playground-office/kraft.po move summit/messages/kdemultimedia/kscd.desktop.po summit/messages/playground-multimedia/kscd.desktop.po move summit/messages/kdemultimedia/kscd.po summit/messages/playground-multimedia/kscd.po move summit/messages/kdesdk/libkasten.po summit/messages/extragear-utils/libkasten.po move summit/messages/kdesdk/liboktetacore.po summit/messages/extragear-utils/liboktetacore.po move summit/messages/kdesdk/liboktetagui.po summit/messages/extragear-utils/liboktetagui.po move summit/messages/kdesdk/liboktetakasten.po summit/messages/extragear-utils/liboktetakasten.po move summit/messages/kdesdk/okteta.desktop.po summit/messages/extragear-utils/okteta.desktop.po move summit/messages/kdesdk/okteta.po summit/messages/extragear-utils/okteta.po move summit/messages/kdesdk/okteta_xml_mimetypes.po summit/messages/extragear-utils/okteta_xml_mimetypes.po move summit/messages/kdesdk/oktetapart.po summit/messages/extragear-utils/oktetapart.po move summit/messages/kdesdk/org.kde.okteta.appdata.po summit/messages/extragear-utils/org.kde.okteta.appdata.po move summit/docmessages/kdesdk/okteta.po summit/docmessages/extragear-utils/okteta.po delete summit/messages/kdeutils/kerfuffle_xml_mimetypes.po delete summit/messages/pim/akonadi_serializer_plugins.po move summit/messages/kde-workspace/joystick.po summit/messages/kde-workspace/kcm5_joystick.po move summit/messages/kde-workspace/plasma_applet_org.kde.color.po summit/messages/kde-workspace/plasma_wallpaper_org.kde.color.po move summit/messages/kde-workspace/plasma_applet_org.kde.image.po summit/messages/kde-workspace/plasma_wallpaper_org.kde.image.po move summit/docmessages/kde-workspace/kcontrol_kcmlaunch.po summit/docmessages/kde-workspace/kcontrol_kcmlaunchfeedback.po move summit/messages/kdereview/falkon_kwalletpasswords_qt.po summit/messages/kdereview/falkon_kdesupport_qt.po delete summit/messages/pim/libakonadi-kmime5-serializer.po copy summit/messages/playground-accessibility/playground-accessibility.desktop.po summit/messages/playground-accessibility/ksayit.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/KDEArtWork.port.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/Oxygen.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/cokoon.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/ion.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/plastik-focus.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/plastik.desktop.po copy summit/messages/playground-artwork/playground-artwork.desktop.po summit/messages/playground-artwork/smooth-blend.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/colors.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/datasources.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/kded_kosd.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/kdeprint.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/kfingerprint.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/kio_sysinfo.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/klipper-ng.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/konq-plugins.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/nepomuk-kde.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/plasma.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/remotewidgets.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/strigi-analyzer.desktop.po copy summit/messages/playground-base/playground-base.desktop.po summit/messages/playground-base/strigiplasmoid.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/binspekt.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/kategdbplugin.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/kdevelop3-extra-plugins.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/kdevelop4-extra-plugins.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/kte_linter.desktop.po copy summit/messages/playground-devtools/playground-devtools.desktop.po summit/messages/playground-devtools/kte_quicksnippet.desktop.po copy summit/messages/playground-edu/playground-edu.desktop.po summit/messages/playground-edu/kalcul.desktop.po copy summit/messages/playground-edu/playground-edu.desktop.po summit/messages/playground-edu/keduca.desktop.po copy summit/messages/playground-edu/playground-edu.desktop.po summit/messages/playground-edu/kmathtool.desktop.po copy summit/messages/playground-edu/playground-edu.desktop.po summit/messages/playground-edu/kverbos.desktop.po copy summit/messages/playground-edu/playground-edu.desktop.po summit/messages/playground-edu/workout.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/backgammon.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/kbackgammon.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/kolf-ng.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/kombination.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/krosswordpuzzle.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/kspiral.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/kttt.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/magazynier.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/mancala.desktop.po copy summit/messages/playground-games/playground-games.desktop.po summit/messages/playground-games/parsek.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/darkroom.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/example_akonadi_imageviewer.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/ksana.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/localimageakonadiresource.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/skansuite.desktop.po copy summit/messages/playground-graphics/playground-graphics.desktop.po summit/messages/playground-graphics/solidkreator.desktop.po copy summit/messages/playground-ioslaves/playground-ioslaves.desktop.po summit/messages/playground-ioslaves/kio-beagle.desktop.po copy summit/messages/playground-ioslaves/playground-ioslaves.desktop.po summit/messages/playground-ioslaves/kio-clucene.desktop.po copy summit/messages/playground-ioslaves/playground-ioslaves.desktop.po summit/messages/playground-ioslaves/kio-giobridge.desktop.po copy summit/messages/playground-ioslaves/playground-ioslaves.desktop.po summit/messages/playground-ioslaves/kio-locate.desktop.po copy summit/messages/playground-ioslaves/playground-ioslaves.desktop.po summit/messages/playground-ioslaves/kwest.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/jultagger.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/kalva2.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/kcam.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/kenvy24.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/kxtodvd.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/lintv.desktop.po copy summit/messages/playground-multimedia/playground-multimedia.desktop.po summit/messages/playground-multimedia/phonon-backends.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/guidedog.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/kio_slp.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/konqueror-sendtoplugin.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/konsume.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/ksniffer.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/kvpnc.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/libktelepathy-examples.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/solid-sysclass.desktop.po copy summit/messages/playground-network/playground-network.desktop.po summit/messages/playground-network/videocatcher.desktop.po copy summit/messages/playground-office/playground-office.desktop.po summit/messages/playground-office/kofficeplugins.desktop.po copy summit/messages/playground-office/playground-office.desktop.po summit/messages/playground-office/pekunia.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/akonadi_kdeforum.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/akonaditelepathy.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/akonaditest.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/calgo.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/del.icio.us.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/kblogger.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/kitchensync.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/kpilot.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/ldap.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/leute.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/syncml.desktop.po copy summit/messages/playground-pim/playground-pim.desktop.po summit/messages/playground-pim/tvanytime.desktop.po copy summit/messages/playground-sysadmin/playground-sysadmin.desktop.po summit/messages/playground-sysadmin/shaman.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/gwenrename.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/kfprintee.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/khtml_userscript.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/viki.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/workflow-addons.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/workflow-kde3.desktop.po copy summit/messages/playground-utils/playground-utils.desktop.po summit/messages/playground-utils/workflow.desktop.po delete summit/messages/playground-accessibility/playground-accessibility.desktop.po delete summit/messages/playground-artwork/playground-artwork.desktop.po delete summit/messages/playground-base/playground-base.desktop.po delete summit/messages/playground-devtools/playground-devtools.desktop.po delete summit/messages/playground-edu/playground-edu.desktop.po delete summit/messages/playground-games/playground-games.desktop.po delete summit/messages/playground-graphics/playground-graphics.desktop.po delete summit/messages/playground-ioslaves/playground-ioslaves.desktop.po delete summit/messages/playground-multimedia/playground-multimedia.desktop.po delete summit/messages/playground-network/playground-network.desktop.po delete summit/messages/playground-office/playground-office.desktop.po delete summit/messages/playground-pim/playground-pim.desktop.po delete summit/messages/playground-sysadmin/playground-sysadmin.desktop.po delete summit/messages/playground-utils/playground-utils.desktop.po delete summit/messages/applications/baloo_naturalqueryparser.po move summit/messages/kdereview/falkon.desktop.po summit/messages/extragear-network/falkon.desktop.po move summit/messages/kdereview/org.kde.falkon.appdata.po summit/messages/extragear-network/org.kde.falkon.appdata.po move summit/messages/kdereview/falkon_autoscroll_qt.po summit/messages/extragear-network/falkon_autoscroll_qt.po move summit/messages/kdereview/falkon_flashcookiemanager_qt.po summit/messages/extragear-network/falkon_flashcookiemanager_qt.po move summit/messages/kdereview/falkon_gnomekeyringpasswords_qt.po summit/messages/extragear-network/falkon_gnomekeyringpasswords_qt.po move summit/messages/kdereview/falkon_greasemonkey_qt.po summit/messages/extragear-network/falkon_greasemonkey_qt.po move summit/messages/kdereview/falkon_hellopython.po summit/messages/extragear-network/falkon_hellopython.po move summit/messages/kdereview/falkon_kdesupport_qt.po summit/messages/extragear-network/falkon_kdesupport_qt.po move summit/messages/kdereview/falkon_mousegestures_qt.po summit/messages/extragear-network/falkon_mousegestures_qt.po move summit/messages/kdereview/falkon_pim_qt.po summit/messages/extragear-network/falkon_pim_qt.po move summit/messages/kdereview/falkon_qt.po summit/messages/extragear-network/falkon_qt.po move summit/messages/kdereview/falkon_runaction.po summit/messages/extragear-network/falkon_runaction.po move summit/messages/kdereview/falkon_statusbaricons_qt.po summit/messages/extragear-network/falkon_statusbaricons_qt.po move summit/messages/kdereview/falkon_tabmanager_qt.po summit/messages/extragear-network/falkon_tabmanager_qt.po move summit/messages/kdereview/falkon_testplugin_qt.po summit/messages/extragear-network/falkon_testplugin_qt.po move summit/messages/kdereview/falkon_verticaltabs_qt.po summit/messages/extragear-network/falkon_verticaltabs_qt.po move summit/messages/extragear-network/falkon_kdesupport_qt.po summit/messages/extragear-network/falkon_kdeframeworksintegration_qt.po copy summit/messages/pim/akonadi.desktop.po summit/messages/playground-pim/akonadi-playground.desktop.po copy summit/messages/pim/akonadi.desktop.po summit/messages/pim/kitinerary.po delete summit/messages/playground-base/kconfig.desktop.po copy summit/messages/playground-graphics/okular.desktop.po summit/messages/playground-graphics/okular-emf.desktop.po copy summit/messages/playground-graphics/okular.desktop.po summit/messages/playground-graphics/okular-mupdf.desktop.po delete summit/messages/playground-graphics/okular.desktop.po delete summit/messages/playground-pim/akonadi.desktop.po copy summit/messages/kde-workspace/kdeplasma-addons.desktop.po summit/messages/kde-workspace/kdeplasma-addons.json.po move summit/messages/kde-workspace/kcmworkspaceoptions.po summit/messages/kde-workspace/kcm5_workspace.po delete summit/messages/kde-workspace/kcm_workspaceoptions.po move summit/messages/kde-workspace/kde5-nm-connection-editor.po summit/messages/extragear-base/kde5-nm-connection-editor.po move summit/messages/kde-workspace/kdevpackagemanagerview.po summit/messages/playground-sdk/kdevpackagemanagerview.po move summit/messages/kde-workspace/plasmate.json.po summit/messages/playground-sdk/plasmate.json.po move summit/messages/kde-workspace/plasmate.po summit/messages/playground-sdk/plasmate.po delete summit/messages/kde-workspace/kcmworkspaceoptions.po delete summit/messages/kde-workspace/kio_remote.po delete summit/messages/kde-workspace/konqprofiles.po delete summit/messages/kde-workspace/lancelot.po delete summit/messages/kde-workspace/liblancelot-datamodels.po delete summit/messages/kde-workspace/libplasma_groupingcontainment.po delete summit/messages/kde-workspace/plasma_applet_CharSelectApplet.po delete summit/messages/kde-workspace/plasma_applet_bookmarks.po delete summit/messages/kde-workspace/plasma_applet_bubblemon.po delete summit/messages/kde-workspace/plasma_applet_fileWatcher.po delete summit/messages/kde-workspace/plasma_applet_frame.po delete summit/messages/kde-workspace/plasma_applet_groupingpanel.po delete summit/messages/kde-workspace/plasma_applet_incomingmsg.po delete summit/messages/kde-workspace/plasma_applet_knowledgebase.po delete summit/messages/kde-workspace/plasma_applet_leavenote.po delete summit/messages/kde-workspace/plasma_applet_life.po delete summit/messages/kde-workspace/plasma_applet_luna.po delete summit/messages/kde-workspace/plasma_applet_magnifique.po delete summit/messages/kde-workspace/plasma_applet_microblog.po delete summit/messages/kde-workspace/plasma_applet_news.po delete summit/messages/kde-workspace/plasma_applet_plasmaboard.po delete summit/messages/kde-workspace/plasma_applet_previewer.po delete summit/messages/kde-workspace/plasma_applet_qalculate.po delete summit/messages/kde-workspace/plasma_applet_qstardict.po delete summit/messages/kde-workspace/plasma_applet_rssnow.po delete summit/messages/kde-workspace/plasma_applet_spellcheck.po delete summit/messages/kde-workspace/plasma_applet_unitconverter.po delete summit/messages/kde-workspace/plasma_applet_weatherstation.po delete summit/messages/kde-workspace/plasma_applet_webslice.po delete summit/messages/kde-workspace/plasma_runner_audioplayercontrol.po delete summit/messages/kde-workspace/plasma_runner_browserhistory.po delete summit/messages/kde-workspace/plasma_runner_contacts.po delete summit/messages/kde-workspace/plasma_runner_events.po delete summit/messages/kde-workspace/plasma_runner_konquerorsessions.po delete summit/messages/kde-workspace/plasma_runner_konsolesessions.po delete summit/messages/kde-workspace/plasma_runner_kopete.po delete summit/messages/kde-workspace/plasma_runner_translator.po delete summit/messages/kde-workspace/plasma_runner_youtube.po delete summit/messages/kde-workspace/remote-widgets-browser.po delete summit/messages/kde-workspace/useraccount.po move summit/docmessages/kde-workspace/kcontrol5_bookmarks.po summit/docmessages/applications/kcontrol5_bookmarks.po move summit/docmessages/kde-workspace/kcontrol5_filemanager.po summit/docmessages/applications/kcontrol5_filemanager.po move summit/docmessages/kde-workspace/kcontrol5_history.po summit/docmessages/applications/kcontrol5_history.po move summit/docmessages/kde-workspace/kcontrol5_kcmcss.po summit/docmessages/applications/kcontrol5_kcmcss.po move summit/docmessages/kde-workspace/kcontrol5_khtml-adblock.po summit/docmessages/applications/kcontrol5_khtml-adblock.po move summit/docmessages/kde-workspace/kcontrol5_khtml-behavior.po summit/docmessages/applications/kcontrol5_khtml-behavior.po move summit/docmessages/kde-workspace/kcontrol5_khtml-general.po summit/docmessages/applications/kcontrol5_khtml-general.po move summit/docmessages/kde-workspace/kcontrol5_khtml-java-js.po summit/docmessages/applications/kcontrol5_khtml-java-js.po move summit/docmessages/kde-workspace/kcontrol5_performance.po summit/docmessages/applications/kcontrol5_performance.po delete summit/docmessages/kde-workspace/kcontrol_bell.po delete summit/docmessages/kde-workspace/kcontrol_khtml-plugins.po move summit/messages/applications/baloo-widgets.desktop.po summit/messages/applications/baloo-widgets._desktop_.po move summit/messages/applications/dolphin.desktop.po summit/messages/applications/dolphin._desktop_.po move summit/messages/applications/kate.desktop.po summit/messages/applications/kate._desktop_.po move summit/messages/applications/kate.json.po summit/messages/applications/kate._json_.po move summit/messages/applications/keditbookmarks.desktop.po summit/messages/applications/keditbookmarks._desktop_.po move summit/messages/applications/kfind.desktop.po summit/messages/applications/kfind._desktop_.po move summit/messages/applications/khelpcenter.desktop.po summit/messages/applications/khelpcenter._desktop_.po move summit/messages/applications/konqueror.desktop.po summit/messages/applications/konqueror._desktop_.po move summit/messages/applications/konsole.desktop.po summit/messages/applications/konsole._desktop_.po move summit/messages/calligra/calligra.desktop.po summit/messages/calligra/calligra._desktop_.po move summit/messages/calligra/calligra.json.po summit/messages/calligra/calligra._json_.po move summit/messages/calligra/kexi.desktop.po summit/messages/calligra/kexi._desktop_.po move summit/messages/calligra/kexi.json.po summit/messages/calligra/kexi._json_.po move summit/messages/extragear-accessibility/simon.desktop.po summit/messages/extragear-accessibility/simon._desktop_.po move summit/messages/extragear-base/atcore.desktop.po summit/messages/extragear-base/atcore._desktop_.po move summit/messages/extragear-base/kappfinder.desktop.po summit/messages/extragear-base/kappfinder._desktop_.po move summit/messages/extragear-base/kwebkitpart.desktop.po summit/messages/extragear-base/kwebkitpart._desktop_.po move summit/messages/extragear-base/latte-dock.desktop.po summit/messages/extragear-base/latte-dock._desktop_.po move summit/messages/extragear-base/mangonel.desktop.po summit/messages/extragear-base/mangonel._desktop_.po move summit/messages/extragear-base/nepomuk-webminer.desktop.po summit/messages/extragear-base/nepomuk-webminer._desktop_.po move summit/messages/extragear-base/networkmanagement.desktop.po summit/messages/extragear-base/networkmanagement._desktop_.po move summit/messages/extragear-base/plasma-mobile.desktop.po summit/messages/extragear-base/plasma-mobile._desktop_.po move summit/messages/extragear-base/plasma-settings.desktop.po summit/messages/extragear-base/plasma-settings._desktop_.po move summit/messages/extragear-base/polkit-kde-kcmodules-1.desktop.po summit/messages/extragear-base/polkit-kde-kcmodules-1._desktop_.po move summit/messages/extragear-base/qtcurve.desktop.po summit/messages/extragear-base/qtcurve._desktop_.po move summit/messages/extragear-base/share-like-connect.desktop.po summit/messages/extragear-base/share-like-connect._desktop_.po move summit/messages/extragear-base/wacomtablet.desktop.po summit/messages/extragear-base/wacomtablet._desktop_.po move summit/messages/extragear-edu/gcompris.desktop.po summit/messages/extragear-edu/gcompris._desktop_.po move summit/messages/extragear-edu/kstars.desktop.po summit/messages/extragear-edu/kstars._desktop_.po move summit/messages/extragear-edu/labplot.desktop.po summit/messages/extragear-edu/labplot._desktop_.po move summit/messages/extragear-games/knights.desktop.po summit/messages/extragear-games/knights._desktop_.po move summit/messages/extragear-graphics/digikam.desktop.po summit/messages/extragear-graphics/digikam._desktop_.po move summit/messages/extragear-graphics/kgraphviewer.desktop.po summit/messages/extragear-graphics/kgraphviewer._desktop_.po move summit/messages/extragear-graphics/kipi-plugins.desktop.po summit/messages/extragear-graphics/kipi-plugins._desktop_.po move summit/messages/extragear-graphics/kolor-manager.desktop.po summit/messages/extragear-graphics/kolor-manager._desktop_.po move summit/messages/extragear-graphics/kphotoalbum.desktop.po summit/messages/extragear-graphics/kphotoalbum._desktop_.po move summit/messages/extragear-graphics/krita.desktop.po summit/messages/extragear-graphics/krita._desktop_.po move summit/messages/extragear-graphics/ksnapshot.desktop.po summit/messages/extragear-graphics/ksnapshot._desktop_.po move summit/messages/extragear-graphics/kst-plot.desktop.po summit/messages/extragear-graphics/kst-plot._desktop_.po move summit/messages/extragear-graphics/kxstitch.desktop.po summit/messages/extragear-graphics/kxstitch._desktop_.po move summit/messages/extragear-graphics/skanlite.desktop.po summit/messages/extragear-graphics/skanlite._desktop_.po move summit/messages/extragear-graphics/symboleditor.desktop.po summit/messages/extragear-graphics/symboleditor._desktop_.po move summit/messages/extragear-kdevelop/kdev-php.desktop.po summit/messages/extragear-kdevelop/kdev-php._desktop_.po move summit/messages/extragear-kdevelop/kdev-php.json.po summit/messages/extragear-kdevelop/kdev-php._json_.po move summit/messages/extragear-kdevelop/kdev-python.desktop.po summit/messages/extragear-kdevelop/kdev-python._desktop_.po move summit/messages/extragear-kdevelop/kdev-python.json.po summit/messages/extragear-kdevelop/kdev-python._json_.po move summit/messages/extragear-kdevelop/kdevelop.desktop.po summit/messages/extragear-kdevelop/kdevelop._desktop_.po move summit/messages/extragear-kdevelop/kdevelop.json.po summit/messages/extragear-kdevelop/kdevelop._json_.po move summit/messages/extragear-libs/kdb.json.po summit/messages/extragear-libs/kdb._json_.po move summit/messages/extragear-libs/kreport.desktop.po summit/messages/extragear-libs/kreport._desktop_.po move summit/messages/extragear-libs/kreport.json.po summit/messages/extragear-libs/kreport._json_.po move summit/messages/extragear-libs/kuserfeedback.desktop.po summit/messages/extragear-libs/kuserfeedback._desktop_.po move summit/messages/extragear-multimedia/amarok.desktop.po summit/messages/extragear-multimedia/amarok._desktop_.po move summit/messages/extragear-multimedia/elisa.desktop.po summit/messages/extragear-multimedia/elisa._desktop_.po move summit/messages/extragear-multimedia/kaffeine.desktop.po summit/messages/extragear-multimedia/kaffeine._desktop_.po move summit/messages/extragear-multimedia/kaudiocreator.desktop.po summit/messages/extragear-multimedia/kaudiocreator._desktop_.po move summit/messages/extragear-multimedia/kmid.desktop.po summit/messages/extragear-multimedia/kmid._desktop_.po move summit/messages/extragear-multimedia/kmplayer.desktop.po summit/messages/extragear-multimedia/kmplayer._desktop_.po move summit/messages/extragear-multimedia/plasma-mediacenter.desktop.po summit/messages/extragear-multimedia/plasma-mediacenter._desktop_.po move summit/messages/extragear-network/choqok.desktop.po summit/messages/extragear-network/choqok._desktop_.po move summit/messages/extragear-network/falkon.desktop.po summit/messages/extragear-network/falkon._desktop_.po move summit/messages/extragear-network/kdeconnect-kde.desktop.po summit/messages/extragear-network/kdeconnect-kde._desktop_.po move summit/messages/extragear-network/kdeconnect-kde.json.po summit/messages/extragear-network/kdeconnect-kde._json_.po move summit/messages/extragear-network/kftpgrabber.desktop.po summit/messages/extragear-network/kftpgrabber._desktop_.po move summit/messages/extragear-network/kio-gdrive.desktop.po summit/messages/extragear-network/kio-gdrive._desktop_.po move summit/messages/extragear-network/kmldonkey.desktop.po summit/messages/extragear-network/kmldonkey._desktop_.po move summit/messages/extragear-network/knemo.desktop.po summit/messages/extragear-network/knemo._desktop_.po move summit/messages/extragear-network/konversation.desktop.po summit/messages/extragear-network/konversation._desktop_.po move summit/messages/extragear-network/ktorrent.desktop.po summit/messages/extragear-network/ktorrent._desktop_.po move summit/messages/extragear-network/kwlan.desktop.po summit/messages/extragear-network/kwlan._desktop_.po move summit/messages/extragear-network/rekonq.desktop.po summit/messages/extragear-network/rekonq._desktop_.po move summit/messages/extragear-network/smb4k.desktop.po summit/messages/extragear-network/smb4k._desktop_.po move summit/messages/extragear-network/wicd-kde.desktop.po summit/messages/extragear-network/wicd-kde._desktop_.po move summit/messages/extragear-office/kbibtex.desktop.po summit/messages/extragear-office/kbibtex._desktop_.po move summit/messages/extragear-office/kile.desktop.po summit/messages/extragear-office/kile._desktop_.po move summit/messages/extragear-office/kmymoney.desktop.po summit/messages/extragear-office/kmymoney._desktop_.po move summit/messages/extragear-office/skrooge.desktop.po summit/messages/extragear-office/skrooge._desktop_.po move summit/messages/extragear-office/tellico.desktop.po summit/messages/extragear-office/tellico._desktop_.po move summit/messages/extragear-pim/ksig.desktop.po summit/messages/extragear-pim/ksig._desktop_.po move summit/messages/extragear-pim/trojita.desktop.po summit/messages/extragear-pim/trojita._desktop_.po move summit/messages/extragear-pim/zanshin.desktop.po summit/messages/extragear-pim/zanshin._desktop_.po move summit/messages/extragear-sdk/heaptrack.desktop.po summit/messages/extragear-sdk/heaptrack._desktop_.po move summit/messages/extragear-sdk/kdesvn.desktop.po summit/messages/extragear-sdk/kdesvn._desktop_.po move summit/messages/extragear-sdk/kxsldbg.desktop.po summit/messages/extragear-sdk/kxsldbg._desktop_.po move summit/messages/extragear-sdk/massif-visualizer.desktop.po summit/messages/extragear-sdk/massif-visualizer._desktop_.po move summit/messages/extragear-sysadmin/apper.desktop.po summit/messages/extragear-sysadmin/apper._desktop_.po move summit/messages/extragear-sysadmin/kcm-grub2.desktop.po summit/messages/extragear-sysadmin/kcm-grub2._desktop_.po move summit/messages/extragear-sysadmin/kiosktool.desktop.po summit/messages/extragear-sysadmin/kiosktool._desktop_.po move summit/messages/extragear-sysadmin/kpmcore.json.po summit/messages/extragear-sysadmin/kpmcore._json_.po move summit/messages/extragear-sysadmin/libqapt.desktop.po summit/messages/extragear-sysadmin/libqapt._desktop_.po move summit/messages/extragear-sysadmin/muon.desktop.po summit/messages/extragear-sysadmin/muon._desktop_.po move summit/messages/extragear-sysadmin/partitionmanager.desktop.po summit/messages/extragear-sysadmin/partitionmanager._desktop_.po move summit/messages/extragear-utils/isoimagewriter.desktop.po summit/messages/extragear-utils/isoimagewriter._desktop_.po move summit/messages/extragear-utils/kdesrc-build.desktop.po summit/messages/extragear-utils/kdesrc-build._desktop_.po move summit/messages/extragear-utils/keurocalc.desktop.po summit/messages/extragear-utils/keurocalc._desktop_.po move summit/messages/extragear-utils/kimtoy.desktop.po summit/messages/extragear-utils/kimtoy._desktop_.po move summit/messages/extragear-utils/kimtoy.json.po summit/messages/extragear-utils/kimtoy._json_.po move summit/messages/extragear-utils/kio-stash.json.po summit/messages/extragear-utils/kio-stash._json_.po move summit/messages/extragear-utils/kmarkdownwebview.desktop.po summit/messages/extragear-utils/kmarkdownwebview._desktop_.po move summit/messages/extragear-utils/kpager.desktop.po summit/messages/extragear-utils/kpager._desktop_.po move summit/messages/extragear-utils/krecipes.desktop.po summit/messages/extragear-utils/krecipes._desktop_.po move summit/messages/extragear-utils/krename.desktop.po summit/messages/extragear-utils/krename._desktop_.po move summit/messages/extragear-utils/kronometer.desktop.po summit/messages/extragear-utils/kronometer._desktop_.po move summit/messages/extragear-utils/krusader.desktop.po summit/messages/extragear-utils/krusader._desktop_.po move summit/messages/extragear-utils/okteta.desktop.po summit/messages/extragear-utils/okteta._desktop_.po move summit/messages/extragear-utils/plasma-mycroft.desktop.po summit/messages/extragear-utils/plasma-mycroft._desktop_.po move summit/messages/extragear-utils/rsibreak.desktop.po summit/messages/extragear-utils/rsibreak._desktop_.po move summit/messages/extragear-utils/yakuake.desktop.po summit/messages/extragear-utils/yakuake._desktop_.po move summit/messages/frameworks/baloo.desktop.po summit/messages/frameworks/baloo._desktop_.po move summit/messages/frameworks/breeze-icons.desktop.po summit/messages/frameworks/breeze-icons._desktop_.po move summit/messages/frameworks/frameworkintegration.desktop.po summit/messages/frameworks/frameworkintegration._desktop_.po move summit/messages/frameworks/kcmutils.desktop.po summit/messages/frameworks/kcmutils._desktop_.po move summit/messages/frameworks/kconfig.desktop.po summit/messages/frameworks/kconfig._desktop_.po move summit/messages/frameworks/kconfigwidgets.desktop.po summit/messages/frameworks/kconfigwidgets._desktop_.po move summit/messages/frameworks/kded.desktop.po summit/messages/frameworks/kded._desktop_.po move summit/messages/frameworks/kdelibs4support.desktop.po summit/messages/frameworks/kdelibs4support._desktop_.po move summit/messages/frameworks/kemoticons.desktop.po summit/messages/frameworks/kemoticons._desktop_.po move summit/messages/frameworks/kglobalaccel.desktop.po summit/messages/frameworks/kglobalaccel._desktop_.po move summit/messages/frameworks/khtml.desktop.po summit/messages/frameworks/khtml._desktop_.po move summit/messages/frameworks/kio.desktop.po summit/messages/frameworks/kio._desktop_.po move summit/messages/frameworks/kio.json.po summit/messages/frameworks/kio._json_.po move summit/messages/frameworks/kirigami.desktop.po summit/messages/frameworks/kirigami._desktop_.po move summit/messages/frameworks/knewstuff.desktop.po summit/messages/frameworks/knewstuff._desktop_.po move summit/messages/frameworks/kpackage.desktop.po summit/messages/frameworks/kpackage._desktop_.po move summit/messages/frameworks/kparts.desktop.po summit/messages/frameworks/kparts._desktop_.po move summit/messages/frameworks/krunner.desktop.po summit/messages/frameworks/krunner._desktop_.po move summit/messages/frameworks/kservice.desktop.po summit/messages/frameworks/kservice._desktop_.po move summit/messages/frameworks/ktexteditor.desktop.po summit/messages/frameworks/ktexteditor._desktop_.po move summit/messages/frameworks/kwallet.desktop.po summit/messages/frameworks/kwallet._desktop_.po move summit/messages/frameworks/l10n.desktop.po summit/messages/frameworks/l10n._desktop_.po move summit/messages/frameworks/oxygen-icons5.desktop.po summit/messages/frameworks/oxygen-icons5._desktop_.po move summit/messages/frameworks/plasma-framework.desktop.po summit/messages/frameworks/plasma-framework._desktop_.po move summit/messages/frameworks/plasma-framework.json.po summit/messages/frameworks/plasma-framework._json_.po move summit/messages/frameworks/purpose.json.po summit/messages/frameworks/purpose._json_.po move summit/messages/kde-workspace/bluedevil.desktop.po summit/messages/kde-workspace/bluedevil._desktop_.po move summit/messages/kde-workspace/bluedevil.json.po summit/messages/kde-workspace/bluedevil._json_.po move summit/messages/kde-workspace/breeze.desktop.po summit/messages/kde-workspace/breeze._desktop_.po move summit/messages/kde-workspace/breeze.json.po summit/messages/kde-workspace/breeze._json_.po move summit/messages/kde-workspace/discover.desktop.po summit/messages/kde-workspace/discover._desktop_.po move summit/messages/kde-workspace/drkonqi.desktop.po summit/messages/kde-workspace/drkonqi._desktop_.po move summit/messages/kde-workspace/kactivities.json.po summit/messages/kde-workspace/kactivities._json_.po move summit/messages/kde-workspace/kactivitymanagerd.desktop.po summit/messages/kde-workspace/kactivitymanagerd._desktop_.po move summit/messages/kde-workspace/kde-cli-tools.desktop.po summit/messages/kde-workspace/kde-cli-tools._desktop_.po move summit/messages/kde-workspace/kde-gtk-config.desktop.po summit/messages/kde-workspace/kde-gtk-config._desktop_.po move summit/messages/kde-workspace/kdeplasma-addons.desktop.po summit/messages/kde-workspace/kdeplasma-addons._desktop_.po move summit/messages/kde-workspace/kdeplasma-addons.json.po summit/messages/kde-workspace/kdeplasma-addons._json_.po move summit/messages/kde-workspace/kgamma5.desktop.po summit/messages/kde-workspace/kgamma5._desktop_.po move summit/messages/kde-workspace/khotkeys.desktop.po summit/messages/kde-workspace/khotkeys._desktop_.po move summit/messages/kde-workspace/kinfocenter.desktop.po summit/messages/kde-workspace/kinfocenter._desktop_.po move summit/messages/kde-workspace/kmenuedit.desktop.po summit/messages/kde-workspace/kmenuedit._desktop_.po move summit/messages/kde-workspace/kscreen.desktop.po summit/messages/kde-workspace/kscreen._desktop_.po move summit/messages/kde-workspace/kscreenlocker.desktop.po summit/messages/kde-workspace/kscreenlocker._desktop_.po move summit/messages/kde-workspace/ksysguard.desktop.po summit/messages/kde-workspace/ksysguard._desktop_.po move summit/messages/kde-workspace/kwallet-pam.desktop.po summit/messages/kde-workspace/kwallet-pam._desktop_.po move summit/messages/kde-workspace/kwin.desktop.po summit/messages/kde-workspace/kwin._desktop_.po move summit/messages/kde-workspace/kwin.json.po summit/messages/kde-workspace/kwin._json_.po move summit/messages/kde-workspace/kwrited.desktop.po summit/messages/kde-workspace/kwrited._desktop_.po move summit/messages/kde-workspace/kwrited.json.po summit/messages/kde-workspace/kwrited._json_.po move summit/messages/kde-workspace/libksysguard.desktop.po summit/messages/kde-workspace/libksysguard._desktop_.po move summit/messages/kde-workspace/milou.desktop.po summit/messages/kde-workspace/milou._desktop_.po move summit/messages/kde-workspace/oxygen.desktop.po summit/messages/kde-workspace/oxygen._desktop_.po move summit/messages/kde-workspace/oxygen.json.po summit/messages/kde-workspace/oxygen._json_.po move summit/messages/kde-workspace/plasma-browser-integration.desktop.po summit/messages/kde-workspace/plasma-browser-integration._desktop_.po move summit/messages/kde-workspace/plasma-desktop.desktop.po summit/messages/kde-workspace/plasma-desktop._desktop_.po move summit/messages/kde-workspace/plasma-nm.desktop.po summit/messages/kde-workspace/plasma-nm._desktop_.po move summit/messages/kde-workspace/plasma-pa.desktop.po summit/messages/kde-workspace/plasma-pa._desktop_.po move summit/messages/kde-workspace/plasma-sdk.desktop.po summit/messages/kde-workspace/plasma-sdk._desktop_.po move summit/messages/kde-workspace/plasma-vault.desktop.po summit/messages/kde-workspace/plasma-vault._desktop_.po move summit/messages/kde-workspace/plasma-workspace-wallpapers.desktop.po summit/messages/kde-workspace/plasma-workspace-wallpapers._desktop_.po move summit/messages/kde-workspace/plasma-workspace.desktop.po summit/messages/kde-workspace/plasma-workspace._desktop_.po move summit/messages/kde-workspace/plymouth-kcm.desktop.po summit/messages/kde-workspace/plymouth-kcm._desktop_.po move summit/messages/kde-workspace/polkit-kde-agent-1.desktop.po summit/messages/kde-workspace/polkit-kde-agent-1._desktop_.po move summit/messages/kde-workspace/powerdevil.desktop.po summit/messages/kde-workspace/powerdevil._desktop_.po move summit/messages/kde-workspace/sddm-kcm.desktop.po summit/messages/kde-workspace/sddm-kcm._desktop_.po move summit/messages/kde-workspace/systemsettings.desktop.po summit/messages/kde-workspace/systemsettings._desktop_.po move summit/messages/kde-workspace/user-manager.desktop.po summit/messages/kde-workspace/user-manager._desktop_.po move summit/messages/kdeaccessibility/kmag.desktop.po summit/messages/kdeaccessibility/kmag._desktop_.po move summit/messages/kdeaccessibility/kmousetool.desktop.po summit/messages/kdeaccessibility/kmousetool._desktop_.po move summit/messages/kdeaccessibility/kmouth.desktop.po summit/messages/kdeaccessibility/kmouth._desktop_.po move summit/messages/kdeadmin/kcron.desktop.po summit/messages/kdeadmin/kcron._desktop_.po move summit/messages/kdeadmin/ksystemlog.desktop.po summit/messages/kdeadmin/ksystemlog._desktop_.po move summit/messages/kdeedu/artikulate.desktop.po summit/messages/kdeedu/artikulate._desktop_.po move summit/messages/kdeedu/artikulate.json.po summit/messages/kdeedu/artikulate._json_.po move summit/messages/kdeedu/blinken.desktop.po summit/messages/kdeedu/blinken._desktop_.po move summit/messages/kdeedu/cantor.desktop.po summit/messages/kdeedu/cantor._desktop_.po move summit/messages/kdeedu/cantor.json.po summit/messages/kdeedu/cantor._json_.po move summit/messages/kdeedu/kalgebra.desktop.po summit/messages/kdeedu/kalgebra._desktop_.po move summit/messages/kdeedu/kalzium.desktop.po summit/messages/kdeedu/kalzium._desktop_.po move summit/messages/kdeedu/kanagram.desktop.po summit/messages/kdeedu/kanagram._desktop_.po move summit/messages/kdeedu/kbruch.desktop.po summit/messages/kdeedu/kbruch._desktop_.po move summit/messages/kdeedu/kgeography.desktop.po summit/messages/kdeedu/kgeography._desktop_.po move summit/messages/kdeedu/khangman.desktop.po summit/messages/kdeedu/khangman._desktop_.po move summit/messages/kdeedu/kig.desktop.po summit/messages/kdeedu/kig._desktop_.po move summit/messages/kdeedu/kiten.desktop.po summit/messages/kdeedu/kiten._desktop_.po move summit/messages/kdeedu/klettres.desktop.po summit/messages/kdeedu/klettres._desktop_.po move summit/messages/kdeedu/kmplot.desktop.po summit/messages/kdeedu/kmplot._desktop_.po move summit/messages/kdeedu/ktouch.desktop.po summit/messages/kdeedu/ktouch._desktop_.po move summit/messages/kdeedu/kturtle.desktop.po summit/messages/kdeedu/kturtle._desktop_.po move summit/messages/kdeedu/kwordquiz.desktop.po summit/messages/kdeedu/kwordquiz._desktop_.po move summit/messages/kdeedu/marble.desktop.po summit/messages/kdeedu/marble._desktop_.po move summit/messages/kdeedu/minuet.desktop.po summit/messages/kdeedu/minuet._desktop_.po move summit/messages/kdeedu/minuet.json.po summit/messages/kdeedu/minuet._json_.po move summit/messages/kdeedu/parley.desktop.po summit/messages/kdeedu/parley._desktop_.po move summit/messages/kdeedu/rocs.desktop.po summit/messages/kdeedu/rocs._desktop_.po move summit/messages/kdeedu/rocs.json.po summit/messages/kdeedu/rocs._json_.po move summit/messages/kdeedu/step.desktop.po summit/messages/kdeedu/step._desktop_.po move summit/messages/kdegames/bomber.desktop.po summit/messages/kdegames/bomber._desktop_.po move summit/messages/kdegames/bovo.desktop.po summit/messages/kdegames/bovo._desktop_.po move summit/messages/kdegames/granatier.desktop.po summit/messages/kdegames/granatier._desktop_.po move summit/messages/kdegames/kajongg.desktop.po summit/messages/kdegames/kajongg._desktop_.po move summit/messages/kdegames/kapman.desktop.po summit/messages/kdegames/kapman._desktop_.po move summit/messages/kdegames/katomic.desktop.po summit/messages/kdegames/katomic._desktop_.po move summit/messages/kdegames/kblackbox.desktop.po summit/messages/kdegames/kblackbox._desktop_.po move summit/messages/kdegames/kblocks.desktop.po summit/messages/kdegames/kblocks._desktop_.po move summit/messages/kdegames/kbounce.desktop.po summit/messages/kdegames/kbounce._desktop_.po move summit/messages/kdegames/kbreakout.desktop.po summit/messages/kdegames/kbreakout._desktop_.po move summit/messages/kdegames/kdiamond.desktop.po summit/messages/kdegames/kdiamond._desktop_.po move summit/messages/kdegames/kfourinline.desktop.po summit/messages/kdegames/kfourinline._desktop_.po move summit/messages/kdegames/kgoldrunner.desktop.po summit/messages/kdegames/kgoldrunner._desktop_.po move summit/messages/kdegames/kigo.desktop.po summit/messages/kdegames/kigo._desktop_.po move summit/messages/kdegames/killbots.desktop.po summit/messages/kdegames/killbots._desktop_.po move summit/messages/kdegames/kiriki.desktop.po summit/messages/kdegames/kiriki._desktop_.po move summit/messages/kdegames/kjumpingcube.desktop.po summit/messages/kdegames/kjumpingcube._desktop_.po move summit/messages/kdegames/klickety.desktop.po summit/messages/kdegames/klickety._desktop_.po move summit/messages/kdegames/klines.desktop.po summit/messages/kdegames/klines._desktop_.po move summit/messages/kdegames/kmahjongg.desktop.po summit/messages/kdegames/kmahjongg._desktop_.po move summit/messages/kdegames/kmines.desktop.po summit/messages/kdegames/kmines._desktop_.po move summit/messages/kdegames/knavalbattle.desktop.po summit/messages/kdegames/knavalbattle._desktop_.po move summit/messages/kdegames/knetwalk.desktop.po summit/messages/kdegames/knetwalk._desktop_.po move summit/messages/kdegames/kolf.desktop.po summit/messages/kdegames/kolf._desktop_.po move summit/messages/kdegames/kollision.desktop.po summit/messages/kdegames/kollision._desktop_.po move summit/messages/kdegames/konquest.desktop.po summit/messages/kdegames/konquest._desktop_.po move summit/messages/kdegames/kpat.desktop.po summit/messages/kdegames/kpat._desktop_.po move summit/messages/kdegames/kreversi.desktop.po summit/messages/kdegames/kreversi._desktop_.po move summit/messages/kdegames/kshisen.desktop.po summit/messages/kdegames/kshisen._desktop_.po move summit/messages/kdegames/ksirk.desktop.po summit/messages/kdegames/ksirk._desktop_.po move summit/messages/kdegames/ksnakeduel.desktop.po summit/messages/kdegames/ksnakeduel._desktop_.po move summit/messages/kdegames/kspaceduel.desktop.po summit/messages/kdegames/kspaceduel._desktop_.po move summit/messages/kdegames/ksquares.desktop.po summit/messages/kdegames/ksquares._desktop_.po move summit/messages/kdegames/ksudoku.desktop.po summit/messages/kdegames/ksudoku._desktop_.po move summit/messages/kdegames/ktuberling.desktop.po summit/messages/kdegames/ktuberling._desktop_.po move summit/messages/kdegames/kubrick.desktop.po summit/messages/kdegames/kubrick._desktop_.po move summit/messages/kdegames/libkdegames.desktop.po summit/messages/kdegames/libkdegames._desktop_.po move summit/messages/kdegames/libkmahjongg.desktop.po summit/messages/kdegames/libkmahjongg._desktop_.po move summit/messages/kdegames/lskat.desktop.po summit/messages/kdegames/lskat._desktop_.po move summit/messages/kdegames/palapeli.desktop.po summit/messages/kdegames/palapeli._desktop_.po move summit/messages/kdegames/picmi.desktop.po summit/messages/kdegames/picmi._desktop_.po move summit/messages/kdegraphics/gwenview.desktop.po summit/messages/kdegraphics/gwenview._desktop_.po move summit/messages/kdegraphics/kamera.desktop.po summit/messages/kdegraphics/kamera._desktop_.po move summit/messages/kdegraphics/kcolorchooser.desktop.po summit/messages/kdegraphics/kcolorchooser._desktop_.po move summit/messages/kdegraphics/kdegraphics-mobipocket.desktop.po summit/messages/kdegraphics/kdegraphics-mobipocket._desktop_.po move summit/messages/kdegraphics/kdegraphics-thumbnailers.desktop.po summit/messages/kdegraphics/kdegraphics-thumbnailers._desktop_.po move summit/messages/kdegraphics/kolourpaint.desktop.po summit/messages/kdegraphics/kolourpaint._desktop_.po move summit/messages/kdegraphics/kruler.desktop.po summit/messages/kdegraphics/kruler._desktop_.po move summit/messages/kdegraphics/libkipi.desktop.po summit/messages/kdegraphics/libkipi._desktop_.po move summit/messages/kdegraphics/okular.desktop.po summit/messages/kdegraphics/okular._desktop_.po move summit/messages/kdegraphics/okular.json.po summit/messages/kdegraphics/okular._json_.po move summit/messages/kdegraphics/spectacle.desktop.po summit/messages/kdegraphics/spectacle._desktop_.po move summit/messages/kdegraphics/svgpart.desktop.po summit/messages/kdegraphics/svgpart._desktop_.po move summit/messages/kdemultimedia/audiocd-kio.desktop.po summit/messages/kdemultimedia/audiocd-kio._desktop_.po move summit/messages/kdemultimedia/dragon.desktop.po summit/messages/kdemultimedia/dragon._desktop_.po move summit/messages/kdemultimedia/ffmpegthumbs.desktop.po summit/messages/kdemultimedia/ffmpegthumbs._desktop_.po move summit/messages/kdemultimedia/juk.desktop.po summit/messages/kdemultimedia/juk._desktop_.po move summit/messages/kdemultimedia/k3b.desktop.po summit/messages/kdemultimedia/k3b._desktop_.po move summit/messages/kdemultimedia/kamoso.desktop.po summit/messages/kdemultimedia/kamoso._desktop_.po move summit/messages/kdemultimedia/kdenlive.desktop.po summit/messages/kdemultimedia/kdenlive._desktop_.po move summit/messages/kdemultimedia/kmix.desktop.po summit/messages/kdemultimedia/kmix._desktop_.po move summit/messages/kdemultimedia/kwave.desktop.po summit/messages/kdemultimedia/kwave._desktop_.po move summit/messages/kdemultimedia/libkcddb.desktop.po summit/messages/kdemultimedia/libkcddb._desktop_.po move summit/messages/kdenetwork/kaccounts-integration.desktop.po summit/messages/kdenetwork/kaccounts-integration._desktop_.po move summit/messages/kdenetwork/kaccounts-providers.desktop.po summit/messages/kdenetwork/kaccounts-providers._desktop_.po move summit/messages/kdenetwork/kdenetwork-filesharing.desktop.po summit/messages/kdenetwork/kdenetwork-filesharing._desktop_.po move summit/messages/kdenetwork/kget.desktop.po summit/messages/kdenetwork/kget._desktop_.po move summit/messages/kdenetwork/kio-extras.desktop.po summit/messages/kdenetwork/kio-extras._desktop_.po move summit/messages/kdenetwork/kopete.desktop.po summit/messages/kdenetwork/kopete._desktop_.po move summit/messages/kdenetwork/krdc.desktop.po summit/messages/kdenetwork/krdc._desktop_.po move summit/messages/kdenetwork/krfb.desktop.po summit/messages/kdenetwork/krfb._desktop_.po move summit/messages/kdenetwork/krfb.json.po summit/messages/kdenetwork/krfb._json_.po move summit/messages/kdenetwork/ktp-accounts-kcm.desktop.po summit/messages/kdenetwork/ktp-accounts-kcm._desktop_.po move summit/messages/kdenetwork/ktp-approver.desktop.po summit/messages/kdenetwork/ktp-approver._desktop_.po move summit/messages/kdenetwork/ktp-common-internals.desktop.po summit/messages/kdenetwork/ktp-common-internals._desktop_.po move summit/messages/kdenetwork/ktp-common-internals.json.po summit/messages/kdenetwork/ktp-common-internals._json_.po move summit/messages/kdenetwork/ktp-contact-list.desktop.po summit/messages/kdenetwork/ktp-contact-list._desktop_.po move summit/messages/kdenetwork/ktp-contact-runner.desktop.po summit/messages/kdenetwork/ktp-contact-runner._desktop_.po move summit/messages/kdenetwork/ktp-desktop-applets.desktop.po summit/messages/kdenetwork/ktp-desktop-applets._desktop_.po move summit/messages/kdenetwork/ktp-kded-module.desktop.po summit/messages/kdenetwork/ktp-kded-module._desktop_.po move summit/messages/kdenetwork/ktp-send-file.desktop.po summit/messages/kdenetwork/ktp-send-file._desktop_.po move summit/messages/kdenetwork/ktp-text-ui.desktop.po summit/messages/kdenetwork/ktp-text-ui._desktop_.po move summit/messages/kdenetwork/zeroconf-ioslave.desktop.po summit/messages/kdenetwork/zeroconf-ioslave._desktop_.po move summit/messages/kdereview/kdots.desktop.po summit/messages/kdereview/kdots._desktop_.po move summit/messages/kdereview/kpeg.desktop.po summit/messages/kdereview/kpeg._desktop_.po move summit/messages/kdereview/liquidshell.desktop.po summit/messages/kdereview/liquidshell._desktop_.po move summit/messages/kdereview/plasma-active-window-control.desktop.po summit/messages/kdereview/plasma-active-window-control._desktop_.po move summit/messages/kdereview/plasma-redshift-control.desktop.po summit/messages/kdereview/plasma-redshift-control._desktop_.po move summit/messages/kdereview/plasma-simplemenu.desktop.po summit/messages/kdereview/plasma-simplemenu._desktop_.po move summit/messages/kdereview/ring-kde.desktop.po summit/messages/kdereview/ring-kde._desktop_.po move summit/messages/kdereview/symmy.json.po summit/messages/kdereview/symmy._json_.po move summit/messages/kdesdk/cervisia.desktop.po summit/messages/kdesdk/cervisia._desktop_.po move summit/messages/kdesdk/dolphin-plugins.desktop.po summit/messages/kdesdk/dolphin-plugins._desktop_.po move summit/messages/kdesdk/kapptemplate.desktop.po summit/messages/kdesdk/kapptemplate._desktop_.po move summit/messages/kdesdk/kcachegrind.desktop.po summit/messages/kdesdk/kcachegrind._desktop_.po move summit/messages/kdesdk/kde-dev-utils.desktop.po summit/messages/kdesdk/kde-dev-utils._desktop_.po move summit/messages/kdesdk/kdesdk-thumbnailers.desktop.po summit/messages/kdesdk/kdesdk-thumbnailers._desktop_.po move summit/messages/kdesdk/kompare.desktop.po summit/messages/kdesdk/kompare._desktop_.po move summit/messages/kdesdk/lokalize.desktop.po summit/messages/kdesdk/lokalize._desktop_.po move summit/messages/kdesdk/umbrello.desktop.po summit/messages/kdesdk/umbrello._desktop_.po move summit/messages/kdesdk/umbrello.json.po summit/messages/kdesdk/umbrello._json_.po move summit/messages/kdeutils/ark.desktop.po summit/messages/kdeutils/ark._desktop_.po move summit/messages/kdeutils/ark.json.po summit/messages/kdeutils/ark._json_.po move summit/messages/kdeutils/filelight.desktop.po summit/messages/kdeutils/filelight._desktop_.po move summit/messages/kdeutils/kbackup.desktop.po summit/messages/kdeutils/kbackup._desktop_.po move summit/messages/kdeutils/kcalc.desktop.po summit/messages/kdeutils/kcalc._desktop_.po move summit/messages/kdeutils/kcharselect.desktop.po summit/messages/kdeutils/kcharselect._desktop_.po move summit/messages/kdeutils/kdebugsettings.desktop.po summit/messages/kdeutils/kdebugsettings._desktop_.po move summit/messages/kdeutils/kdf.desktop.po summit/messages/kdeutils/kdf._desktop_.po move summit/messages/kdeutils/kfloppy.desktop.po summit/messages/kdeutils/kfloppy._desktop_.po move summit/messages/kdeutils/kgpg.desktop.po summit/messages/kdeutils/kgpg._desktop_.po move summit/messages/kdeutils/kteatime.desktop.po summit/messages/kdeutils/kteatime._desktop_.po move summit/messages/kdeutils/ktimer.desktop.po summit/messages/kdeutils/ktimer._desktop_.po move summit/messages/kdeutils/kwalletmanager.desktop.po summit/messages/kdeutils/kwalletmanager._desktop_.po move summit/messages/kdeutils/print-manager.desktop.po summit/messages/kdeutils/print-manager._desktop_.po move summit/messages/kdeutils/sweeper.desktop.po summit/messages/kdeutils/sweeper._desktop_.po move summit/messages/kdewebdev/kimagemapeditor.desktop.po summit/messages/kdewebdev/kimagemapeditor._desktop_.po move summit/messages/pim/akonadi-calendar-tools.desktop.po summit/messages/pim/akonadi-calendar-tools._desktop_.po move summit/messages/pim/akonadi-calendar.desktop.po summit/messages/pim/akonadi-calendar._desktop_.po move summit/messages/pim/akonadi-contacts.desktop.po summit/messages/pim/akonadi-contacts._desktop_.po move summit/messages/pim/akonadi-contacts.json.po summit/messages/pim/akonadi-contacts._json_.po move summit/messages/pim/akonadi-import-wizard.desktop.po summit/messages/pim/akonadi-import-wizard._desktop_.po move summit/messages/pim/akonadi-import-wizard.json.po summit/messages/pim/akonadi-import-wizard._json_.po move summit/messages/pim/akonadi-mime.desktop.po summit/messages/pim/akonadi-mime._desktop_.po move summit/messages/pim/akonadi-search.desktop.po summit/messages/pim/akonadi-search._desktop_.po move summit/messages/pim/akonadi.desktop.po summit/messages/pim/akonadi._desktop_.po move summit/messages/pim/akonadiconsole.desktop.po summit/messages/pim/akonadiconsole._desktop_.po move summit/messages/pim/akregator.desktop.po summit/messages/pim/akregator._desktop_.po move summit/messages/pim/calendarsupport.desktop.po summit/messages/pim/calendarsupport._desktop_.po move summit/messages/pim/eventviews.desktop.po summit/messages/pim/eventviews._desktop_.po move summit/messages/pim/grantlee-editor.desktop.po summit/messages/pim/grantlee-editor._desktop_.po move summit/messages/pim/kaddressbook.desktop.po summit/messages/pim/kaddressbook._desktop_.po move summit/messages/pim/kalarm.desktop.po summit/messages/pim/kalarm._desktop_.po move summit/messages/pim/kalarmcal.desktop.po summit/messages/pim/kalarmcal._desktop_.po move summit/messages/pim/kdepim-addons.desktop.po summit/messages/pim/kdepim-addons._desktop_.po move summit/messages/pim/kdepim-addons.json.po summit/messages/pim/kdepim-addons._json_.po move summit/messages/pim/kdepim-runtime.desktop.po summit/messages/pim/kdepim-runtime._desktop_.po move summit/messages/pim/kleopatra.desktop.po summit/messages/pim/kleopatra._desktop_.po move summit/messages/pim/kmail-account-wizard.desktop.po summit/messages/pim/kmail-account-wizard._desktop_.po move summit/messages/pim/kmail.desktop.po summit/messages/pim/kmail._desktop_.po move summit/messages/pim/kmailtransport.desktop.po summit/messages/pim/kmailtransport._desktop_.po move summit/messages/pim/kmailtransport.json.po summit/messages/pim/kmailtransport._json_.po move summit/messages/pim/knotes.desktop.po summit/messages/pim/knotes._desktop_.po move summit/messages/pim/kontact.desktop.po summit/messages/pim/kontact._desktop_.po move summit/messages/pim/kontactinterface.desktop.po summit/messages/pim/kontactinterface._desktop_.po move summit/messages/pim/korganizer.desktop.po summit/messages/pim/korganizer._desktop_.po move summit/messages/pim/libkdepim.desktop.po summit/messages/pim/libkdepim._desktop_.po move summit/messages/pim/libkleo.desktop.po summit/messages/pim/libkleo._desktop_.po move summit/messages/pim/libksieve.desktop.po summit/messages/pim/libksieve._desktop_.po move summit/messages/pim/mbox-importer.desktop.po summit/messages/pim/mbox-importer._desktop_.po move summit/messages/pim/messagelib.desktop.po summit/messages/pim/messagelib._desktop_.po move summit/messages/pim/messagelib.json.po summit/messages/pim/messagelib._json_.po move summit/messages/pim/pim-data-exporter.desktop.po summit/messages/pim/pim-data-exporter._desktop_.po move summit/messages/pim/pim-sieve-editor.desktop.po summit/messages/pim/pim-sieve-editor._desktop_.po move summit/messages/playground-accessibility/ksayit.desktop.po summit/messages/playground-accessibility/ksayit._desktop_.po move summit/messages/playground-accessibility/simon-tools.desktop.po summit/messages/playground-accessibility/simon-tools._desktop_.po move summit/messages/playground-artwork/KDEArtWork.port.desktop.po summit/messages/playground-artwork/KDEArtWork.port._desktop_.po move summit/messages/playground-artwork/Oxygen.desktop.po summit/messages/playground-artwork/Oxygen._desktop_.po move summit/messages/playground-artwork/cokoon.desktop.po summit/messages/playground-artwork/cokoon._desktop_.po move summit/messages/playground-artwork/dekorator.desktop.po summit/messages/playground-artwork/dekorator._desktop_.po move summit/messages/playground-artwork/ion.desktop.po summit/messages/playground-artwork/ion._desktop_.po move summit/messages/playground-artwork/kde-artwork-active.desktop.po summit/messages/playground-artwork/kde-artwork-active._desktop_.po move summit/messages/playground-artwork/oxygen-transparent.desktop.po summit/messages/playground-artwork/oxygen-transparent._desktop_.po move summit/messages/playground-artwork/plastik-focus.desktop.po summit/messages/playground-artwork/plastik-focus._desktop_.po move summit/messages/playground-artwork/plastik.desktop.po summit/messages/playground-artwork/plastik._desktop_.po move summit/messages/playground-artwork/smaragd.desktop.po summit/messages/playground-artwork/smaragd._desktop_.po move summit/messages/playground-artwork/smaragd.json.po summit/messages/playground-artwork/smaragd._json_.po move summit/messages/playground-artwork/smooth-blend.desktop.po summit/messages/playground-artwork/smooth-blend._desktop_.po move summit/messages/playground-base/appmenu-runner.desktop.po summit/messages/playground-base/appmenu-runner._desktop_.po move summit/messages/playground-base/colibri.desktop.po summit/messages/playground-base/colibri._desktop_.po move summit/messages/playground-base/colors.desktop.po summit/messages/playground-base/colors._desktop_.po move summit/messages/playground-base/datasources.desktop.po summit/messages/playground-base/datasources._desktop_.po move summit/messages/playground-base/declarative-plasmoids.desktop.po summit/messages/playground-base/declarative-plasmoids._desktop_.po move summit/messages/playground-base/flickr-runner.desktop.po summit/messages/playground-base/flickr-runner._desktop_.po move summit/messages/playground-base/gestures-kde.desktop.po summit/messages/playground-base/gestures-kde._desktop_.po move summit/messages/playground-base/homerun.desktop.po summit/messages/playground-base/homerun._desktop_.po move summit/messages/playground-base/kded_kosd.desktop.po summit/messages/playground-base/kded_kosd._desktop_.po move summit/messages/playground-base/kdeprint.desktop.po summit/messages/playground-base/kdeprint._desktop_.po move summit/messages/playground-base/kfingerprint.desktop.po summit/messages/playground-base/kfingerprint._desktop_.po move summit/messages/playground-base/kio_sysinfo.desktop.po summit/messages/playground-base/kio_sysinfo._desktop_.po move summit/messages/playground-base/klipper-ng.desktop.po summit/messages/playground-base/klipper-ng._desktop_.po move summit/messages/playground-base/konq-plugins.desktop.po summit/messages/playground-base/konq-plugins._desktop_.po move summit/messages/playground-base/krono.desktop.po summit/messages/playground-base/krono._desktop_.po move summit/messages/playground-base/kubuntu-driver-kcm.desktop.po summit/messages/playground-base/kubuntu-driver-kcm._desktop_.po move summit/messages/playground-base/kubuntu-notification-helper.desktop.po summit/messages/playground-base/kubuntu-notification-helper._desktop_.po move summit/messages/playground-base/kwindowsaddons.desktop.po summit/messages/playground-base/kwindowsaddons._desktop_.po move summit/messages/playground-base/lightdm.desktop.po summit/messages/playground-base/lightdm._desktop_.po move summit/messages/playground-base/nepomuk-kde.desktop.po summit/messages/playground-base/nepomuk-kde._desktop_.po move summit/messages/playground-base/nepomuk-system-tray.desktop.po summit/messages/playground-base/nepomuk-system-tray._desktop_.po move summit/messages/playground-base/nepomuk-web-extractor.desktop.po summit/messages/playground-base/nepomuk-web-extractor._desktop_.po move summit/messages/playground-base/nepomukannotation.desktop.po summit/messages/playground-base/nepomukannotation._desktop_.po move summit/messages/playground-base/plasma-crystal.desktop.po summit/messages/playground-base/plasma-crystal._desktop_.po move summit/messages/playground-base/plasma-lionmail.desktop.po summit/messages/playground-base/plasma-lionmail._desktop_.po move summit/messages/playground-base/plasma-pk-updates.desktop.po summit/messages/playground-base/plasma-pk-updates._desktop_.po move summit/messages/playground-base/plasma-systemd-integration.desktop.po summit/messages/playground-base/plasma-systemd-integration._desktop_.po move summit/messages/playground-base/plasma.desktop.po summit/messages/playground-base/plasma._desktop_.po move summit/messages/playground-base/publictransport.desktop.po summit/messages/playground-base/publictransport._desktop_.po move summit/messages/playground-base/remotewidgets.desktop.po summit/messages/playground-base/remotewidgets._desktop_.po move summit/messages/playground-base/samba-mounter.desktop.po summit/messages/playground-base/samba-mounter._desktop_.po move summit/messages/playground-base/scribo.desktop.po summit/messages/playground-base/scribo._desktop_.po move summit/messages/playground-base/silk.desktop.po summit/messages/playground-base/silk._desktop_.po move summit/messages/playground-base/stackfolder.desktop.po summit/messages/playground-base/stackfolder._desktop_.po move summit/messages/playground-base/strigi-analyzer.desktop.po summit/messages/playground-base/strigi-analyzer._desktop_.po move summit/messages/playground-base/strigiplasmoid.desktop.po summit/messages/playground-base/strigiplasmoid._desktop_.po move summit/messages/playground-base/whoopsie-kcm.desktop.po summit/messages/playground-base/whoopsie-kcm._desktop_.po move summit/messages/playground-base/xsettings-kde.desktop.po summit/messages/playground-base/xsettings-kde._desktop_.po move summit/messages/playground-devtools/binspekt.desktop.po summit/messages/playground-devtools/binspekt._desktop_.po move summit/messages/playground-devtools/kategdbplugin.desktop.po summit/messages/playground-devtools/kategdbplugin._desktop_.po move summit/messages/playground-devtools/kdev-cargo.json.po summit/messages/playground-devtools/kdev-cargo._json_.po move summit/messages/playground-devtools/kdev-clang-tidy.json.po summit/messages/playground-devtools/kdev-clang-tidy._json_.po move summit/messages/playground-devtools/kdev-control-flow-graph.desktop.po summit/messages/playground-devtools/kdev-control-flow-graph._desktop_.po move summit/messages/playground-devtools/kdev-css.json.po summit/messages/playground-devtools/kdev-css._json_.po move summit/messages/playground-devtools/kdev-embedded.json.po summit/messages/playground-devtools/kdev-embedded._json_.po move summit/messages/playground-devtools/kdev-executebrowser.json.po summit/messages/playground-devtools/kdev-executebrowser._json_.po move summit/messages/playground-devtools/kdev-go.desktop.po summit/messages/playground-devtools/kdev-go._desktop_.po move summit/messages/playground-devtools/kdev-go.json.po summit/messages/playground-devtools/kdev-go._json_.po move summit/messages/playground-devtools/kdev-krazy2.json.po summit/messages/playground-devtools/kdev-krazy2._json_.po move summit/messages/playground-devtools/kdev-mercurial.json.po summit/messages/playground-devtools/kdev-mercurial._json_.po move summit/messages/playground-devtools/kdev-ruby.desktop.po summit/messages/playground-devtools/kdev-ruby._desktop_.po move summit/messages/playground-devtools/kdev-ruby.json.po summit/messages/playground-devtools/kdev-ruby._json_.po move summit/messages/playground-devtools/kdev-rust.desktop.po summit/messages/playground-devtools/kdev-rust._desktop_.po move summit/messages/playground-devtools/kdev-rust.json.po summit/messages/playground-devtools/kdev-rust._json_.po move summit/messages/playground-devtools/kdev-upload.desktop.po summit/messages/playground-devtools/kdev-upload._desktop_.po move summit/messages/playground-devtools/kdev-upload.json.po summit/messages/playground-devtools/kdev-upload._json_.po move summit/messages/playground-devtools/kdev-valgrind.json.po summit/messages/playground-devtools/kdev-valgrind._json_.po move summit/messages/playground-devtools/kdev-verapp.json.po summit/messages/playground-devtools/kdev-verapp._json_.po move summit/messages/playground-devtools/kdev-xdebug.json.po summit/messages/playground-devtools/kdev-xdebug._json_.po move summit/messages/playground-devtools/kdevelop3-extra-plugins.desktop.po summit/messages/playground-devtools/kdevelop3-extra-plugins._desktop_.po move summit/messages/playground-devtools/kdevelop4-extra-plugins.desktop.po summit/messages/playground-devtools/kdevelop4-extra-plugins._desktop_.po move summit/messages/playground-devtools/kdiff3.desktop.po summit/messages/playground-devtools/kdiff3._desktop_.po move summit/messages/playground-devtools/kdiff3.json.po summit/messages/playground-devtools/kdiff3._json_.po move summit/messages/playground-devtools/kte_linter.desktop.po summit/messages/playground-devtools/kte_linter._desktop_.po move summit/messages/playground-devtools/kte_quicksnippet.desktop.po summit/messages/playground-devtools/kte_quicksnippet._desktop_.po move summit/messages/playground-devtools/ktechlab.desktop.po summit/messages/playground-devtools/ktechlab._desktop_.po move summit/messages/playground-devtools/quanta.desktop.po summit/messages/playground-devtools/quanta._desktop_.po move summit/messages/playground-edu/conquirere.desktop.po summit/messages/playground-edu/conquirere._desktop_.po move summit/messages/playground-edu/ebookreader.desktop.po summit/messages/playground-edu/ebookreader._desktop_.po move summit/messages/playground-edu/kalcul.desktop.po summit/messages/playground-edu/kalcul._desktop_.po move summit/messages/playground-edu/kard.desktop.po summit/messages/playground-edu/kard._desktop_.po move summit/messages/playground-edu/kartesio.desktop.po summit/messages/playground-edu/kartesio._desktop_.po move summit/messages/playground-edu/keduca.desktop.po summit/messages/playground-edu/keduca._desktop_.po move summit/messages/playground-edu/khipu.desktop.po summit/messages/playground-edu/khipu._desktop_.po move summit/messages/playground-edu/kmathtool.desktop.po summit/messages/playground-edu/kmathtool._desktop_.po move summit/messages/playground-edu/kverbos.desktop.po summit/messages/playground-edu/kverbos._desktop_.po move summit/messages/playground-edu/mula.desktop.po summit/messages/playground-edu/mula._desktop_.po move summit/messages/playground-edu/rkward.desktop.po summit/messages/playground-edu/rkward._desktop_.po move summit/messages/playground-edu/workout.desktop.po summit/messages/playground-edu/workout._desktop_.po move summit/messages/playground-games/backgammon.desktop.po summit/messages/playground-games/backgammon._desktop_.po move summit/messages/playground-games/gluon.desktop.po summit/messages/playground-games/gluon._desktop_.po move summit/messages/playground-games/kbackgammon.desktop.po summit/messages/playground-games/kbackgammon._desktop_.po move summit/messages/playground-games/kmuddy.desktop.po summit/messages/playground-games/kmuddy._desktop_.po move summit/messages/playground-games/kolf-ng.desktop.po summit/messages/playground-games/kolf-ng._desktop_.po move summit/messages/playground-games/kombination.desktop.po summit/messages/playground-games/kombination._desktop_.po move summit/messages/playground-games/krosswordpuzzle.desktop.po summit/messages/playground-games/krosswordpuzzle._desktop_.po move summit/messages/playground-games/ksokoban.desktop.po summit/messages/playground-games/ksokoban._desktop_.po move summit/messages/playground-games/kspiral.desktop.po summit/messages/playground-games/kspiral._desktop_.po move summit/messages/playground-games/kttt.desktop.po summit/messages/playground-games/kttt._desktop_.po move summit/messages/playground-games/libtagaro.desktop.po summit/messages/playground-games/libtagaro._desktop_.po move summit/messages/playground-games/magazynier.desktop.po summit/messages/playground-games/magazynier._desktop_.po move summit/messages/playground-games/mancala.desktop.po summit/messages/playground-games/mancala._desktop_.po move summit/messages/playground-games/parsek.desktop.po summit/messages/playground-games/parsek._desktop_.po move summit/messages/playground-graphics/bookmanager.desktop.po summit/messages/playground-graphics/bookmanager._desktop_.po move summit/messages/playground-graphics/cirkuit.desktop.po summit/messages/playground-graphics/cirkuit._desktop_.po move summit/messages/playground-graphics/colord-kde.desktop.po summit/messages/playground-graphics/colord-kde._desktop_.po move summit/messages/playground-graphics/darkroom.desktop.po summit/messages/playground-graphics/darkroom._desktop_.po move summit/messages/playground-graphics/example_akonadi_imageviewer.desktop.po summit/messages/playground-graphics/example_akonadi_imageviewer._desktop_.po move summit/messages/playground-graphics/koko.desktop.po summit/messages/playground-graphics/koko._desktop_.po move summit/messages/playground-graphics/kooka.desktop.po summit/messages/playground-graphics/kooka._desktop_.po move summit/messages/playground-graphics/ksana.desktop.po summit/messages/playground-graphics/ksana._desktop_.po move summit/messages/playground-graphics/localimageakonadiresource.desktop.po summit/messages/playground-graphics/localimageakonadiresource._desktop_.po move summit/messages/playground-graphics/okular-emf.desktop.po summit/messages/playground-graphics/okular-emf._desktop_.po move summit/messages/playground-graphics/okular-mupdf.desktop.po summit/messages/playground-graphics/okular-mupdf._desktop_.po move summit/messages/playground-graphics/skansuite.desktop.po summit/messages/playground-graphics/skansuite._desktop_.po move summit/messages/playground-graphics/solidkreator.desktop.po summit/messages/playground-graphics/solidkreator._desktop_.po move summit/messages/playground-ioslaves/kio-beagle.desktop.po summit/messages/playground-ioslaves/kio-beagle._desktop_.po move summit/messages/playground-ioslaves/kio-clucene.desktop.po summit/messages/playground-ioslaves/kio-clucene._desktop_.po move summit/messages/playground-ioslaves/kio-giobridge.desktop.po summit/messages/playground-ioslaves/kio-giobridge._desktop_.po move summit/messages/playground-ioslaves/kio-locate.desktop.po summit/messages/playground-ioslaves/kio-locate._desktop_.po move summit/messages/playground-ioslaves/kwest.desktop.po summit/messages/playground-ioslaves/kwest._desktop_.po move summit/messages/playground-libs/ktutorial.desktop.po summit/messages/playground-libs/ktutorial._desktop_.po move summit/messages/playground-mobile/plasma-phone-components.desktop.po summit/messages/playground-mobile/plasma-phone-components._desktop_.po move summit/messages/playground-mobile/spacebar.desktop.po summit/messages/playground-mobile/spacebar._desktop_.po move summit/messages/playground-multimedia/audex.desktop.po summit/messages/playground-multimedia/audex._desktop_.po move summit/messages/playground-multimedia/bangarang.desktop.po summit/messages/playground-multimedia/bangarang._desktop_.po move summit/messages/playground-multimedia/jultagger.desktop.po summit/messages/playground-multimedia/jultagger._desktop_.po move summit/messages/playground-multimedia/jungle.desktop.po summit/messages/playground-multimedia/jungle._desktop_.po move summit/messages/playground-multimedia/kalva2.desktop.po summit/messages/playground-multimedia/kalva2._desktop_.po move summit/messages/playground-multimedia/kcam.desktop.po summit/messages/playground-multimedia/kcam._desktop_.po move summit/messages/playground-multimedia/kenvy24.desktop.po summit/messages/playground-multimedia/kenvy24._desktop_.po move summit/messages/playground-multimedia/kscd.desktop.po summit/messages/playground-multimedia/kscd._desktop_.po move summit/messages/playground-multimedia/kxtodvd.desktop.po summit/messages/playground-multimedia/kxtodvd._desktop_.po move summit/messages/playground-multimedia/lintv.desktop.po summit/messages/playground-multimedia/lintv._desktop_.po move summit/messages/playground-multimedia/nepomuktvnamer.desktop.po summit/messages/playground-multimedia/nepomuktvnamer._desktop_.po move summit/messages/playground-multimedia/phonon-backends.desktop.po summit/messages/playground-multimedia/phonon-backends._desktop_.po move summit/messages/playground-multimedia/vvave.desktop.po summit/messages/playground-multimedia/vvave._desktop_.po move summit/messages/playground-network/aki.desktop.po summit/messages/playground-network/aki._desktop_.po move summit/messages/playground-network/guidedog.desktop.po summit/messages/playground-network/guidedog._desktop_.po move summit/messages/playground-network/kfritz.desktop.po summit/messages/playground-network/kfritz._desktop_.po move summit/messages/playground-network/kio_slp.desktop.po summit/messages/playground-network/kio_slp._desktop_.po move summit/messages/playground-network/konqueror-sendtoplugin.desktop.po summit/messages/playground-network/konqueror-sendtoplugin._desktop_.po move summit/messages/playground-network/konsume.desktop.po summit/messages/playground-network/konsume._desktop_.po move summit/messages/playground-network/kopete-pimpresence.desktop.po summit/messages/playground-network/kopete-pimpresence._desktop_.po move summit/messages/playground-network/kopete-scripting.desktop.po summit/messages/playground-network/kopete-scripting._desktop_.po move summit/messages/playground-network/kopete-sharemydesktop.desktop.po summit/messages/playground-network/kopete-sharemydesktop._desktop_.po move summit/messages/playground-network/kopete-smpppdcs.desktop.po summit/messages/playground-network/kopete-smpppdcs._desktop_.po move summit/messages/playground-network/kopete-thinklight.desktop.po summit/messages/playground-network/kopete-thinklight._desktop_.po move summit/messages/playground-network/kopete-whiteboard.desktop.po summit/messages/playground-network/kopete-whiteboard._desktop_.po move summit/messages/playground-network/ksniffer.desktop.po summit/messages/playground-network/ksniffer._desktop_.po move summit/messages/playground-network/kte-collaborative.desktop.po summit/messages/playground-network/kte-collaborative._desktop_.po move summit/messages/playground-network/ktp-active.desktop.po summit/messages/playground-network/ktp-active._desktop_.po move summit/messages/playground-network/ktp-kipi-plugin.desktop.po summit/messages/playground-network/ktp-kipi-plugin._desktop_.po move summit/messages/playground-network/ktp-ssh-contact.desktop.po summit/messages/playground-network/ktp-ssh-contact._desktop_.po move summit/messages/playground-network/kvpnc.desktop.po summit/messages/playground-network/kvpnc._desktop_.po move summit/messages/playground-network/kwhiteboard.desktop.po summit/messages/playground-network/kwhiteboard._desktop_.po move summit/messages/playground-network/kwooty.desktop.po summit/messages/playground-network/kwooty._desktop_.po move summit/messages/playground-network/libktelepathy-examples.desktop.po summit/messages/playground-network/libktelepathy-examples._desktop_.po move summit/messages/playground-network/solid-sysclass.desktop.po summit/messages/playground-network/solid-sysclass._desktop_.po move summit/messages/playground-network/videocatcher.desktop.po summit/messages/playground-network/videocatcher._desktop_.po move summit/messages/playground-office/knipptasch.desktop.po summit/messages/playground-office/knipptasch._desktop_.po move summit/messages/playground-office/kofficeplugins.desktop.po summit/messages/playground-office/kofficeplugins._desktop_.po move summit/messages/playground-office/pekunia.desktop.po summit/messages/playground-office/pekunia._desktop_.po move summit/messages/playground-pim/akonadi-airsync.desktop.po summit/messages/playground-pim/akonadi-airsync._desktop_.po move summit/messages/playground-pim/akonadi-exchange.desktop.po summit/messages/playground-pim/akonadi-exchange._desktop_.po move summit/messages/playground-pim/akonadi-git-resource.desktop.po summit/messages/playground-pim/akonadi-git-resource._desktop_.po move summit/messages/playground-pim/akonadi-google-applets.desktop.po summit/messages/playground-pim/akonadi-google-applets._desktop_.po move summit/messages/playground-pim/akonadi-phabricator-resource.desktop.po summit/messages/playground-pim/akonadi-phabricator-resource._desktop_.po move summit/messages/playground-pim/akonadi-playground.desktop.po summit/messages/playground-pim/akonadi-playground._desktop_.po move summit/messages/playground-pim/akonadi-sugarcrm.desktop.po summit/messages/playground-pim/akonadi-sugarcrm._desktop_.po move summit/messages/playground-pim/akonadi-vkontakte.desktop.po summit/messages/playground-pim/akonadi-vkontakte._desktop_.po move summit/messages/playground-pim/akonadi_kdeforum.desktop.po summit/messages/playground-pim/akonadi_kdeforum._desktop_.po move summit/messages/playground-pim/akonaditelepathy.desktop.po summit/messages/playground-pim/akonaditelepathy._desktop_.po move summit/messages/playground-pim/akonaditest.desktop.po summit/messages/playground-pim/akonaditest._desktop_.po move summit/messages/playground-pim/akunambol.desktop.po summit/messages/playground-pim/akunambol._desktop_.po move summit/messages/playground-pim/calgo.desktop.po summit/messages/playground-pim/calgo._desktop_.po move summit/messages/playground-pim/del.icio.us.desktop.po summit/messages/playground-pim/del.icio.us._desktop_.po move summit/messages/playground-pim/kblogger.desktop.po summit/messages/playground-pim/kblogger._desktop_.po move summit/messages/playground-pim/kitchensync.desktop.po summit/messages/playground-pim/kitchensync._desktop_.po move summit/messages/playground-pim/kjots.desktop.po summit/messages/playground-pim/kjots._desktop_.po move summit/messages/playground-pim/kpilot.desktop.po summit/messages/playground-pim/kpilot._desktop_.po move summit/messages/playground-pim/ldap.desktop.po summit/messages/playground-pim/ldap._desktop_.po move summit/messages/playground-pim/leute.desktop.po summit/messages/playground-pim/leute._desktop_.po move summit/messages/playground-pim/person-viewer.desktop.po summit/messages/playground-pim/person-viewer._desktop_.po move summit/messages/playground-pim/plasmoid-eventlist.desktop.po summit/messages/playground-pim/plasmoid-eventlist._desktop_.po move summit/messages/playground-pim/rekollect.desktop.po summit/messages/playground-pim/rekollect._desktop_.po move summit/messages/playground-pim/syncml.desktop.po summit/messages/playground-pim/syncml._desktop_.po move summit/messages/playground-pim/tvanytime.desktop.po summit/messages/playground-pim/tvanytime._desktop_.po move summit/messages/playground-sdk/cocoon.desktop.po summit/messages/playground-sdk/cocoon._desktop_.po move summit/messages/playground-sdk/elf-dissector.desktop.po summit/messages/playground-sdk/elf-dissector._desktop_.po move summit/messages/playground-sdk/plasmate.desktop.po summit/messages/playground-sdk/plasmate._desktop_.po move summit/messages/playground-sdk/plasmate.json.po summit/messages/playground-sdk/plasmate._json_.po move summit/messages/playground-sysadmin/kalternatives.desktop.po summit/messages/playground-sysadmin/kalternatives._desktop_.po move summit/messages/playground-sysadmin/kcmgrub2.desktop.po summit/messages/playground-sysadmin/kcmgrub2._desktop_.po move summit/messages/playground-sysadmin/kdisksutilities.desktop.po summit/messages/playground-sysadmin/kdisksutilities._desktop_.po move summit/messages/playground-sysadmin/shaman.desktop.po summit/messages/playground-sysadmin/shaman._desktop_.po move summit/messages/playground-sysadmin/systemd-kcm.desktop.po summit/messages/playground-sysadmin/systemd-kcm._desktop_.po move summit/messages/playground-sysadmin/systemdgenie.desktop.po summit/messages/playground-sysadmin/systemdgenie._desktop_.po move summit/messages/playground-sysadmin/ufw-kde.desktop.po summit/messages/playground-sysadmin/ufw-kde._desktop_.po move summit/messages/playground-utils/abakus.desktop.po summit/messages/playground-utils/abakus._desktop_.po move summit/messages/playground-utils/gwenrename.desktop.po summit/messages/playground-utils/gwenrename._desktop_.po move summit/messages/playground-utils/kanalytics.desktop.po summit/messages/playground-utils/kanalytics._desktop_.po move summit/messages/playground-utils/kfprintee.desktop.po summit/messages/playground-utils/kfprintee._desktop_.po move summit/messages/playground-utils/khtml_userscript.desktop.po summit/messages/playground-utils/khtml_userscript._desktop_.po move summit/messages/playground-utils/kontaminuti.desktop.po summit/messages/playground-utils/kontaminuti._desktop_.po move summit/messages/playground-utils/kregexpeditor.desktop.po summit/messages/playground-utils/kregexpeditor._desktop_.po move summit/messages/playground-utils/ksaolaji.desktop.po summit/messages/playground-utils/ksaolaji._desktop_.po move summit/messages/playground-utils/ksecrets.desktop.po summit/messages/playground-utils/ksecrets._desktop_.po move summit/messages/playground-utils/kvkbd.desktop.po summit/messages/playground-utils/kvkbd._desktop_.po move summit/messages/playground-utils/notificationsurvey.desktop.po summit/messages/playground-utils/notificationsurvey._desktop_.po move summit/messages/playground-utils/viki.desktop.po summit/messages/playground-utils/viki._desktop_.po move summit/messages/playground-utils/workflow-addons.desktop.po summit/messages/playground-utils/workflow-addons._desktop_.po move summit/messages/playground-utils/workflow-kde3.desktop.po summit/messages/playground-utils/workflow-kde3._desktop_.po move summit/messages/playground-utils/workflow.desktop.po summit/messages/playground-utils/workflow._desktop_.po move summit/messages/qt/phonon-gstreamer.desktop.po summit/messages/qt/phonon-gstreamer._desktop_.po move summit/messages/qt/phonon-vlc.desktop.po summit/messages/qt/phonon-vlc._desktop_.po # plasma_shell_org.kde.plasma.desktop.po was specially renamed, not needed with the new pattern move summit/messages/kde-workspace/plasma_shell_org.kde.plasma__desktop.po summit/messages/kde-workspace/plasma_shell_org.kde.plasma.desktop.po move summit/messages/kde-workspace/kcminput.po summit/messages/kde-workspace/kcmmouse.po move summit/messages/www/gcompris-net.po summit/messages/www/gcompris-merged.po move summit/messages/kde-workspace/kcmlaunchfeedback.po summit/messages/kde-workspace/kcm_launchfeedback.po move summit/messages/kde-workspace/kcmtranslations.po summit/messages/kde-workspace/kcm_translations.po move summit/messages/kde-workspace/kcm5_workspace.po summit/messages/kde-workspace/kcm_workspace.po move summit/messages/extragear-network/org.kde.kio-gdrive.appdata.po summit/messages/extragear-network/org.kde.kio_gdrive.appdata.po move summit/messages/kdereview/ring-kde.po summit/messages/extragear-pim/ring-kde.po move summit/messages/kdereview/org.kde.ring-kde.appdata.po summit/messages/extragear-pim/org.kde.ring-kde.appdata.po move summit/messages/kdereview/ring-kde._desktop_.po summit/messages/extragear-pim/ring-kde._desktop_.po move summit/docmessages/kdereview/ring-kde.po summit/docmessages/extragear-pim/ring-kde.po move summit/docmessages/kdereview/ring-kde_advanced-use.po summit/docmessages/extragear-pim/ring-kde_advanced-use.po move summit/docmessages/kdereview/ring-kde_basic-use.po summit/docmessages/extragear-pim/ring-kde_basic-use.po move summit/docmessages/kdereview/ring-kde_common-use.po summit/docmessages/extragear-pim/ring-kde_common-use.po move summit/docmessages/kdereview/ring-kde_credits.po summit/docmessages/extragear-pim/ring-kde_credits.po move summit/docmessages/kdereview/ring-kde_getting-started.po summit/docmessages/extragear-pim/ring-kde_getting-started.po move summit/docmessages/kdereview/ring-kde_introduction.po summit/docmessages/extragear-pim/ring-kde_introduction.po move summit/docmessages/kdereview/ring-kde_man-ring-kde.1.po summit/docmessages/extragear-pim/ring-kde_man-ring-kde.1.po delete summit/messages/extragear-network/kdeconnect-fileitemaction.po move summit/messages/kde-workspace/plasma_applet_org.kde.plasma.dict.po summit/messages/kde-workspace/plasma_applet_org.kde.plasma_applet_dict.po + +move summit/messages/playground-devtools/diff_ext.po summit/messages/kdereview/diff_ext.po +move summit/messages/playground-devtools/kdiff3._desktop_.po summit/messages/kdereview/kdiff3._desktop_.po +move summit/messages/playground-devtools/kdiff3._json_.po summit/messages/kdereview/kdiff3._json_.po +move summit/messages/playground-devtools/kdiff3.po summit/messages/kdereview/kdiff3.po +move summit/messages/playground-devtools/kdiff3fileitemactionplugin.po summit/messages/kdereview/kdiff3fileitemactionplugin.po +move summit/messages/playground-devtools/org.kde.kdiff3.appdata.po summit/messages/kdereview/org.kde.kdiff3.appdata.po Index: trunk/l10n-support/se/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/se/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/se/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,46 @@ +# Translation of kdiff3._desktop_ to Northern Sami +# +msgid "" +msgstr "" +"Project-Id-Version: desktop files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2007-09-11 22:44+0200\n" +"Last-Translator: Northern Sami translation team \n" +"Language-Team: Northern Sami \n" +"Language: se\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: \n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +#, fuzzy +#| msgctxt "Language" +#| msgid "Diff" +msgctxt "Name" +msgid "KDiff3" +msgstr "Diff" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "" Index: trunk/l10n-support/se/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/se/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/se/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,46 +0,0 @@ -# Translation of kdiff3._desktop_ to Northern Sami -# -msgid "" -msgstr "" -"Project-Id-Version: desktop files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2007-09-11 22:44+0200\n" -"Last-Translator: Northern Sami translation team \n" -"Language-Team: Northern Sami \n" -"Language: se\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: \n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -#, fuzzy -#| msgctxt "Language" -#| msgid "Diff" -msgctxt "Name" -msgid "KDiff3" -msgstr "Diff" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "" Index: trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,57 @@ +# Translation of kdiff3.desktop.po into Serbian. +# Slobodan Simic , 2005, 2009, 2010. +# Chusslove Illich , 2005, 2012, 2017. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3.desktop\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-22 08:59+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" +"Last-Translator: Chusslove Illich \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: xmlents\n" +"X-Environment: kde\n" +"X-Wrapping: fine\n" + +#. +> trunk5 +#: src/kdiff3part.desktop:2 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "&Kdiff3-n; део" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:2 +msgctxt "Name" +msgid "KDiff3" +msgstr "&kdiff3-n;" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:51 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "Прочеље за ~!/diff/ и ~!/patch/" + +#. +> trunk5 +#: src/org.kde.kdiff3.desktop:104 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "Алатка за поређење и стапање фајлова и фасцикли" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "Поређење и стапање фајлова и фасцикли &kdiff3-i;" + +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "&kdiff3-n;" + +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "Поређење и стапање фајлова и фасцикли" Index: trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._json_.po =================================================================== --- trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._json_.po (nonexistent) +++ trunk/l10n-support/sr/summit/messages/kdereview/kdiff3._json_.po (revision 1522187) @@ -0,0 +1,24 @@ +msgid "" +msgstr "" +"Project-Id-Version: json files\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2018-02-23 09:24+0100\n" +"Last-Translator: Simulacrum\n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: \n" +"X-Text-Markup: xmlents\n" +"X-Environment: kde\n" +"X-Wrapping: fine\n" + +#. +> trunk5 +#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json +#, untranslated +msgctxt "Name" +msgid "Compare/Merge Files/Directories with KDiff3" +msgstr "" Index: trunk/l10n-support/sr/summit/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/sr/summit/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/sr/summit/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,4319 @@ +# Translation of kdiff3.po into Serbian. +# Slobodan Simic , 2009. +# Chusslove Illich , 2010, 2011, 2012, 2015, 2017. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-05-06 09:47+0200\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" +"Last-Translator: Chusslove Illich \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Generator: KBabel 1.11.4\n" +"X-Environment: kde\n" +"X-Wrapping: fine\n" + +#. +> trunk5 +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Слободан Симић,Часлав Илић" + +#. +> trunk5 +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" + +#. +> trunk5 +#: diff.cpp:259 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "Уписивање података из клипборда у привремени фајл није успело." + +#. +> trunk5 +#: diff.cpp:263 +#, kde-format +msgid "From Clipboard" +msgstr "Из клипборда" + +#. +> trunk5 +#: diff.cpp:556 +#, kde-format +msgid "Expecting space after closing apostroph." +msgstr "Очекиван размак после затвореног апострофа." + +#. +> trunk5 +#: diff.cpp:559 +#, kde-format +msgid "Not matching apostrophs." +msgstr "Апострофи се не поклапају." + +#. +> trunk5 +#: diff.cpp:581 +#, kde-format +msgid "Unexpected apostroph within argument." +msgstr "Неочекиван апостроф унутар аргумента." + +#. +> trunk5 +#: diff.cpp:588 +#, kde-format +msgid "No program specified." +msgstr "Наредба није задата." + +#. +> trunk5 +#: diff.cpp:712 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Изгледа да је предобрада пропала. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Наредба предобраде ће сада бити деактивирана." + +#. +> trunk5 +#: diff.cpp:761 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Изгледа да је предобрада поклапања редова пропала. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Предобрада поклапања редова сада ће бити деактивирана." + +# >! Merge whole string. +# >> @item:intext +#. +> trunk5 +#: difftextwindow.cpp:411 directorymergewindow.cpp:3353 +#, kde-format +msgid "File" +msgstr "фајл" + +# >> @item:intext +#. +> trunk5 +#: difftextwindow.cpp:413 +#, kde-format +msgid "Line" +msgstr "ред" + +#. +> trunk5 +#: difftextwindow.cpp:415 +#, kde-format +msgid "Line not available" +msgstr "ред недоступан" + +#. +> trunk5 +#: difftextwindow.cpp:1911 difftextwindow.cpp:1943 +#, kde-format +msgid "Encoding:" +msgstr "Кодирање:" + +#. +> trunk5 +#: difftextwindow.cpp:1913 difftextwindow.cpp:1944 mergeresultwindow.cpp:3372 +#: optiondialog.cpp:920 +#, kde-format +msgid "Line end style:" +msgstr "Стил краја редова:" + +#. +> trunk5 +#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3417 +#, kde-format +msgid "Unix" +msgstr "&unix-n;" + +#. +> trunk5 +#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3418 +#, kde-format +msgid "DOS" +msgstr "&dosos-n;" + +# >! Merge whole string. +#. +> trunk5 +#: difftextwindow.cpp:1966 kdiff3.cpp:869 +#, kde-format +msgid "Top line" +msgstr "Први ред" + +#. +> trunk5 +#: difftextwindow.cpp:1976 +#, kde-format +msgid "End" +msgstr "Крај" + +#. +> trunk5 +#: difftextwindow.cpp:2051 smalldialogs.cpp:234 +#, fuzzy, kde-format +#| msgid "{-Opening files...-}{+Open File+}" +msgid "Open File" +msgstr "Отварам фајлове..." + +#. +> trunk5 +#: difftextwindow.cpp:2099 optiondialog.cpp:508 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "&unicode-n;, 8-битни" + +#. +> trunk5 +#: difftextwindow.cpp:2114 +#, kde-format, untranslated +msgid "Other" +msgstr "" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 +#, kde-format +msgid "Unsolved" +msgstr "нерешено" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 +#, kde-format +msgid "Solved" +msgstr "решено" + +# >> non-whitespace +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 +#, kde-format +msgid "Nonwhite" +msgstr "непразно" + +# >> whitespace +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 +#, kde-format +msgid "White" +msgstr "празно" + +#. +> trunk5 +#: directorymergewindow.cpp:542 directorymergewindow.cpp:3666 +#, kde-format +msgid "Copy A to B" +msgstr "Копирај А у Б" + +#. +> trunk5 +#: directorymergewindow.cpp:545 directorymergewindow.cpp:3667 +#, kde-format +msgid "Copy B to A" +msgstr "Копирај Б у А" + +#. +> trunk5 +#: directorymergewindow.cpp:548 directorymergewindow.cpp:3668 +#, kde-format +msgid "Delete A" +msgstr "Обриши А" + +#. +> trunk5 +#: directorymergewindow.cpp:551 directorymergewindow.cpp:3669 +#, kde-format +msgid "Delete B" +msgstr "Обриши Б" + +#. +> trunk5 +#: directorymergewindow.cpp:554 +#, kde-format +msgid "Delete A & B" +msgstr "Обриши А и Б" + +#. +> trunk5 +#: directorymergewindow.cpp:557 directorymergewindow.cpp:3671 +#, kde-format +msgid "Merge to A" +msgstr "Стопи у А" + +#. +> trunk5 +#: directorymergewindow.cpp:560 directorymergewindow.cpp:3672 +#, kde-format +msgid "Merge to B" +msgstr "Стопи у Б" + +#. +> trunk5 +#: directorymergewindow.cpp:563 +#, kde-format +msgid "Merge to A & B" +msgstr "Стопи у А и Б" + +#. +> trunk5 +#: directorymergewindow.cpp:575 directorymergewindow.cpp:3663 +#, kde-format +msgid "Delete (if exists)" +msgstr "Обриши (ако постоји)" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#: directorymergewindow.cpp:3662 optiondialog.cpp:1020 smalldialogs.cpp:112 +#, kde-format +msgid "Merge" +msgstr "Стопи" + +#. +> trunk5 +#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 +#, kde-format +msgid "Merge (manual)" +msgstr "Стопи (ручно)" + +#. +> trunk5 +#: directorymergewindow.cpp:584 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "Грешка: сукобљени типови фајлова." + +#. +> trunk5 +#: directorymergewindow.cpp:587 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "Грешка: измењено и обрисано." + +#. +> trunk5 +#: directorymergewindow.cpp:590 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "Грешка: датуми су једнаки али фајлови нису." + +#. +> trunk5 +#: directorymergewindow.cpp:604 +#, fuzzy, kde-format +#| msgid "Done{-.-}" +msgid "Done" +msgstr "Готово." + +#. +> trunk5 +#: directorymergewindow.cpp:606 directorymergewindow.cpp:2560 +#: directorymergewindow.cpp:2638 directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2743 directorymergewindow.cpp:3001 +#, kde-format +msgid "Error" +msgstr "Грешка" + +#. +> trunk5 +#: directorymergewindow.cpp:608 +#, kde-format +msgid "Skipped." +msgstr "Прескочено." + +#. +> trunk5 +#: directorymergewindow.cpp:610 +#, kde-format +msgid "Not saved." +msgstr "Није сачувано." + +#. +> trunk5 +#: directorymergewindow.cpp:612 +#, kde-format +msgid "In progress..." +msgstr "У току..." + +#. +> trunk5 +#: directorymergewindow.cpp:614 +#, kde-format +msgid "To do." +msgstr "Урадити." + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:655 +#, kde-format +msgid "Name" +msgstr "име" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:663 +#, kde-format +msgid "Operation" +msgstr "поступак" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:665 +#, kde-format +msgid "Status" +msgstr "стање" + +#. +> trunk5 +#: directorymergewindow.cpp:801 +#, kde-format +msgid "Mix of links and normal files." +msgstr "Мешавина веза и нормалних фајлова." + +#. +> trunk5 +#: directorymergewindow.cpp:808 +#, kde-format +msgid "Link: " +msgstr "Веза: " + +#. +> trunk5 +#: directorymergewindow.cpp:816 +#, kde-format +msgid "Size. " +msgstr "Величина: " + +#. +> trunk5 +#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 +#, kde-format +msgid "Date & Size: " +msgstr "Датум и величина: " + +#. +> trunk5 +#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "Прављење привремене копије фајла %1 није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 +#, kde-format +msgid "Opening %1 failed." +msgstr "Отварање фајла %1 није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:878 +#, kde-format +msgid "Comparing file..." +msgstr "Упоређујем фајл..." + +#. +> trunk5 +#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 +#, kde-format +msgid "Error reading from %1" +msgstr "Грешка при читању из %1" + +#. +> trunk5 +#: directorymergewindow.cpp:931 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново скенирате фасциклу?" + +#. +> trunk5 +#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 +#: mergeresultwindow.cpp:342 pdiff.cpp:1034 pdiff.cpp:1925 pdiff.cpp:1935 +#, kde-format +msgid "Warning" +msgstr "Упозорење" + +#. +> trunk5 +#: directorymergewindow.cpp:933 directorymergewindow.cpp:3635 +#, kde-format +msgid "Rescan" +msgstr "Поново скенирај" + +#. +> trunk5 +#: directorymergewindow.cpp:934 pdiff.cpp:1036 +#, kde-format +msgid "Continue Merging" +msgstr "Настави стапање" + +#. +> trunk5 +#: directorymergewindow.cpp:1098 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Отварање фасцикли није успело:" + +#. +> trunk5 +#: directorymergewindow.cpp:1102 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Фасцикла А „%1“ не постоји или није фасцикла.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1107 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Фасцикла Б „%1“ не постоји или није фасцикла.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1112 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Фасцикла Ц „%1“ не постоји или није фасцикла.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:1115 +#, kde-format +msgid "Directory Open Error" +msgstr "Грешка при отварању фасцикле" + +#. +> trunk5 +#: directorymergewindow.cpp:1123 +#, kde-format +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"Одредишна фасцикла не сме бити иста као А или Б када се стапају три фасцикле.\n" +"Проверите поново пре него што наставите." + +#. +> trunk5 +#: directorymergewindow.cpp:1125 +#, kde-format +msgid "Parameter Warning" +msgstr "Упозорење о параметрима" + +#. +> trunk5 +#: directorymergewindow.cpp:1130 +#, kde-format +msgid "Scanning directories..." +msgstr "Скенирам фасцикле..." + +#. +> trunk5 +#: directorymergewindow.cpp:1167 +#, kde-format +msgid "Reading Directory A" +msgstr "Читам фасциклу А" + +#. +> trunk5 +#: directorymergewindow.cpp:1187 +#, kde-format +msgid "Reading Directory B" +msgstr "Читам фасциклу Б" + +#. +> trunk5 +#: directorymergewindow.cpp:1209 +#, kde-format +msgid "Reading Directory C" +msgstr "Читам фасциклу Ц" + +# >! Merge sentence. +#. +> trunk5 +#: directorymergewindow.cpp:1233 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "Неке потфасцикле нису биле читљиве у" + +#. +> trunk5 +#: directorymergewindow.cpp:1238 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "Проверите дозволе потфасцикли." + +#. +> trunk5 +#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 +#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1115 pdiff.cpp:1187 +#: pdiff.cpp:1232 pdiff.cpp:1248 pdiff.cpp:1291 pdiff.cpp:1313 +#, kde-format +msgid "Ready." +msgstr "Спреман." + +#. +> trunk5 +#: directorymergewindow.cpp:1292 +#, kde-format +msgid "Directory Comparison Status" +msgstr "Стање поређења фасцикли" + +#. +> trunk5 +#: directorymergewindow.cpp:1293 +#, kde-format +msgid "Number of subdirectories:" +msgstr "Број потфасцикли:" + +#. +> trunk5 +#: directorymergewindow.cpp:1294 +#, kde-format +msgid "Number of equal files:" +msgstr "Број једнаких фајлова:" + +#. +> trunk5 +#: directorymergewindow.cpp:1295 +#, kde-format +msgid "Number of different files:" +msgstr "Број различитих фајлова:" + +#. +> trunk5 +#: directorymergewindow.cpp:1298 +#, kde-format +msgid "Number of manual merges:" +msgstr "Број ручних стапања:" + +#. +> trunk5 +#: directorymergewindow.cpp:1490 +#, kde-format +msgid "This affects all merge operations." +msgstr "Ово утиче на све поступке стапања." + +# >> @title:window +#. +> trunk5 +#: directorymergewindow.cpp:1491 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "Мењање свих поступака стапања" + +# >! Merge sentence. +#. +> trunk5 +#: directorymergewindow.cpp:1887 +#, kde-format +msgid "Processing " +msgstr "Обрађујем " + +#. +> trunk5 +#: directorymergewindow.cpp:2463 directorymergewindow.cpp:2488 +#: directorymergewindow.cpp:2512 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Овај поступак тренутно није могућ." + +#. +> trunk5 +#: directorymergewindow.cpp:2463 directorymergewindow.cpp:2488 +#: directorymergewindow.cpp:2512 directorymergewindow.cpp:2794 +#, kde-format +msgid "Operation Not Possible" +msgstr "Поступак није могућ" + +#. +> trunk5 +#: directorymergewindow.cpp:2560 +#, kde-format +msgid "An error occurred while copying.\n" +msgstr "Грешка у току копирања.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:2561 directorymergewindow.cpp:3002 +#, kde-format +msgid "Merge Error" +msgstr "Грешка стапања" + +#. +> trunk5 +#: directorymergewindow.cpp:2638 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "Непознат поступак стапања. (Ово никада не сме да се догоди!)" + +#. +> trunk5 +#: directorymergewindow.cpp:2683 +#, kde-format +msgid "Unknown merge operation." +msgstr "Непозната поступак стапања." + +#. +> trunk5 +#: directorymergewindow.cpp:2696 +#, kde-format +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" +"Изаберите „~%/Do It/“ ако сте прочитали инструкције и знате шта радите.\n" +"Изаберите „~%/Simulate It/“ ако бисте прво да видите шта би се догодило.\n" +"\n" +"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!" + +# >> @title:window +#. +> trunk5 +#: directorymergewindow.cpp:2701 +#, kde-format +msgid "Starting Merge" +msgstr "Почетак стапања" + +#. +> trunk5 +#: directorymergewindow.cpp:2702 +#, kde-format +msgid "Do It" +msgstr "Уради" + +#. +> trunk5 +#: directorymergewindow.cpp:2703 +#, kde-format +msgid "Simulate It" +msgstr "Симулирај" + +#. +> trunk5 +#: directorymergewindow.cpp:2729 +#, kde-format +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта урадити." + +#. +> trunk5 +#: directorymergewindow.cpp:2733 +#, kde-format +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити." + +#. +> trunk5 +#: directorymergewindow.cpp:2737 +#, kde-format +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "Истакнута ставка је измењена у једној фасцикли а обрисана у другој. Изаберите шта урадити." + +#. +> trunk5 +#: directorymergewindow.cpp:2794 +#, kde-format +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "Овај поступак тренутно није могућ зато што је у току стапање фасцикли." + +#. +> trunk5 +#: directorymergewindow.cpp:2852 +#, kde-format +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" +"Желите ли да наставите са ставком која је изазвала грешку или да је прескочите?" + +# >> @title:window +#. +> trunk5 +#: directorymergewindow.cpp:2854 +#, kde-format +msgid "Continue merge after an error" +msgstr "Настављање стапања после грешке" + +#. +> trunk5 +#: directorymergewindow.cpp:2855 +#, kde-format +msgid "Continue With Last Item" +msgstr "Настави са последњом ставком" + +#. +> trunk5 +#: directorymergewindow.cpp:2856 +#, kde-format +msgid "Skip Item" +msgstr "Прескочи ставку" + +#. +> trunk5 +#: directorymergewindow.cpp:2952 +#, kde-format +msgid "Merge operation complete." +msgstr "Поступак стапања је завршен." + +#. +> trunk5 +#: directorymergewindow.cpp:2952 directorymergewindow.cpp:2955 +#, kde-format +msgid "Merge Complete" +msgstr "Стапање завршено" + +#. +> trunk5 +#: directorymergewindow.cpp:2965 +#, kde-format +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "Симулирано стапање је завршено: проверите да ли вам одговарају предложени поступци." + +#. +> trunk5 +#: directorymergewindow.cpp:3001 +#, kde-format +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Дошло је до грешке. Кликните на „~%/OK/“ да добијете детаљне информације.\n" + +#. +> trunk5 +#: directorymergewindow.cpp:3034 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "Грешка: у току брисања %1, прављење резерве није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:3041 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "рекурзивно брисање фасцикле (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3043 +#, kde-format +msgid "delete( %1 )" +msgstr "брисање (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3058 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "Грешка: поступак брисања фасцикле није успео на месту читања фасцикле." + +#. +> trunk5 +#: directorymergewindow.cpp:3077 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "Грешка: поступак уклањања фасцикле (%1) није успео." + +#. +> trunk5 +#: directorymergewindow.cpp:3087 +#, kde-format +msgid "Error: delete operation failed." +msgstr "Грешка: поступак брисања није успео." + +#. +> trunk5 +#: directorymergewindow.cpp:3113 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "ручно стапање (%1, %2, %3 → %4)" + +#. +> trunk5 +#: directorymergewindow.cpp:3116 +#, kde-format +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr " Напомена: после ручног стапања корисник треба да настави притиском на &f7-a;." + +#. +> trunk5 +#: directorymergewindow.cpp:3141 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:3150 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "копирање везе (%1 → %2 )" + +#. +> trunk5 +#: directorymergewindow.cpp:3161 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "Грешка: копирање везе није успело, удаљене везе још нису подржане." + +#. +> trunk5 +#: directorymergewindow.cpp:3167 +#, kde-format +msgid "Error: copyLink failed." +msgstr "Грешка: копирање везе није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:3192 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "копирање (%1 → %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3218 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се обрише." + +#. +> trunk5 +#: directorymergewindow.cpp:3225 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "преименовање (%1 → %2)" + +#. +> trunk5 +#: directorymergewindow.cpp:3234 +#, kde-format +msgid "Error: Rename failed." +msgstr "Грешка: преименовање није успело." + +#. +> trunk5 +#: directorymergewindow.cpp:3252 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише." + +#. +> trunk5 +#: directorymergewindow.cpp:3269 +#, kde-format +msgid "makeDir( %1 )" +msgstr "прављење фасцикле (%1)" + +#. +> trunk5 +#: directorymergewindow.cpp:3279 +#, kde-format +msgid "Error while creating directory." +msgstr "Грешка у току прављења фасцикле." + +#. +> trunk5 +#: directorymergewindow.cpp:3315 directorymergewindow.cpp:3441 +#, kde-format +msgid "Dest" +msgstr "Одредиште" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3323 directorymergewindow.cpp:3353 +#, kde-format +msgid "Dir" +msgstr "фасцикла" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3323 +#, kde-format +msgid "Type" +msgstr "тип" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3323 +#, kde-format +msgid "Size" +msgstr "величина" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Attr" +msgstr "атрибути" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Last Modification" +msgstr "последња измена" + +# >> @title:column +#. +> trunk5 +#: directorymergewindow.cpp:3324 +#, kde-format +msgid "Link-Destination" +msgstr "одредиште везе" + +#. +> trunk5 +#: directorymergewindow.cpp:3367 +#, kde-format +msgid "not available" +msgstr "недоступно" + +#. +> trunk5 +#: directorymergewindow.cpp:3385 +#, kde-format +msgid "A (Dest): " +msgstr "А (одредиште): " + +#. +> trunk5 +#: directorymergewindow.cpp:3389 +#, kde-format +msgid "A (Base): " +msgstr "А (база): " + +#. +> trunk5 +#: directorymergewindow.cpp:3395 +#, kde-format +msgid "B (Dest): " +msgstr "Б (одредиште): " + +#. +> trunk5 +#: directorymergewindow.cpp:3404 +#, kde-format +msgid "C (Dest): " +msgstr "Ц (одредиште): " + +#. +> trunk5 +#: directorymergewindow.cpp:3411 +#, kde-format +msgid "Dest: " +msgstr "Одредиште: " + +# >> @title:window +#. i18n("Saving Directory Merge State ...")); +#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); +#. +> trunk5 +#: directorymergewindow.cpp:3493 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "Уписивање стања стапања фасцикли као..." + +#. +> trunk5 +#: directorymergewindow.cpp:3629 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "Покрени/настави стапање фасцикли" + +#. +> trunk5 +#: directorymergewindow.cpp:3630 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "Изврши поступак за текућу ставку" + +#. +> trunk5 +#: directorymergewindow.cpp:3631 +#, kde-format +msgid "Compare Selected File" +msgstr "Упореди изабрани фајл" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "Merge Current File" +msgstr "Стопи текући фајл" + +#. +> trunk5 +#: directorymergewindow.cpp:3632 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Стопи\n" +"фајл" + +#. +> trunk5 +#: directorymergewindow.cpp:3633 +#, kde-format +msgid "Fold All Subdirs" +msgstr "Сажми све потфасцикле" + +#. +> trunk5 +#: directorymergewindow.cpp:3634 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "Рашири све потфасцикле" + +#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); +#. +> trunk5 +#: directorymergewindow.cpp:3638 +#, kde-format +msgid "Choose A for All Items" +msgstr "Изабери А за све ставке" + +#. +> trunk5 +#: directorymergewindow.cpp:3639 +#, kde-format +msgid "Choose B for All Items" +msgstr "Изабери Б за све ставке" + +#. +> trunk5 +#: directorymergewindow.cpp:3640 +#, kde-format +msgid "Choose C for All Items" +msgstr "Изабери Ц за све ставке" + +#. +> trunk5 +#: directorymergewindow.cpp:3641 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "Аутоматски изабери поступак за све ставке" + +#. +> trunk5 +#: directorymergewindow.cpp:3642 +#, kde-format +msgid "No Operation for All Items" +msgstr "Нема поступка за све ставке" + +#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); +#. +> trunk5 +#: directorymergewindow.cpp:3647 +#, kde-format +msgid "Show Identical Files" +msgstr "Прикажи истоветне фајлове" + +#. +> trunk5 +#: directorymergewindow.cpp:3647 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" +"Истоветни\n" +"фајлови" + +#. +> trunk5 +#: directorymergewindow.cpp:3648 +#, kde-format +msgid "Show Different Files" +msgstr "Прикажи различите фајлове" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "Show Files only in A" +msgstr "Прикажи фајлове само у А" + +#. +> trunk5 +#: directorymergewindow.cpp:3649 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" +"Фајлови\n" +"само у А" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "Show Files only in B" +msgstr "Прикажи фајлове само у Б" + +#. +> trunk5 +#: directorymergewindow.cpp:3650 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" +"Фајлови\n" +"само у Б" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "Show Files only in C" +msgstr "Прикажи фајлове само у Ц" + +#. +> trunk5 +#: directorymergewindow.cpp:3651 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" +"Фајлови\n" +"само у Ц" + +#. +> trunk5 +#: directorymergewindow.cpp:3655 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "Упореди изричито изабране фајлове" + +#. +> trunk5 +#: directorymergewindow.cpp:3656 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "Стопи изричито изабране фајлове" + +#. +> trunk5 +#: directorymergewindow.cpp:3658 directorymergewindow.cpp:3665 +#, kde-format +msgid "Do Nothing" +msgstr "Не ради ништа" + +#. +> trunk5 +#: directorymergewindow.cpp:3659 +#, kde-format +msgid "A" +msgstr "А" + +#. +> trunk5 +#: directorymergewindow.cpp:3660 +#, kde-format +msgid "B" +msgstr "Б" + +#. +> trunk5 +#: directorymergewindow.cpp:3661 +#, kde-format +msgid "C" +msgstr "Ц" + +#. +> trunk5 +#: directorymergewindow.cpp:3670 +#, kde-format +msgid "Delete A && B" +msgstr "Обриши А и Б" + +#. +> trunk5 +#: directorymergewindow.cpp:3673 +#, kde-format +msgid "Merge to A && B" +msgstr "Стопи у А и Б" + +#. +> trunk5 +#: fileaccess.cpp:949 +#, kde-format +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"При покушају прављења резерве, брисање старије резерве није успело.\n" +"Име фајла: " + +#. +> trunk5 +#: fileaccess.cpp:956 +#, kde-format +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"При покушају прављења резерве, преименовање није успело.\n" +"Имена фајлова: " + +#. +> trunk5 +#: fileaccess.cpp:980 +#, kde-format +msgid "Getting file status: %1" +msgstr "Добављам стање фајла: %1" + +#. +> trunk5 +#: fileaccess.cpp:1022 +#, kde-format +msgid "Reading file: %1" +msgstr "Читам фајл: %1" + +#. +> trunk5 +#: fileaccess.cpp:1060 +#, kde-format +msgid "Writing file: %1" +msgstr "Пишем фајл: %1" + +#. +> trunk5 +#: fileaccess.cpp:1088 +#, kde-format +msgid "Out of memory" +msgstr "Нема више меморије" + +#. +> trunk5 +#: fileaccess.cpp:1123 +#, kde-format +msgid "Making directory: %1" +msgstr "Правим фасциклу: %1" + +#. +> trunk5 +#: fileaccess.cpp:1143 +#, kde-format +msgid "Removing directory: %1" +msgstr "Уклањам фасциклу: %1" + +#. +> trunk5 +#: fileaccess.cpp:1158 +#, kde-format +msgid "Removing file: %1" +msgstr "Уклањам фајл: %1" + +#. +> trunk5 +#: fileaccess.cpp:1174 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "Правим симболичку везу: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1202 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "Преименујем фајл: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1234 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "Копирам фајл: %1 → %2" + +#. +> trunk5 +#: fileaccess.cpp:1248 +#, kde-format +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "Грешка током поступка копирања фајлова: отварање фајла ради читања није успело. Име фајла: %1" + +#. +> trunk5 +#: fileaccess.cpp:1254 +#, kde-format +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "Грешка током поступка копирања фајлова: отварање фајла ради писања није успело. Име фајла: %1" + +#. +> trunk5 +#: fileaccess.cpp:1266 +#, kde-format +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "Грешка током поступка копирања фајлова: читање није успело. Име фајла: %1" + +#. +> trunk5 +#: fileaccess.cpp:1275 +#, kde-format +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "Грешка током поступка копирања фајлова: писање није успело. Име фајла: %1" + +#. +> trunk5 +#: fileaccess.cpp:1558 +#, kde-format +msgid "Reading directory: " +msgstr "Читам фасциклу: " + +#. +> trunk5 +#: fileaccess.cpp:1679 +#, kde-format +msgid "Listing directory: %1" +msgstr "Листам фасциклу: %1" + +#. +> trunk5 +#: kdiff3.cpp:177 +#, kde-format +msgid "Current Configuration:" +msgstr "Тренутна постава:" + +#. +> trunk5 +#: kdiff3.cpp:182 +#, kde-format +msgid "Config Option Error:" +msgstr "Грешка поставне опције:" + +#. i18n("Option --auto used, but no output file specified.")); +#. +> trunk5 +#: kdiff3.cpp:228 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "Опција --auto је употребљена, али није наведен излазни фајл." + +#. +> trunk5 +#: kdiff3.cpp:404 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "Опција --auto се игнорише за поређење фасцикли." + +#. +> trunk5 +#: kdiff3.cpp:451 +#, kde-format +msgid "Saving failed." +msgstr "Уписивање није успело." + +#. +> trunk5 +#: kdiff3.cpp:486 pdiff.cpp:1097 pdiff.cpp:1168 +#, kde-format +msgid "Opening of these files failed:" +msgstr "Отварање ових фајлова није успело:" + +#. +> trunk5 +#: kdiff3.cpp:495 +#, kde-format +msgid "File Open Error" +msgstr "Грешка при отварању фајла" + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:523 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "Отвара документе за поређење." + +#. +> trunk5 +#: kdiff3.cpp:525 +#, kde-format +msgid "Reload" +msgstr "Учитај поново" + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:528 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "Уписује резултат стапања. Сви сукоби морају бити разрешени." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:530 +#, kde-format +msgid "Saves the current document as..." +msgstr "Уписује текуће документе под именом." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:533 +#, kde-format +msgid "Print the differences" +msgstr "Штампа разлике." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:536 +#, kde-format +msgid "Quits the application" +msgstr "Напушта програм." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:538 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "Исеца изабрани одељак и ставља га у клипборд." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:540 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "Копира изабрани одељак у клипборд." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:542 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Налепљује садржај клипборда на тренутном положају." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:544 +#, kde-format +msgid "Select everything in current window" +msgstr "Изабира све у текућем прозору." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:546 +#, kde-format +msgid "Search for a string" +msgstr "Тражи ниску." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:548 +#, kde-format +msgid "Search again for the string" +msgstr "Поново тражи ниску." + +# >> @info:tooltip +#. +> trunk5 +#: kdiff3.cpp:553 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "Укључује/искључује траку стања." + +#. +> trunk5 +#: kdiff3.cpp:557 +#, kde-format +msgid "Configure KDiff3..." +msgstr "Подеси &kdiff3-a;..." + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "Go to Current Delta" +msgstr "Иди на текућу делту" + +#. +> trunk5 +#: kdiff3.cpp:577 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" +"Текућа\n" +"делта" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "Go to First Delta" +msgstr "Иди на прву делту" + +#. +> trunk5 +#: kdiff3.cpp:579 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" +"Прва\n" +"делта" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "Go to Last Delta" +msgstr "Иди на последњу делту" + +#. +> trunk5 +#: kdiff3.cpp:581 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" +"Последња\n" +"делта" + +#. +> trunk5 +#: kdiff3.cpp:583 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "(Прескаче разлике у празнинама ако је „~%/Show White Space/“ искључено.)" + +#. +> trunk5 +#: kdiff3.cpp:584 +#, kde-format +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "(Не прескаче разлике празнинама ни када је „~%/Show White Space/“ искључено.)" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "Go to Previous Delta" +msgstr "Иди на претходну делту" + +#. +> trunk5 +#: kdiff3.cpp:585 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Претходна\n" +"делта" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "Go to Next Delta" +msgstr "Иди на следећу делту" + +#. +> trunk5 +#: kdiff3.cpp:587 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" +"Следећа\n" +"делта" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "Иди на претходни сукоб" + +#. +> trunk5 +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Претходни\n" +"сукоб" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to Next Conflict" +msgstr "Иди на следећи сукоб" + +#. +> trunk5 +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Следећи\n" +"сукоб" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "Иди на претходни нерешени сукоб" + +#. +> trunk5 +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Претходни\n" +"нерешени" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "Иди на следећи нерешени сукоб" + +#. +> trunk5 +#: kdiff3.cpp:595 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Следећи\n" +"нерешени" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "Select Line(s) From A" +msgstr "Изаберите редове из А" + +#. +> trunk5 +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" +"Изаберите\n" +"А" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "Select Line(s) From B" +msgstr "Изаберите редове из Б" + +#. +> trunk5 +#: kdiff3.cpp:598 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" +"Изаберите\n" +"Б" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "Select Line(s) From C" +msgstr "Изаберите редове из Ц" + +#. +> trunk5 +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" +"Изаберите\n" +"Ц" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора" + +#. +> trunk5 +#: kdiff3.cpp:600 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" +"Аутоматски\n" +"следећи" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, fuzzy, kde-format +#| msgid "Show Space && Tabulator Characters{- for Differences-}" +msgid "Show Space && Tabulator Characters" +msgstr "Прикажи знакове размака и табулатора за разлике" + +#. +> trunk5 +#: kdiff3.cpp:602 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" +"Знакови\n" +"празнина" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "Show White Space" +msgstr "Прикажи празнине" + +#. +> trunk5 +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" +"Делте\n" +"празнина" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "Show Line Numbers" +msgstr "Прикажи бројеве редова" + +#. +> trunk5 +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Бројеви\n" +"редова" + +#. +> trunk5 +#: kdiff3.cpp:606 +#, kde-format +msgid "Choose A Everywhere" +msgstr "Свуда изабери А" + +#. +> trunk5 +#: kdiff3.cpp:607 +#, kde-format +msgid "Choose B Everywhere" +msgstr "Свуда изабери Б" + +#. +> trunk5 +#: kdiff3.cpp:608 +#, kde-format +msgid "Choose C Everywhere" +msgstr "Свуда изабери Ц" + +#. +> trunk5 +#: kdiff3.cpp:609 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "Изабери А за све нерешене сукобе" + +#. +> trunk5 +#: kdiff3.cpp:610 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "Изабери Б за све нерешене сукобе" + +#. +> trunk5 +#: kdiff3.cpp:611 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "Изабери Ц за све нерешене сукобе" + +#. +> trunk5 +#: kdiff3.cpp:612 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "Изабери А за све нерешене сукобе празнина" + +#. +> trunk5 +#: kdiff3.cpp:613 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "Изабери Б за све нерешене сукобе празнина" + +#. +> trunk5 +#: kdiff3.cpp:614 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "Изабери Ц за све нерешене сукобе празнина" + +#. +> trunk5 +#: kdiff3.cpp:615 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "Аутоматски реши једноставне сукобе" + +#. +> trunk5 +#: kdiff3.cpp:616 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "Постави делте на сукобе" + +#. +> trunk5 +#: kdiff3.cpp:617 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "Аутоматски стопи по регуларним изразима" + +#. +> trunk5 +#: kdiff3.cpp:618 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "Аутоматски реши сукобе историјата" + +#. +> trunk5 +#: kdiff3.cpp:619 +#, kde-format +msgid "Split Diff At Selection" +msgstr "Подели разлику на избору" + +#. +> trunk5 +#: kdiff3.cpp:620 +#, kde-format +msgid "Join Selected Diffs" +msgstr "Споји изабране разлике" + +#. +> trunk5 +#: kdiff3.cpp:622 +#, kde-format +msgid "Show Window A" +msgstr "Прикажи прозор А" + +#. +> trunk5 +#: kdiff3.cpp:623 +#, kde-format +msgid "Show Window B" +msgstr "Прикажи прозор Б" + +#. +> trunk5 +#: kdiff3.cpp:624 +#, kde-format +msgid "Show Window C" +msgstr "Прикажи прозор Ц" + +#. +> trunk5 +#: kdiff3.cpp:626 +#, kde-format +msgid "Normal Overview" +msgstr "Нормалан преглед" + +#. +> trunk5 +#: kdiff3.cpp:627 +#, kde-format +msgid "A vs. B Overview" +msgstr "Преглед А према Б" + +#. +> trunk5 +#: kdiff3.cpp:628 +#, kde-format +msgid "A vs. C Overview" +msgstr "Преглед А према Ц" + +#. +> trunk5 +#: kdiff3.cpp:629 +#, kde-format +msgid "B vs. C Overview" +msgstr "Преглед Б према Ц" + +#. +> trunk5 +#: kdiff3.cpp:630 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "Прелом речи у прозорима разлика" + +#. +> trunk5 +#: kdiff3.cpp:631 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "Додај ручно поравнање разлика" + +#. +> trunk5 +#: kdiff3.cpp:632 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "Очисти сва ручна поравнања разлика" + +#. +> trunk5 +#: kdiff3.cpp:634 +#, kde-format +msgid "Focus Next Window" +msgstr "Фокусирај следећи прозор" + +#. +> trunk5 +#: kdiff3.cpp:635 +#, kde-format +msgid "Focus Prev Window" +msgstr "Фокусирај претходни прозор" + +#. +> trunk5 +#: kdiff3.cpp:636 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "Пребаци оријентацију поделе" + +#. +> trunk5 +#: kdiff3.cpp:638 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "Подељени приказ екрана на фасциклу и текст" + +#. +> trunk5 +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "Пребаци приказ фасцикле и текста" + +#. +> trunk5 +#: kdiff3.cpp:692 pdiff.cpp:1924 +#, kde-format +msgid "The merge result hasn't been saved." +msgstr "Резултат стапања није сачуван." + +#. +> trunk5 +#: kdiff3.cpp:694 +#, kde-format +msgid "Save && Quit" +msgstr "Сачувај и напусти" + +#. +> trunk5 +#: kdiff3.cpp:695 +#, kde-format +msgid "Quit Without Saving" +msgstr "Напусти без уписивања" + +#. +> trunk5 +#: kdiff3.cpp:703 pdiff.cpp:1935 +#, kde-format +msgid "Saving the merge result failed." +msgstr "Уписивање резултата стапања није успело." + +#. +> trunk5 +#: kdiff3.cpp:714 pdiff.cpp:1033 +#, kde-format +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?" + +#. +> trunk5 +#: kdiff3.cpp:737 +#, kde-format +msgid "Saving file..." +msgstr "Уписујем фајл..." + +#. +> trunk5 +#: kdiff3.cpp:754 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Уписујем фајл под новим именом..." + +# >> @title:window +#. +> trunk5 +#: kdiff3.cpp:756 kreplacements/kreplacements.cpp:630 +#, kde-format +msgid "Save As..." +msgstr "Уписивање као" + +#. +> trunk5 +#: kdiff3.cpp:815 +#, kde-format +msgid "Printing not implemented." +msgstr "Штампање није изведено." + +#. +> trunk5 +#: kdiff3.cpp:853 +#, kde-format +msgid "Printing..." +msgstr "Штампам..." + +#. +> trunk5 +#: kdiff3.cpp:939 +#, kde-format, untranslated +msgid "Printing page %1 of %2" +msgstr "" + +#. +> trunk5 +#: kdiff3.cpp:996 +#, kde-format +msgid "Selection" +msgstr "Избор" + +#. +> trunk5 +#: kdiff3.cpp:1023 +#, kde-format +msgid "Printing completed." +msgstr "Штампање завршено." + +#. +> trunk5 +#: kdiff3.cpp:1027 +#, kde-format +msgid "Printing aborted." +msgstr "Штампање обустављено." + +#. +> trunk5 +#: kdiff3.cpp:1034 +#, kde-format +msgid "Exiting..." +msgstr "Напуштам..." + +#. +> trunk5 +#: kdiff3.cpp:1045 +#, kde-format +msgid "Toggling toolbar..." +msgstr "Пребацујем траку алатки..." + +#. +> trunk5 +#: kdiff3.cpp:1066 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "Пребацујем траку стања..." + +#. +> trunk5 +#: kdiff3_part.cpp:46 +#, fuzzy, kde-format +#| msgid "{-KDiff3Part-}{+KDiff3 Part+}" +msgid "KDiff3 Part" +msgstr "&Kdiff3-n; део" + +#. +> trunk5 +#: kdiff3_part.cpp:47 +#, kde-format, untranslated +msgid "A KPart to display SVG images" +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:49 +#, kde-format, untranslated +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "" + +#. +> trunk5 +#: kdiff3_part.cpp:50 +#, kde-format +msgid "Joachim Eibl" +msgstr "&joachimeibl-n;" + +#. +> trunk5 +#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 +#, kde-format +msgid "Couldn't find files for comparison." +msgstr "Не могу да нађем фајлове за поређење." + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&&Kdiff3-n;" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "Подеси &kdiff3-a;" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_part.rc:16 +#, kde-format +msgid "KDiff3" +msgstr "&&Kdiff3-n;" + +#. +> trunk5 +#: kdiff3_shell.cpp:78 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"Не могу да припремим &kdiff3-a; део.\n" +"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља." + +#. i18n: ectx: Menu (file) +#. +> trunk5 +#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:304 +#, kde-format +msgid "&File" +msgstr "&Фајл" + +#. i18n: ectx: Menu (directory) +#. +> trunk5 +#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:306 +#, kde-format +msgid "&Directory" +msgstr "Ф&асцикла" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#. +> trunk5 +#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:504 +#: kreplacements/kreplacements.cpp:513 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "Поступак стапања текуће ставке" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#. +> trunk5 +#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:505 +#: kreplacements/kreplacements.cpp:514 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "Поступак синхронизовања текуће ставке" + +#. i18n: ectx: Menu (movement) +#. +> trunk5 +#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:309 +#, kde-format +msgid "&Movement" +msgstr "&Кретање" + +#. i18n: ectx: Menu (diff) +#. +> trunk5 +#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:310 +#, kde-format +msgid "D&iffview" +msgstr "Приказ &разлике" + +#. i18n: ectx: Menu (merge) +#. +> trunk5 +#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:311 +#, kde-format +msgid "&Merge" +msgstr "&Стапање" + +#. i18n: ectx: Menu (window) +#. +> trunk5 +#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:312 +#, kde-format +msgid "&Window" +msgstr "Про&зор" + +#. i18n: ectx: ToolBar (mainToolBar) +#. +> trunk5 +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Главна трака" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:166 kreplacements/kreplacements.cpp:197 +#: kreplacements/kreplacements.h:107 +#, kde-format +msgid "Cancel" +msgstr "Одустани" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:185 kreplacements/kreplacements.cpp:349 +#, kde-format +msgid "Ok" +msgstr "У реду" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:189 kreplacements/kreplacements.cpp:731 +#, kde-format +msgid "Help" +msgstr "Помоћ" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:193 +#, kde-format +msgid "Defaults" +msgstr "Подразумевано" + +# >> @title:menu +#. +> trunk5 +#: kreplacements/kreplacements.cpp:305 +#, kde-format +msgid "&Edit" +msgstr "&Уређивање" + +# >> @title:menu +#. +> trunk5 +#: kreplacements/kreplacements.cpp:313 +#, kde-format +msgid "&Settings" +msgstr "&Подешавање" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:314 +#, kde-format +msgid "&Help" +msgstr "П&омоћ" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:363 +#, kde-format +msgid "&About" +msgstr "&О пројекту" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:379 +#, kde-format +msgid "A&uthor" +msgstr "&Аутор" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:393 +#, kde-format +msgid "&Thanks To" +msgstr "&Захвалнице" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:613 +#, kde-format +msgid "Open" +msgstr "Отвори" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:622 +#, kde-format +msgid "Save" +msgstr "Сачувај" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:639 +#, kde-format +msgid "Print..." +msgstr "Штампај..." + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:647 kreplacements/kreplacements.h:108 +#, kde-format +msgid "Quit" +msgstr "Напусти" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:655 +#, kde-format +msgid "Cut" +msgstr "Исеци" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:663 +#, kde-format +msgid "Copy" +msgstr "Копирај" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:671 +#, kde-format +msgid "Paste" +msgstr "Налепи" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:679 +#, kde-format +msgid "Select All" +msgstr "Изабери све" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:687 +#, kde-format +msgid "Show Toolbar" +msgstr "Прикажи траку алатки" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:695 +#, kde-format +msgid "Show &Status Bar" +msgstr "Прикажи траку &стања" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:703 +#, kde-format +msgid "&Configure %1..." +msgstr "" +"&Подеси %1..." +"|/|" +"&Подеси $[аку %1]..." + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:715 kreplacements/kreplacements.cpp:723 +#, kde-format +msgid "About" +msgstr "О програму" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:738 +#, kde-format +msgid "Find" +msgstr "Нађи" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:746 +#, kde-format +msgid "Find Next" +msgstr "Нађи следеће" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:1099 +#, kde-format +msgid "For more documentation, see the help-menu or the subdirectory doc." +msgstr "За више документације, погледајте мени помоћи или потфасциклу ~!|‘doc’|." + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:1102 +#, kde-format +msgid "KDiff3-Usage" +msgstr "Употреба &kdiff3-g;" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:1102 +#, kde-format +msgid "Ignore" +msgstr "Игнориши" + +#. +> trunk5 +#: kreplacements/kreplacements.cpp:1102 +#, kde-format +msgid "Exit" +msgstr "Напусти" + +#. +> trunk5 +#: kreplacements/kreplacements.h:106 +#, kde-format +msgid "Continue" +msgstr "Настави" + +#. +> trunk5 +#: main.cpp:78 main.cpp:82 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "Игнорисано (кориснички дефинисано)." + +#. +> trunk5 +#: main.cpp:129 +#, kde-format +msgid "kdiff3" +msgstr "&kdiff3-n;" + +#. +> trunk5 +#: main.cpp:135 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "Алатка за поређење и стапање фајлова и фасцикли" + +#. +> trunk5 +#: main.cpp:136 +#, kde-format, untranslated +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" +msgstr "" + +#. +> trunk5 +#: main.cpp:153 +#, kde-format +msgid "Merge the input." +msgstr "Стопи улаз." + +#. +> trunk5 +#: main.cpp:154 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "Изричит базни фајл. За сагласност са појединим алаткама." + +#. +> trunk5 +#: main.cpp:155 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "Излазни фајл. Имплицира ~!/-m/. Нпр: ~!/-o novifajl.txt/" + +#. +> trunk5 +#: main.cpp:156 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "Излазни фајл, поново. За сагласност са појединим алаткама." + +#. +> trunk5 +#: main.cpp:157 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "Без &gui-g; ако су сви сукоби решиви аутоматски. Захтева ~!/-o fajl/." + +#. +> trunk5 +#: main.cpp:158 +#, fuzzy, kde-format +#| msgid "Don't solve conflicts automatically.{- (For compatibility...)-}" +msgid "Don't solve conflicts automatically." +msgstr "Не решавај сукобе аутоматски. За сагласност..." + +#. +> trunk5 +#: main.cpp:159 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "Замена видљивог имена за улазни фајл 1 (базни)." + +#. +> trunk5 +#: main.cpp:160 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "Замена видљивог имена за улазни фајл 2." + +#. +> trunk5 +#: main.cpp:161 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "Замена видљивог имена за улазни фајл 3." + +#. +> trunk5 +#: main.cpp:162 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз." + +#. +> trunk5 +#: main.cpp:163 +#, kde-format +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"|" + +#. +> trunk5 +#: main.cpp:164 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "Наброји поставке и тренутне вредности из поставе." + +#. +> trunk5 +#: main.cpp:165 +#, kde-format +msgid "Use a different config file." +msgstr "Употреби други поставни фајл." + +#. +> trunk5 +#: main.cpp:168 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "Фајл 1 за отварање (базни, ако није наведен преко --base)." + +#. +> trunk5 +#: main.cpp:169 +#, kde-format +msgid "file2 to open" +msgstr "Фајл 2 за отварање." + +#. +> trunk5 +#: main.cpp:170 +#, kde-format +msgid "file3 to open" +msgstr "Фајл 3 за отварање." + +#. +> trunk5 +#: mergeresultwindow.cpp:159 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "Број преосталих нерешених сукоба: %1 (од чега %2 празнине)." + +#. +> trunk5 +#: mergeresultwindow.cpp:340 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Излаз је измењен.\n" +"Ако наставите измене ће бити изгубљене." + +#. +> trunk5 +#: mergeresultwindow.cpp:904 pdiff.cpp:776 +#, kde-format +msgid "All input files are binary equal." +msgstr "Сви улазни фајлови бинарно су једнаки." + +#. +> trunk5 +#: mergeresultwindow.cpp:906 +#, kde-format +msgid "All input files contain the same text." +msgstr "Сви улазни фајлови садрже исти текст." + +#. +> trunk5 +#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 +#: mergeresultwindow.cpp:918 pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Фајлови %1 и %2 бинарно су једнаки.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 +#: mergeresultwindow.cpp:920 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "Фајлови %1 и %2 садрже исти текст.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:926 +#, kde-format +msgid "Total number of conflicts: " +msgstr "Укупан број сукоба: " + +#. +> trunk5 +#: mergeresultwindow.cpp:927 +#, kde-format +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"Број аутоматски решених сукоба: " + +#. +> trunk5 +#: mergeresultwindow.cpp:928 +#, kde-format +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"Број нерешених сукоба: " + +#. +> trunk5 +#: mergeresultwindow.cpp:930 +#, kde-format +msgid "Conflicts" +msgstr "Сукоби" + +#. +> trunk5 +#: mergeresultwindow.cpp:1833 +#, kde-format +msgid "" +msgstr "<нема изворног реда>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1841 +#, kde-format +msgid "" +msgstr "<сукоб стапања (само празнине)>" + +#. +> trunk5 +#: mergeresultwindow.cpp:1843 mergeresultwindow.cpp:2702 +#, kde-format +msgid "" +msgstr "<сукоб стапања>" + +#. +> trunk5 +#: mergeresultwindow.cpp:2914 +#, kde-format +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"Још нису решени сви сукоби.\n" +"Фајл није сачуван.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2916 mergeresultwindow.cpp:2925 +#, kde-format +msgid "Conflicts Left" +msgstr "Преостали сукоби" + +#. +> trunk5 +#: mergeresultwindow.cpp:2923 +#, kde-format +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" +msgstr "" +"Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" +"Фајл није сачуван.\n" + +#. +> trunk5 +#: mergeresultwindow.cpp:2937 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Прављење резерве није успело. Фајл није сачуван." + +#. +> trunk5 +#: mergeresultwindow.cpp:2937 mergeresultwindow.cpp:2985 +#, kde-format +msgid "File Save Error" +msgstr "Грешка уписивања фајла" + +#. +> trunk5 +#: mergeresultwindow.cpp:2985 +#, kde-format +msgid "Error while writing." +msgstr "Грешка при писању." + +#. +> trunk5 +#: mergeresultwindow.cpp:3345 +#, kde-format +msgid "Output" +msgstr "Излаз" + +#. +> trunk5 +#: mergeresultwindow.cpp:3357 mergeresultwindow.cpp:3548 +#, kde-format +msgid "[Modified]" +msgstr "[измењен]" + +#. +> trunk5 +#: mergeresultwindow.cpp:3364 +#, kde-format +msgid "Encoding for saving" +msgstr "Кодирање за уписивање" + +#. +> trunk5 +#: mergeresultwindow.cpp:3463 +#, kde-format +msgid "Conflict" +msgstr "Сукоб" + +# >! Merge sentence. +#. +> trunk5 +#: mergeresultwindow.cpp:3495 mergeresultwindow.cpp:3497 +#: mergeresultwindow.cpp:3499 +#, kde-format +msgid "Codec from" +msgstr "Кодирање из" + +#. +> trunk5 +#: optiondialog.cpp:228 +#, kde-format, untranslated +msgid "Change Font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:244 optiondialog.cpp:254 +#, kde-format, untranslated +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:509 +#, kde-format +msgid "Unicode" +msgstr "&unicode-n;" + +#. +> trunk5 +#: optiondialog.cpp:510 +#, kde-format +msgid "Latin1" +msgstr "&latin1-n;" + +#. +> trunk5 +#: optiondialog.cpp:529 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "Измените ово ако су не-&ascii-; знакови погрешно приказани." + +# >> @title:window +#. +> trunk5 +#: optiondialog.cpp:614 +#, kde-format +msgid "Configure" +msgstr "Подешавање" + +#. +> trunk5 +#: optiondialog.cpp:691 +#, kde-format +msgid "Font" +msgstr "Фонт" + +#. +> trunk5 +#: optiondialog.cpp:693 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "Фонт уређивача и излаза разлике" + +#. +> trunk5 +#: optiondialog.cpp:711 +#, kde-format, untranslated +msgid "Application font" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:715 +#, fuzzy, kde-format +#| msgid "File {-Save Error-}{+view font+}" +msgid "File view font" +msgstr "Грешка уписивања фајла" + +#. +> trunk5 +#: optiondialog.cpp:733 +#, kde-format +msgid "Color" +msgstr "Боја" + +#. +> trunk5 +#: optiondialog.cpp:734 +#, kde-format +msgid "Colors Settings" +msgstr "Поставке боја" + +#. +> trunk5 +#: optiondialog.cpp:751 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "Уређивач и прикази разлика:" + +#. +> trunk5 +#: optiondialog.cpp:759 +#, kde-format +msgid "Foreground color:" +msgstr "Боја текста:" + +#. +> trunk5 +#: optiondialog.cpp:766 +#, kde-format +msgid "Background color:" +msgstr "Боја позадине:" + +#. +> trunk5 +#: optiondialog.cpp:775 +#, kde-format +msgid "Diff background color:" +msgstr "Боја позадине разлика:" + +#. +> trunk5 +#: optiondialog.cpp:783 +#, kde-format +msgid "Color A:" +msgstr "Боја А:" + +#. +> trunk5 +#: optiondialog.cpp:791 +#, kde-format +msgid "Color B:" +msgstr "Боја Б:" + +#. +> trunk5 +#: optiondialog.cpp:799 +#, kde-format +msgid "Color C:" +msgstr "Боја Ц:" + +#. +> trunk5 +#: optiondialog.cpp:806 +#, kde-format +msgid "Conflict color:" +msgstr "Боја сукоба:" + +#. +> trunk5 +#: optiondialog.cpp:814 +#, kde-format +msgid "Current range background color:" +msgstr "Позадинска боја текућег опсега:" + +#. +> trunk5 +#: optiondialog.cpp:822 +#, kde-format +msgid "Current range diff background color:" +msgstr "Позадинска боја текућег опсега разлика:" + +#. +> trunk5 +#: optiondialog.cpp:829 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "Боја ручно поравнатих опсега разлика:" + +#. +> trunk5 +#: optiondialog.cpp:835 +#, kde-format +msgid "Directory Comparison View:" +msgstr "Приказ поређења фасцикли:" + +#. +> trunk5 +#: optiondialog.cpp:841 +#, kde-format +msgid "Newest file color:" +msgstr "Боја најновијег фајла:" + +#. +> trunk5 +#: optiondialog.cpp:845 +#, kde-format +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "Измена ове боје ступиће на снагу од првог наредног поређења фасцикли." + +#. +> trunk5 +#: optiondialog.cpp:850 +#, kde-format +msgid "Oldest file color:" +msgstr "Боја најстаријег фајла:" + +#. +> trunk5 +#: optiondialog.cpp:858 +#, kde-format +msgid "Middle age file color:" +msgstr "Боја фајла средње старости:" + +#. +> trunk5 +#: optiondialog.cpp:866 +#, kde-format +msgid "Color for missing files:" +msgstr "Боја за недостајуће фајлове:" + +#. +> trunk5 +#: optiondialog.cpp:879 +#, kde-format +msgid "Editor" +msgstr "Уређивач" + +#. +> trunk5 +#: optiondialog.cpp:880 +#, kde-format +msgid "Editor Behavior" +msgstr "Понашање уређивача" + +# skip-rule: t-tab +#. +> trunk5 +#: optiondialog.cpp:893 +#, kde-format +msgid "Tab inserts spaces" +msgstr "&Tab-n; умеће размаке" + +# rewrite-msgid: /generate/insert/ +#. +> trunk5 +#: optiondialog.cpp:896 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Укључено: притиском &tab-g; умеће се одговарајући број размака.\n" +"Искључено: умеће се знак табулатора." + +#. +> trunk5 +#: optiondialog.cpp:901 +#, kde-format +msgid "Tab size:" +msgstr "Величина табулатора:" + +#. +> trunk5 +#: optiondialog.cpp:907 +#, kde-format +msgid "Auto indentation" +msgstr "Аутоматско увлачење" + +#. +> trunk5 +#: optiondialog.cpp:910 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Укључено: увлачење претходног реда узима се за нови ред.\n" + +#. +> trunk5 +#: optiondialog.cpp:913 +#, kde-format +msgid "Auto copy selection" +msgstr "Аутоматско копирање избора" + +#. +> trunk5 +#: optiondialog.cpp:916 +#, kde-format +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"Укључено: сваки избор се одмах уписује у клипборд.\n" +"Искључено: морате изричито копирати, нпр. помоћу ~!/&ctrl-n;+C/." + +#. +> trunk5 +#: optiondialog.cpp:930 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Поставља завршетке редова када се измењени фајл сачува.\n" +"&dosos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/." + +#. +> trunk5 +#: optiondialog.cpp:940 +#, kde-format +msgid "Diff" +msgstr "Разликовање" + +#. +> trunk5 +#: optiondialog.cpp:941 +#, kde-format +msgid "Diff Settings" +msgstr "Поставке разликовања" + +# >! Merge sentence. +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#. +> trunk5 +#: optiondialog.cpp:965 +#, kde-format +msgid "Treat as white space." +msgstr "Третирај као празнине." + +#. +> trunk5 +#: optiondialog.cpp:967 +#, kde-format +msgid "Ignore numbers" +msgstr "Игнориши бројеве" + +#. +> trunk5 +#: optiondialog.cpp:970 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Игнориши цифарске знакове у фази поклапања редова (слично игнорисању празнина).\n" +"Може бити корисно при поређењу фајлова са нумеричким подацима." + +#. +> trunk5 +#: optiondialog.cpp:974 +#, kde-format +msgid "Ignore C/C++ comments" +msgstr "Игнориши &clang-;/&cpp-; коментаре" + +#. +> trunk5 +#: optiondialog.cpp:976 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "Третирај &clang-;/&cpp-; коментаре као празнине." + +#. +> trunk5 +#: optiondialog.cpp:979 +#, kde-format +msgid "Ignore case" +msgstr "Игнориши величину слова" + +#. +> trunk5 +#: optiondialog.cpp:982 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’)." + +#. +> trunk5 +#: optiondialog.cpp:985 +#, kde-format +msgid "Preprocessor command:" +msgstr "Предобрадна наредба:" + +#. +> trunk5 +#: optiondialog.cpp:989 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "Кориснички дефинисана предобрада. Погледајте документацију за детаље." + +#. +> trunk5 +#: optiondialog.cpp:992 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "Предобрадна наредба за поклапање редова:" + +#. +> trunk5 +#: optiondialog.cpp:996 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Предобрада се користи само током поклапања редова.\n" +"Погледајте документацију за детаље." + +#. +> trunk5 +#: optiondialog.cpp:999 +#, kde-format +msgid "Try hard (slower)" +msgstr "Потруди се (спорије)" + +#. +> trunk5 +#: optiondialog.cpp:1002 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Укључује опцију --minimal за спољашње разликовање.\n" +"Анализа великих фајлова ће бити много спорија." + +#. +> trunk5 +#: optiondialog.cpp:1006 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "Поравнај Б и Ц за три улазна фајла" + +#. +> trunk5 +#: optiondialog.cpp:1009 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n" +"Није препоручљиво за стапање зато што га може учинити сложенијим.\n" +"Подразумевано је искључено." + +#. +> trunk5 +#: optiondialog.cpp:1021 +#, kde-format +msgid "Merge Settings" +msgstr "Поставке стапања" + +#. +> trunk5 +#: optiondialog.cpp:1035 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "Застој аутоматског напредовања (~!/ms/):" + +#. +> trunk5 +#: optiondialog.cpp:1040 +#, kde-format +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 "" +"У режиму аутоматског напредовања резултат текућег избора приказује се \n" +"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/." + +#. +> trunk5 +#: optiondialog.cpp:1044 +#, kde-format +msgid "Show info dialogs" +msgstr "Приказуј информативне дијалоге" + +#. +> trunk5 +#: optiondialog.cpp:1046 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "Приказује дијалог са информацијом о броју сукоба." + +#. +> trunk5 +#: optiondialog.cpp:1049 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "Подразумевано стапање празнина два фајла:" + +#. +> trunk5 +#: optiondialog.cpp:1053 optiondialog.cpp:1065 +#, kde-format +msgid "Manual Choice" +msgstr "Ручни избор" + +#. +> trunk5 +#: optiondialog.cpp:1057 optiondialog.cpp:1070 +#, kde-format +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама." + +#. +> trunk5 +#: optiondialog.cpp:1061 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "Подразумевано стапање празнина три фајла:" + +#. +> trunk5 +#: optiondialog.cpp:1074 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "Регуларни израз за аутоматско стапање" + +#. +> trunk5 +#: optiondialog.cpp:1082 smalldialogs.cpp:448 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "Регуларни израз за аутоматско стапање:" + +#. +> trunk5 +#: optiondialog.cpp:1086 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б." + +#. +> trunk5 +#: optiondialog.cpp:1092 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "Аутоматски стопи по регуларном изразу на почетку стапања" + +#. +> trunk5 +#: optiondialog.cpp:1094 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n" + +#. +> trunk5 +#: optiondialog.cpp:1099 +#, kde-format +msgid "Version Control History Merging" +msgstr "Стапање историјата управљања верзијама" + +#. +> trunk5 +#: optiondialog.cpp:1107 smalldialogs.cpp:475 +#, kde-format +msgid "History start regular expression:" +msgstr "Регуларни израз за почетак историјата:" + +# literal-segment: Log +#. +> trunk5 +#: optiondialog.cpp:1111 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Регуларни израз за почетак уноса у историјату управљања верзијама.\n" +"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n" +"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/." + +#. +> trunk5 +#: optiondialog.cpp:1117 smalldialogs.cpp:503 +#, kde-format +msgid "History entry start regular expression:" +msgstr "Регуларни израз за почетак уноса историјата:" + +#. +> trunk5 +#: optiondialog.cpp:1129 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"Унос у историјату управљања верзијама чини неколико редова.\n" +"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n" +"Користите заграде да групишете кључеве по којима ће се ређати.\n" +"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n" +"Детаље потражите у документацији." + +#. +> trunk5 +#: optiondialog.cpp:1137 +#, kde-format +msgid "History merge sorting" +msgstr "Ређање у стапању историјата" + +#. +> trunk5 +#: optiondialog.cpp:1139 +#, kde-format +msgid "Sort version control history by a key." +msgstr "Ређа историјат управљања верзијама по кључу." + +#. +> trunk5 +#: optiondialog.cpp:1149 +#, kde-format +msgid "History entry start sort key order:" +msgstr "Редослед ређања за кључеве уноса историјата:" + +#. +> trunk5 +#: optiondialog.cpp:1153 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n" +"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n" +"Ако се остави празно, ређање се не спроводи.\n" +"Детаље потражите у документацији." + +#. +> trunk5 +#: optiondialog.cpp:1164 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "Стопи историјат управљања верзијама на почетку стапања" + +#. +> trunk5 +#: optiondialog.cpp:1166 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања." + +#. +> trunk5 +#: optiondialog.cpp:1170 +#, kde-format +msgid "Max number of history entries:" +msgstr "Највећи број уноса историјата:" + +# skip-rule: t-cut +#. +> trunk5 +#: optiondialog.cpp:1173 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса." + +# >> @action:button +#. +> trunk5 +#: optiondialog.cpp:1177 +#, kde-format +msgid "Test your regular expressions" +msgstr "Испробај регуларне изразе" + +#. +> trunk5 +#: optiondialog.cpp:1182 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "Наредба при безначајном стапању:" + +#. +> trunk5 +#: optiondialog.cpp:1186 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n" +"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3" + +#. +> trunk5 +#: optiondialog.cpp:1191 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "Аутоматски сачувај и напусти при стапању без сукоба" + +#. +> trunk5 +#: optiondialog.cpp:1194 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n" +"Слично опцији командне линије --auto." + +#. +> trunk5 +#: optiondialog.cpp:1205 optiondialog.cpp:1206 +#, kde-format +msgid "Directory" +msgstr "Фасцикла" + +#. +> trunk5 +#: optiondialog.cpp:1218 +#, kde-format +msgid "Recursive directories" +msgstr "Рекурзивно кроз фасцикле" + +#. +> trunk5 +#: optiondialog.cpp:1220 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "Да ли анализирати потфасцикле." + +#. +> trunk5 +#: optiondialog.cpp:1222 +#, kde-format +msgid "File pattern(s):" +msgstr "Обрасци фајлова:" + +#. +> trunk5 +#: optiondialog.cpp:1227 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Обрасци за фајлове које треба анализирати.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем." + +#. +> trunk5 +#: optiondialog.cpp:1232 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "Противобрасци фајлова:" + +#. +> trunk5 +#: optiondialog.cpp:1237 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Обрасци за фајлове које треба искључити из анализе.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем." + +#. +> trunk5 +#: optiondialog.cpp:1242 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "Противобрасци фасцикли:" + +#. +> trunk5 +#: optiondialog.cpp:1247 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Обрасци за фасцикле које треба искључити из анализе.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем." + +#. +> trunk5 +#: optiondialog.cpp:1252 +#, kde-format +msgid "Use .cvsignore" +msgstr "Користи ~!/.cvsignore/" + +#. +> trunk5 +#: optiondialog.cpp:1255 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Проширује противобрасце на све што би игнорисао &cvs-n;.\n" +"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли." + +#. +> trunk5 +#: optiondialog.cpp:1259 +#, kde-format +msgid "Find hidden files and directories" +msgstr "Пронађи скривене фајлове и фасцикле" + +#. +> trunk5 +#: optiondialog.cpp:1262 +#, kde-format +msgid "Finds files and directories with the hidden attribute." +msgstr "Налази фајлове и фасцикле са атрибутом скривености." + +#. +> trunk5 +#: optiondialog.cpp:1264 +#, kde-format +msgid "Finds files and directories starting with '.'." +msgstr "Налази фајлове и фасцикле које почињу са ‘.’." + +#. +> trunk5 +#: optiondialog.cpp:1268 +#, kde-format +msgid "Follow file links" +msgstr "Прати везе фајлова" + +#. +> trunk5 +#: optiondialog.cpp:1271 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Укључено: пореди фајлове на које показују везе.\n" +"Искључено: пореди везе." + +#. +> trunk5 +#: optiondialog.cpp:1275 +#, kde-format +msgid "Follow directory links" +msgstr "Прати везе фасцикли" + +#. +> trunk5 +#: optiondialog.cpp:1278 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Укључено: пореди фасцикле на које показују везе.\n" +"Искључено: пореди везе." + +#. +> trunk5 +#: optiondialog.cpp:1293 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "Поређење имена фајлова разликује величину слова" + +#. +> trunk5 +#: optiondialog.cpp:1296 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено." + +#. +> trunk5 +#: optiondialog.cpp:1300 +#, fuzzy, kde-format +#| msgid "Unfold {-All Subdirs-}{+all subdirectories on load+}" +msgid "Unfold all subdirectories on load" +msgstr "Рашири све потфасцикле" + +#. +> trunk5 +#: optiondialog.cpp:1303 +#, kde-format, untranslated +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1307 +#, kde-format, untranslated +msgid "Skip directory status report" +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1310 +#, kde-format, untranslated +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#. +> trunk5 +#: optiondialog.cpp:1314 +#, kde-format +msgid "File Comparison Mode" +msgstr "Режим поређења фајлова" + +#. +> trunk5 +#: optiondialog.cpp:1319 +#, kde-format +msgid "Binary comparison" +msgstr "Бинарно поређење" + +#. +> trunk5 +#: optiondialog.cpp:1320 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "Бинарно поређење за сваки фајл (подразумевано)." + +#. +> trunk5 +#: optiondialog.cpp:1323 +#, kde-format +msgid "Full analysis" +msgstr "Пуна анализа" + +#. +> trunk5 +#: optiondialog.cpp:1324 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" +"Спорије него бинарно поређење, много спорије за бинарне фајлове." + +#. +> trunk5 +#: optiondialog.cpp:1328 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "Веруј величини и датуму измене (несигурно)" + +#. +> trunk5 +#: optiondialog.cpp:1329 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" +"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n" +"Корисно за велике фасцикле или споре мреже." + +#. +> trunk5 +#: optiondialog.cpp:1334 +#, kde-format +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)" + +#. +> trunk5 +#: optiondialog.cpp:1335 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" +"Ако датуми нису исти али величина јесте, бинарно упоређује.\n" +"Корисно за велике фасцикле или споре мреже." + +#. +> trunk5 +#: optiondialog.cpp:1340 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "Веруј величини (несигурно)" + +#. +> trunk5 +#: optiondialog.cpp:1341 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" +"Претпоставља да су фајлови једнаки ако им једнаке величине.\n" +"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања." + +#. +> trunk5 +#: optiondialog.cpp:1348 +#, kde-format +msgid "Synchronize directories" +msgstr "Синхронизуј фасцикле" + +#. +> trunk5 +#: optiondialog.cpp:1351 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" +"Ради само када се пореде две фасцикле без задавања одредишта." + +#. +> trunk5 +#: optiondialog.cpp:1357 +#, kde-format +msgid "White space differences considered equal" +msgstr "Разлике у празнинама сматрају се једнаким" + +#. +> trunk5 +#: optiondialog.cpp:1360 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n" +"Ово је активно само када се изабере пуна анализа." + +# >> copy newer file +#. +> trunk5 +#: optiondialog.cpp:1366 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "Копирај новији уместо стапања (несигурно)" + +#. +> trunk5 +#: optiondialog.cpp:1369 +#, kde-format +msgid "" +"Don't look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" +"Не гледа садржај, само узима новији фајл.\n" +"Користите ово само ако знате шта радите!\n" +"Има ефекта само при поређењу две фасцикле." + +#. +> trunk5 +#: optiondialog.cpp:1374 +#, kde-format +msgid "Backup files (.orig)" +msgstr "Прави резерве фајлова (~!/.orig/)" + +#. +> trunk5 +#: optiondialog.cpp:1377 +#, kde-format +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан." + +# rewrite-msgid: /Regional/Locale/ +#. +> trunk5 +#: optiondialog.cpp:1453 optiondialog.cpp:1454 +#, kde-format +msgid "Regional Settings" +msgstr "Поставке локалитета" + +#. +> trunk5 +#: optiondialog.cpp:1555 +#, kde-format +msgid "Language (restart required)" +msgstr "Језик (потребно поновно покретање)" + +#. +> trunk5 +#: optiondialog.cpp:1598 +#, kde-format +msgid "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." +msgstr "" +"Изаберите језик ниски у сучељу, или „аутоматски“.\n" +"Напустите па покрените &kdiff3-a; да би промена језика ступила на снагу." + +#. +> trunk5 +#: optiondialog.cpp:1615 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "Исто кодирање за све:" + +#. +> trunk5 +#: optiondialog.cpp:1618 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Укључивањем овог можете променити сва кодирања променом само првог.\n" +"Искључите ово ако поједине поставке треба да буду различите." + +# >! Merge sentence. +#. +> trunk5 +#: optiondialog.cpp:1622 +#, kde-format +msgid "Note: Local Encoding is " +msgstr "Напомена: локално кодирање је " + +#. +> trunk5 +#: optiondialog.cpp:1626 +#, kde-format +msgid "File Encoding for A:" +msgstr "Кодирање фајла за А:" + +#. +> trunk5 +#: optiondialog.cpp:1632 +#, kde-format +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n" +"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n" +"Откривање &unicode-g; зависи од првих бајтова у фајлу." + +#. +> trunk5 +#: optiondialog.cpp:1635 optiondialog.cpp:1644 optiondialog.cpp:1653 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "Аутоматски откриј &unicode-a;" + +#. +> trunk5 +#: optiondialog.cpp:1640 +#, kde-format +msgid "File Encoding for B:" +msgstr "Кодирање фајла за Б:" + +#. +> trunk5 +#: optiondialog.cpp:1649 +#, kde-format +msgid "File Encoding for C:" +msgstr "Кодирање фајла за Ц:" + +#. +> trunk5 +#: optiondialog.cpp:1658 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "Кодирање фајла за стопљени излаз и уписивање:" + +#. +> trunk5 +#: optiondialog.cpp:1662 +#, kde-format +msgid "Auto Select" +msgstr "Аутоматски изабери" + +#. +> trunk5 +#: optiondialog.cpp:1665 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Ако је укључено, узима се кодирање према улазним фајловима.\n" +"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање." + +#. +> trunk5 +#: optiondialog.cpp:1668 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "Кодирање фајла за предобрадне фајлове:" + +#. +> trunk5 +#: optiondialog.cpp:1679 +#, kde-format +msgid "Right To Left Language" +msgstr "Језици здесна улево" + +#. +> trunk5 +#: optiondialog.cpp:1682 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Неки језици се читају здесна улево.\n" +"Ова поставка прилагођава томе приказивач и уређивач." + +#. +> trunk5 +#: optiondialog.cpp:1701 +#, kde-format +msgid "Integration" +msgstr "Уклапање" + +#. +> trunk5 +#: optiondialog.cpp:1702 +#, kde-format +msgid "Integration Settings" +msgstr "Поставке уклапања" + +#. +> trunk5 +#: optiondialog.cpp:1715 +#, kde-format +msgid "Command line options to ignore:" +msgstr "Занемари опције командне линије:" + +#. +> trunk5 +#: optiondialog.cpp:1720 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n" +"Више вредности можете задати раздвојене тачка-запетом.\n" +"Овим се сузбија грешка „непозната опција“." + +#. +> trunk5 +#: optiondialog.cpp:1725 +#, kde-format +msgid "Quit also via Escape key" +msgstr "Напуштање и преко тастера &esc-n;" + +#. +> trunk5 +#: optiondialog.cpp:1728 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Брз начин напуштања.\n" +"За оне навикнуте на тастер &esc-n; у ову сврху." + +#. +> trunk5 +#: optiondialog.cpp:1733 +#, kde-format +msgid "Integrate with ClearCase" +msgstr "Уклопи са &clearcase-i;" + +#. +> trunk5 +#: optiondialog.cpp:1736 +#, kde-format +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"Уклапање са &ibm-imp; &clearcase_rm-i;.\n" +"Уноси измене у фајл ~!/map/ у &clearcase-lzp; потфасцикли ~!|lib/mgrs|.\n" +"Активно само ако је &clearcase-nzp; фасцикла ~!/bin/ у путањи." + +#. +> trunk5 +#: optiondialog.cpp:1742 +#, kde-format +msgid "Remove ClearCase Integration" +msgstr "Уклони уклапање са &clearcase-i;" + +#. +> trunk5 +#: optiondialog.cpp:1745 +#, kde-format +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "Враћа стари фајл ~!/map/, какав је био пре уклапања са &clearcase-i;." + +#. +> trunk5 +#: optiondialog.cpp:1849 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "Ово ресетује све опције, и то не само оне у текућој теми." + +#. +> trunk5 +#: pdiff.cpp:89 pdiff.cpp:103 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Грешка, губитак података:\n" +"Ако је можете поновити, контактирајте аутора.\n" + +#. +> trunk5 +#: pdiff.cpp:91 pdiff.cpp:105 +#, kde-format +msgid "Severe Internal Error" +msgstr "Озбиљна унутрашња грешка" + +#. +> trunk5 +#: pdiff.cpp:133 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "Наредба предобраде: " + +#. +> trunk5 +#: pdiff.cpp:138 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "Следеће опције које сте изабрали могу изменити податке:\n" + +#. +> trunk5 +#: pdiff.cpp:139 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Врло вероватно не желите ово приликом стапања.\n" +"Желите ли да искључите ове поставке или да наставите даље са њима?" + +#. +> trunk5 +#: pdiff.cpp:141 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "Опција несигурна за стапање" + +#. +> trunk5 +#: pdiff.cpp:142 +#, kde-format +msgid "Use These Options During Merge" +msgstr "Користи ове опције при стапању" + +#. +> trunk5 +#: pdiff.cpp:143 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "Искључи несигурне опције" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:173 +#, kde-format +msgid "Loading A" +msgstr "Учитавам А" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:184 +#, kde-format +msgid "Loading B" +msgstr "Учитавам Б" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:208 pdiff.cpp:238 +#, kde-format +msgid "Diff: A <-> B" +msgstr "Разликујем А и Б" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:215 pdiff.cpp:266 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "Разликујем редове А и Б" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:226 +#, kde-format +msgid "Loading C" +msgstr "Учитавам Ц" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:242 +#, kde-format +msgid "Diff: B <-> C" +msgstr "Разликујем Б и Ц" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:246 +#, kde-format +msgid "Diff: A <-> C" +msgstr "Разликујем А и Ц" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:269 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "Разликујем редове Б и Ц" + +# >> @info:progress +#. +> trunk5 +#: pdiff.cpp:272 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "Разликујем редове А и Ц" + +#. +> trunk5 +#: pdiff.cpp:778 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки." + +#. +> trunk5 +#: pdiff.cpp:784 pdiff.cpp:788 pdiff.cpp:792 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" + +#. +> trunk5 +#: pdiff.cpp:802 +#, kde-format +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 "" +"Изгледа да неки улазни фајлови нису чисто текстуални.\n" +"Имајте на уму да стапање у &kdiff3-l; није намењено бинарним подацима.\n" +"Наставите на сопствену одговорност." + +#. +> trunk5 +#: pdiff.cpp:816 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Don't save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Неке улазни знакови не могу да се претворе у &unicode-a;.\n" +"Можда сте изабрали погрешно кодирање (нпр. &utf8-n; за не-&utf8-; фајлове).\n" +"Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" +"Погођени улазни фајлови налазе се у %1." + +#. +> trunk5 +#: pdiff.cpp:1035 +#, kde-format +msgid "Abort" +msgstr "Обустави" + +#. +> trunk5 +#: pdiff.cpp:1041 pdiff.cpp:1129 +#, kde-format +msgid "Opening files..." +msgstr "Отварам фајлове..." + +#. +> trunk5 +#: pdiff.cpp:1106 pdiff.cpp:1177 +#, kde-format +msgid "File open error" +msgstr "Грешка при отварању фајла" + +#. +> trunk5 +#: pdiff.cpp:1216 +#, kde-format +msgid "Cutting selection..." +msgstr "Исецам изабрано..." + +#. +> trunk5 +#: pdiff.cpp:1237 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "Копирам избор у клипборд..." + +#. +> trunk5 +#: pdiff.cpp:1253 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "Умећем садржај клипборда..." + +#. +> trunk5 +#: pdiff.cpp:1714 +#, kde-format, untranslated +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1715 +#, kde-format, untranslated +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#. +> trunk5 +#: pdiff.cpp:1926 +#, kde-format +msgid "Save && Continue" +msgstr "Сачувај и настави" + +#. +> trunk5 +#: pdiff.cpp:1927 +#, kde-format +msgid "Continue Without Saving" +msgstr "Настави без уписивања" + +#. +> trunk5 +#: pdiff.cpp:2139 +#, kde-format +msgid "Search complete." +msgstr "Претрага је готова." + +#. +> trunk5 +#: pdiff.cpp:2139 +#, kde-format +msgid "Search Complete" +msgstr "Претрага завршена" + +#. +> trunk5 +#: pdiff.cpp:2381 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "Ништа није изабрано ни у једном прозору улаза разлике." + +#. +> trunk5 +#: pdiff.cpp:2381 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "Грешка при додавању ручног опсега разлике" + +#. +> trunk5 +#: progress.cpp:57 progress.cpp:69 +#, kde-format +msgid "&Cancel" +msgstr "&Одустани" + +#. +> trunk5 +#: smalldialogs.cpp:60 +#, kde-format +msgid "A (Base):" +msgstr "А (база):" + +#. +> trunk5 +#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 +#: smalldialogs.cpp:143 +#, kde-format +msgid "File..." +msgstr "Фајл..." + +#. +> trunk5 +#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 +#: smalldialogs.cpp:145 +#, kde-format +msgid "Dir..." +msgstr "Фасцикла..." + +#. +> trunk5 +#: smalldialogs.cpp:95 +#, kde-format +msgid "C (Optional):" +msgstr "Ц (опционо):" + +#. +> trunk5 +#: smalldialogs.cpp:118 +#, kde-format +msgid "Swap/Copy Names ..." +msgstr "Размени/копирај имена..." + +#. +> trunk5 +#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Размени %1 и %2" + +#. +> trunk5 +#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 +#, kde-format +msgid "Copy %1->Output" +msgstr "Копирај %1 у излаз" + +#. +> trunk5 +#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 +#, kde-format +msgid "Swap %1<->Output" +msgstr "Размени %1 и излаз" + +#. +> trunk5 +#: smalldialogs.cpp:137 +#, kde-format +msgid "Output (optional):" +msgstr "Излаз (опционо):" + +#. +> trunk5 +#: smalldialogs.cpp:167 +#, kde-format +msgid "Configure..." +msgstr "Подеси..." + +#. +> trunk5 +#: smalldialogs.cpp:232 +#, fuzzy, kde-format +#| msgid "{+Open +}Directory" +msgid "Open Directory" +msgstr "Фасцикла" + +#. +> trunk5 +#: smalldialogs.cpp:233 +#, kde-format, untranslated +msgid "Select Output File" +msgstr "" + +#. +> trunk5 +#: smalldialogs.cpp:392 +#, kde-format +msgid "Search text:" +msgstr "Тражени текст:" + +#. +> trunk5 +#: smalldialogs.cpp:399 +#, kde-format +msgid "Case sensitive" +msgstr "Разликуј величину слова" + +#. +> trunk5 +#: smalldialogs.cpp:402 +#, kde-format +msgid "Search A" +msgstr "Претражи А" + +#. +> trunk5 +#: smalldialogs.cpp:407 +#, kde-format +msgid "Search B" +msgstr "Претражи Б" + +#. +> trunk5 +#: smalldialogs.cpp:412 +#, kde-format +msgid "Search C" +msgstr "Претражи Ц" + +#. +> trunk5 +#: smalldialogs.cpp:417 +#, kde-format +msgid "Search output" +msgstr "Излаз претраге" + +#. +> trunk5 +#: smalldialogs.cpp:424 +#, kde-format +msgid "&Search" +msgstr "&Тражи" + +#. +> trunk5 +#: smalldialogs.cpp:443 +#, kde-format +msgid "Regular Expression Tester" +msgstr "Проба регуларних израза" + +#. +> trunk5 +#: smalldialogs.cpp:456 +#, kde-format +msgid "Example auto merge line:" +msgstr "Пример реда за аутоматско стапање:" + +#. +> trunk5 +#: smalldialogs.cpp:458 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима." + +#. +> trunk5 +#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 +#, kde-format +msgid "Match result:" +msgstr "Резултат поклапања:" + +#. +> trunk5 +#: smalldialogs.cpp:483 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "Пример почетног реда историјата (са водећим коментаром):" + +#. +> trunk5 +#: smalldialogs.cpp:485 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар." + +#. +> trunk5 +#: smalldialogs.cpp:511 +#, kde-format +msgid "History sort key order:" +msgstr "Редослед ређања кључева историјата:" + +#. +> trunk5 +#: smalldialogs.cpp:519 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "Пример почетног реда ставке историјата (без водећег коментара):" + +#. +> trunk5 +#: smalldialogs.cpp:521 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар." + +#. +> trunk5 +#: smalldialogs.cpp:535 +#, kde-format +msgid "Sort key result:" +msgstr "Резултат ређања кључева:" + +#. +> trunk5 +#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 +#, kde-format +msgid "Match success." +msgstr "Поклапање је успело." + +#. +> trunk5 +#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 +#, kde-format +msgid "Match failed." +msgstr "Поклапање није успело." + +#. +> trunk5 +#: smalldialogs.cpp:604 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу." + +#~ msgid "&OK" +#~ msgstr "&У реду" + +#~ msgid "OK" +#~ msgstr "У реду" + +#, fuzzy +#~| msgid "(c) 2002-2011 Joachim Eibl" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "© 2002–2011, &joachimeibl-n;" + +#~ 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" +#~ "~!|mergeResultSaved: m_pMFI=0|\n" +#~ "\n" +#~ "Ако знате како ово да поновите, обратите се аутору програма." + +#~ msgid "Program Error" +#~ msgstr "Грешка у програму" + +#~ msgid "Error." +#~ msgstr "Грешка." + +#~ msgid "Select Font" +#~ msgstr "Изабери фонт" + +#~ 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" +#~ "\n" +#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" +#~ "ширине, можете искусити проблеме у току уређивања.\n" +#~ "\n" +#~ "Желите ли да наставите или да изаберете други фонт?" + +# >> @title:window +#~ msgid "Incompatible font." +#~ msgstr "Несагласан фонт" + +#~ msgid "Continue at my own risk" +#~ msgstr "Настави на моју одговорност" + +#~ msgid "Select another font" +#~ msgstr "Изабери други фонт" + +#~ msgid "Eike Sauer" +#~ msgstr "&eikesauer-n;" + +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "Исправке грешака, одржавалац &debian-gmp; пакета" + +#~ msgid "Sebastien Fricker" +#~ msgstr "&sebastienfricker-n;" + +#~ msgid "Windows installer" +#~ msgstr "Инсталатер за &windowsos-a;" + +#~ msgid "Stephan Binner" +#~ msgstr "&stephanbinner-n;" + +#~ msgid "i18n-help" +#~ msgstr "Помоћ у интернационализацији" + +#~ msgid "Stefan Partheymueller" +#~ msgstr "&stefanpartheymueller-n;" + +#~ msgid "Clipboard-patch" +#~ msgstr "Закрпа за клипборд" + +#~ msgid "David Faure" +#~ msgstr "&davidfaure-n;" + +#~ msgid "KIO-Help" +#~ msgstr "Помоћ за &ioslave-ak;" + +#~ msgid "Bernd Gehrmann" +#~ msgstr "&berndgehrmann-n;" + +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Класа ~!/CvsIgnoreList/ из &cervisia-g;" + +#~ msgid "Andre Woebbeking" +#~ msgstr "&andrewoebbeking-n;" + +#~ msgid "Class StringMatcher" +#~ msgstr "Класа ~!/StringMatcher/" + +#~ msgid "Michael Denio" +#~ msgstr "&michaeldenio-n;" + +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "Закрпа за бојење једнакости фасцикли" + +#~ msgid "Manfred Koehler" +#~ msgstr "&manfredkoehler-n;" + +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Поправка за споро покретање под &windowsos-i;" + +#~ msgid "Sergey Zorin" +#~ msgstr "&sergeyzorin-n;" + +#~ msgid "Diff Ext for Windows" +#~ msgstr "Проширење за разликовање под &windowsos-i;" + +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "&pauleggert-n;, &mikehaertel-n;, &davidhayes-n;, &richardmstallman-n;, &leonardhtower-n;" + +#~ msgid "GNU-Diffutils" +#~ msgstr "&Gnu-nzkp; алатке за разликовање" + +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "&tinoboellsterling-n;, &timothymee-n;" + +#~ msgid "Intensive test, use and feedback" +#~ msgstr "Интензивно испробавање, употреба и реаговања" + +#~ msgid "Michael Schmidt" +#~ msgstr "&michaelschmidt-n;" + +#~ msgid "Mac support" +#~ msgstr "Подршка за &maccomp-a;" + +#~ msgid "Valentin Rusu" +#~ msgstr "&valentinrusu-n;" + +#~ msgid "KDE4 porting" +#~ msgstr "Преношење на &kde4-a;" + +#~ msgid "Albert Astals Cid" +#~ msgstr "&albertastalscid-n;" + +#~ msgid "Silvan Scherrer" +#~ msgstr "&silvanscherrer-n;" + +#~ msgid "OS2 port" +#~ msgstr "Преношење на &os2-a;" + +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "+ Пуно хвала свима који су пријављивали грешке и прилагали идеје!" + +#~ msgid "Italic font for deltas" +#~ msgstr "Курзивни фонт за делте" + +# rewrite-msgid: /italic characters/italics/ +#~ 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" +#~ "Ако фонт не подржава курзив, онда ово не ради ништа." + +#~ msgid "Incompatible Font" +#~ msgstr "Несагласан фонт" + +#~ msgid "Continue at Own Risk" +#~ msgstr "Настави на моју одговорност" + +#~ msgid "Select Another Font" +#~ msgstr "Изабери други фонт" Index: trunk/l10n-support/sr/summit/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/sr/summit/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/sr/summit/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,122 @@ +# Translation of kdiff3fileitemactionplugin.po into Serbian. +# Chusslove Illich , 2012, 2017. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-02-21 09:16+0100\n" +"PO-Revision-Date: 2017-09-28 17:57+0200\n" +"Last-Translator: Chusslove Illich \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" +"X-Wrapping: fine\n" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:93 +#, kde-format +msgid "KDiff3 ..." +msgstr "&Kdiff3-n;..." + +# >> %1 file path +#. +> trunk5 +#: kdiff3fileitemaction.cpp:125 +#, kde-format +msgid "Compare with %1" +msgstr "Упореди са %1" + +# >> %1 file path +#. +> trunk5 +#: kdiff3fileitemaction.cpp:131 +#, kde-format +msgid "Merge with %1" +msgstr "Стопи са %1" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:137 +#, kde-format +msgid "Save '%1' for later" +msgstr "Сачувај „%1“ за касније" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:143 +#, kde-format +msgid "3-way merge with base" +msgstr "Тространо стопи са базом" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:150 +#, kde-format +msgid "Compare with ..." +msgstr "Упореди са..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:162 +#, kde-format +msgid "Clear list" +msgstr "Очисти списак" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:170 +#, kde-format +msgid "Compare" +msgstr "Упореди" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:176 +#, kde-format +msgid "3 way comparison" +msgstr "Тространо упореди" + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:180 +#, kde-format +msgid "About KDiff3 menu plugin ..." +msgstr "О прикључку менија за &kdiff3-a;..." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:288 +#, kde-format +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Прикључак за радње над фајловима &kdiff3-g;: © 2011, &joachimeibl-n;\n" +"Домаћа страница &kdiff3-g;: http://kdiff3.sourceforge.net\n" +"\n" + +# >! Wtf: ...then the branch to merge... +#. +> trunk5 +#: kdiff3fileitemaction.cpp:290 +#, fuzzy, kde-format +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on {+the +}second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#| "Same also applies to directory comparison and merge." +msgid "" +"Using the contextmenu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Коришћење проширења контекстног менија:\n" +"За једноставно поређење, изаберите „~%/Compare/“.\n" +"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" +"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" +"Исто важи за поређење и стапање фасцикли." + +#. +> trunk5 +#: kdiff3fileitemaction.cpp:298 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "О прикључку за радње над фајловима &kdiff3-g;" Index: trunk/l10n-support/sr/summit/messages/kdereview/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/sr/summit/messages/kdereview/org.kde.kdiff3.appdata.po (nonexistent) +++ trunk/l10n-support/sr/summit/messages/kdereview/org.kde.kdiff3.appdata.po (revision 1522187) @@ -0,0 +1,30 @@ +msgid "" +msgstr "" +"Project-Id-Version: org.kde.kdiff3.appdata\n" +"POT-Creation-Date: 2018-02-15 08:55+0100\n" +"PO-Revision-Date: 2018-02-16 11:10+0100\n" +"Last-Translator: Simulacrum\n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" +"X-Wrapping: fine\n" + +#. (itstool) path: component/name +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:6 +#, untranslated +msgid "KDiff3" +msgstr "" + +#. (itstool) path: component/summary +#. +> trunk5 +#: org.kde.kdiff3.appdata.xml:7 +#, untranslated +msgid "A File And Directory Comparison And Merge Tool" +msgstr "" Index: trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,4319 +0,0 @@ -# Translation of kdiff3.po into Serbian. -# Slobodan Simic , 2009. -# Chusslove Illich , 2010, 2011, 2012, 2015, 2017. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-05-06 09:47+0200\n" -"PO-Revision-Date: 2017-09-28 17:57+0200\n" -"Last-Translator: Chusslove Illich \n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Generator: KBabel 1.11.4\n" -"X-Environment: kde\n" -"X-Wrapping: fine\n" - -#. +> trunk5 -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Слободан Симић,Часлав Илић" - -#. +> trunk5 -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" - -#. +> trunk5 -#: diff.cpp:259 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "Уписивање података из клипборда у привремени фајл није успело." - -#. +> trunk5 -#: diff.cpp:263 -#, kde-format -msgid "From Clipboard" -msgstr "Из клипборда" - -#. +> trunk5 -#: diff.cpp:556 -#, kde-format -msgid "Expecting space after closing apostroph." -msgstr "Очекиван размак после затвореног апострофа." - -#. +> trunk5 -#: diff.cpp:559 -#, kde-format -msgid "Not matching apostrophs." -msgstr "Апострофи се не поклапају." - -#. +> trunk5 -#: diff.cpp:581 -#, kde-format -msgid "Unexpected apostroph within argument." -msgstr "Неочекиван апостроф унутар аргумента." - -#. +> trunk5 -#: diff.cpp:588 -#, kde-format -msgid "No program specified." -msgstr "Наредба није задата." - -#. +> trunk5 -#: diff.cpp:712 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Изгледа да је предобрада пропала. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Наредба предобраде ће сада бити деактивирана." - -#. +> trunk5 -#: diff.cpp:761 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Изгледа да је предобрада поклапања редова пропала. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Предобрада поклапања редова сада ће бити деактивирана." - -# >! Merge whole string. -# >> @item:intext -#. +> trunk5 -#: difftextwindow.cpp:411 directorymergewindow.cpp:3353 -#, kde-format -msgid "File" -msgstr "фајл" - -# >> @item:intext -#. +> trunk5 -#: difftextwindow.cpp:413 -#, kde-format -msgid "Line" -msgstr "ред" - -#. +> trunk5 -#: difftextwindow.cpp:415 -#, kde-format -msgid "Line not available" -msgstr "ред недоступан" - -#. +> trunk5 -#: difftextwindow.cpp:1911 difftextwindow.cpp:1943 -#, kde-format -msgid "Encoding:" -msgstr "Кодирање:" - -#. +> trunk5 -#: difftextwindow.cpp:1913 difftextwindow.cpp:1944 mergeresultwindow.cpp:3372 -#: optiondialog.cpp:920 -#, kde-format -msgid "Line end style:" -msgstr "Стил краја редова:" - -#. +> trunk5 -#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3417 -#, kde-format -msgid "Unix" -msgstr "&unix-n;" - -#. +> trunk5 -#: difftextwindow.cpp:1944 mergeresultwindow.cpp:3418 -#, kde-format -msgid "DOS" -msgstr "&dosos-n;" - -# >! Merge whole string. -#. +> trunk5 -#: difftextwindow.cpp:1966 kdiff3.cpp:869 -#, kde-format -msgid "Top line" -msgstr "Први ред" - -#. +> trunk5 -#: difftextwindow.cpp:1976 -#, kde-format -msgid "End" -msgstr "Крај" - -#. +> trunk5 -#: difftextwindow.cpp:2051 smalldialogs.cpp:234 -#, fuzzy, kde-format -#| msgid "Opening files..." -msgid "Open File" -msgstr "Отварам фајлове..." - -#. +> trunk5 -#: difftextwindow.cpp:2099 optiondialog.cpp:508 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "&unicode-n;, 8-битни" - -#. +> trunk5 -#: difftextwindow.cpp:2114 -#, kde-format -msgid "Other" -msgstr "" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:523 directorymergewindow.cpp:667 -#, kde-format -msgid "Unsolved" -msgstr "нерешено" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:525 directorymergewindow.cpp:669 -#, kde-format -msgid "Solved" -msgstr "решено" - -# >> non-whitespace -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:527 directorymergewindow.cpp:671 -#, kde-format -msgid "Nonwhite" -msgstr "непразно" - -# >> whitespace -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:529 directorymergewindow.cpp:673 -#, kde-format -msgid "White" -msgstr "празно" - -#. +> trunk5 -#: directorymergewindow.cpp:542 directorymergewindow.cpp:3666 -#, kde-format -msgid "Copy A to B" -msgstr "Копирај А у Б" - -#. +> trunk5 -#: directorymergewindow.cpp:545 directorymergewindow.cpp:3667 -#, kde-format -msgid "Copy B to A" -msgstr "Копирај Б у А" - -#. +> trunk5 -#: directorymergewindow.cpp:548 directorymergewindow.cpp:3668 -#, kde-format -msgid "Delete A" -msgstr "Обриши А" - -#. +> trunk5 -#: directorymergewindow.cpp:551 directorymergewindow.cpp:3669 -#, kde-format -msgid "Delete B" -msgstr "Обриши Б" - -#. +> trunk5 -#: directorymergewindow.cpp:554 -#, kde-format -msgid "Delete A & B" -msgstr "Обриши А и Б" - -#. +> trunk5 -#: directorymergewindow.cpp:557 directorymergewindow.cpp:3671 -#, kde-format -msgid "Merge to A" -msgstr "Стопи у А" - -#. +> trunk5 -#: directorymergewindow.cpp:560 directorymergewindow.cpp:3672 -#, kde-format -msgid "Merge to B" -msgstr "Стопи у Б" - -#. +> trunk5 -#: directorymergewindow.cpp:563 -#, kde-format -msgid "Merge to A & B" -msgstr "Стопи у А и Б" - -#. +> trunk5 -#: directorymergewindow.cpp:575 directorymergewindow.cpp:3663 -#, kde-format -msgid "Delete (if exists)" -msgstr "Обриши (ако постоји)" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#: directorymergewindow.cpp:3662 optiondialog.cpp:1020 smalldialogs.cpp:112 -#, kde-format -msgid "Merge" -msgstr "Стопи" - -#. +> trunk5 -#: directorymergewindow.cpp:578 directorymergewindow.cpp:581 -#, kde-format -msgid "Merge (manual)" -msgstr "Стопи (ручно)" - -#. +> trunk5 -#: directorymergewindow.cpp:584 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "Грешка: сукобљени типови фајлова." - -#. +> trunk5 -#: directorymergewindow.cpp:587 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "Грешка: измењено и обрисано." - -#. +> trunk5 -#: directorymergewindow.cpp:590 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "Грешка: датуми су једнаки али фајлови нису." - -#. +> trunk5 -#: directorymergewindow.cpp:604 -#, fuzzy, kde-format -#| msgid "Done." -msgid "Done" -msgstr "Готово." - -#. +> trunk5 -#: directorymergewindow.cpp:606 directorymergewindow.cpp:2560 -#: directorymergewindow.cpp:2638 directorymergewindow.cpp:2683 -#: directorymergewindow.cpp:2743 directorymergewindow.cpp:3001 -#, kde-format -msgid "Error" -msgstr "Грешка" - -#. +> trunk5 -#: directorymergewindow.cpp:608 -#, kde-format -msgid "Skipped." -msgstr "Прескочено." - -#. +> trunk5 -#: directorymergewindow.cpp:610 -#, kde-format -msgid "Not saved." -msgstr "Није сачувано." - -#. +> trunk5 -#: directorymergewindow.cpp:612 -#, kde-format -msgid "In progress..." -msgstr "У току..." - -#. +> trunk5 -#: directorymergewindow.cpp:614 -#, kde-format -msgid "To do." -msgstr "Урадити." - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:655 -#, kde-format -msgid "Name" -msgstr "име" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:663 -#, kde-format -msgid "Operation" -msgstr "поступак" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:665 -#, kde-format -msgid "Status" -msgstr "стање" - -#. +> trunk5 -#: directorymergewindow.cpp:801 -#, kde-format -msgid "Mix of links and normal files." -msgstr "Мешавина веза и нормалних фајлова." - -#. +> trunk5 -#: directorymergewindow.cpp:808 -#, kde-format -msgid "Link: " -msgstr "Веза: " - -#. +> trunk5 -#: directorymergewindow.cpp:816 -#, kde-format -msgid "Size. " -msgstr "Величина: " - -#. +> trunk5 -#: directorymergewindow.cpp:829 directorymergewindow.cpp:839 -#, kde-format -msgid "Date & Size: " -msgstr "Датум и величина: " - -#. +> trunk5 -#: directorymergewindow.cpp:849 directorymergewindow.cpp:855 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "Прављење привремене копије фајла %1 није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:866 directorymergewindow.cpp:874 -#, kde-format -msgid "Opening %1 failed." -msgstr "Отварање фајла %1 није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:878 -#, kde-format -msgid "Comparing file..." -msgstr "Упоређујем фајл..." - -#. +> trunk5 -#: directorymergewindow.cpp:890 directorymergewindow.cpp:896 -#, kde-format -msgid "Error reading from %1" -msgstr "Грешка при читању из %1" - -#. +> trunk5 -#: directorymergewindow.cpp:931 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново скенирате фасциклу?" - -#. +> trunk5 -#: directorymergewindow.cpp:932 kdiff3.cpp:693 kdiff3.cpp:703 kdiff3.cpp:715 -#: mergeresultwindow.cpp:342 pdiff.cpp:1034 pdiff.cpp:1925 pdiff.cpp:1935 -#, kde-format -msgid "Warning" -msgstr "Упозорење" - -#. +> trunk5 -#: directorymergewindow.cpp:933 directorymergewindow.cpp:3635 -#, kde-format -msgid "Rescan" -msgstr "Поново скенирај" - -#. +> trunk5 -#: directorymergewindow.cpp:934 pdiff.cpp:1036 -#, kde-format -msgid "Continue Merging" -msgstr "Настави стапање" - -#. +> trunk5 -#: directorymergewindow.cpp:1098 -#, kde-format -msgid "Opening of directories failed:" -msgstr "Отварање фасцикли није успело:" - -#. +> trunk5 -#: directorymergewindow.cpp:1102 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Фасцикла А „%1“ не постоји или није фасцикла.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1107 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Фасцикла Б „%1“ не постоји или није фасцикла.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1112 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Фасцикла Ц „%1“ не постоји или није фасцикла.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:1115 -#, kde-format -msgid "Directory Open Error" -msgstr "Грешка при отварању фасцикле" - -#. +> trunk5 -#: directorymergewindow.cpp:1123 -#, kde-format -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"Одредишна фасцикла не сме бити иста као А или Б када се стапају три фасцикле.\n" -"Проверите поново пре него што наставите." - -#. +> trunk5 -#: directorymergewindow.cpp:1125 -#, kde-format -msgid "Parameter Warning" -msgstr "Упозорење о параметрима" - -#. +> trunk5 -#: directorymergewindow.cpp:1130 -#, kde-format -msgid "Scanning directories..." -msgstr "Скенирам фасцикле..." - -#. +> trunk5 -#: directorymergewindow.cpp:1167 -#, kde-format -msgid "Reading Directory A" -msgstr "Читам фасциклу А" - -#. +> trunk5 -#: directorymergewindow.cpp:1187 -#, kde-format -msgid "Reading Directory B" -msgstr "Читам фасциклу Б" - -#. +> trunk5 -#: directorymergewindow.cpp:1209 -#, kde-format -msgid "Reading Directory C" -msgstr "Читам фасциклу Ц" - -# >! Merge sentence. -#. +> trunk5 -#: directorymergewindow.cpp:1233 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "Неке потфасцикле нису биле читљиве у" - -#. +> trunk5 -#: directorymergewindow.cpp:1238 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "Проверите дозволе потфасцикли." - -#. +> trunk5 -#: directorymergewindow.cpp:1277 kdiff3.cpp:661 kdiff3.cpp:748 kdiff3.cpp:772 -#: kdiff3.cpp:1061 kdiff3.cpp:1082 pdiff.cpp:1115 pdiff.cpp:1187 -#: pdiff.cpp:1232 pdiff.cpp:1248 pdiff.cpp:1291 pdiff.cpp:1313 -#, kde-format -msgid "Ready." -msgstr "Спреман." - -#. +> trunk5 -#: directorymergewindow.cpp:1292 -#, kde-format -msgid "Directory Comparison Status" -msgstr "Стање поређења фасцикли" - -#. +> trunk5 -#: directorymergewindow.cpp:1293 -#, kde-format -msgid "Number of subdirectories:" -msgstr "Број потфасцикли:" - -#. +> trunk5 -#: directorymergewindow.cpp:1294 -#, kde-format -msgid "Number of equal files:" -msgstr "Број једнаких фајлова:" - -#. +> trunk5 -#: directorymergewindow.cpp:1295 -#, kde-format -msgid "Number of different files:" -msgstr "Број различитих фајлова:" - -#. +> trunk5 -#: directorymergewindow.cpp:1298 -#, kde-format -msgid "Number of manual merges:" -msgstr "Број ручних стапања:" - -#. +> trunk5 -#: directorymergewindow.cpp:1490 -#, kde-format -msgid "This affects all merge operations." -msgstr "Ово утиче на све поступке стапања." - -# >> @title:window -#. +> trunk5 -#: directorymergewindow.cpp:1491 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "Мењање свих поступака стапања" - -# >! Merge sentence. -#. +> trunk5 -#: directorymergewindow.cpp:1887 -#, kde-format -msgid "Processing " -msgstr "Обрађујем " - -#. +> trunk5 -#: directorymergewindow.cpp:2463 directorymergewindow.cpp:2488 -#: directorymergewindow.cpp:2512 -#, kde-format -msgid "This operation is currently not possible." -msgstr "Овај поступак тренутно није могућ." - -#. +> trunk5 -#: directorymergewindow.cpp:2463 directorymergewindow.cpp:2488 -#: directorymergewindow.cpp:2512 directorymergewindow.cpp:2794 -#, kde-format -msgid "Operation Not Possible" -msgstr "Поступак није могућ" - -#. +> trunk5 -#: directorymergewindow.cpp:2560 -#, kde-format -msgid "An error occurred while copying.\n" -msgstr "Грешка у току копирања.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:2561 directorymergewindow.cpp:3002 -#, kde-format -msgid "Merge Error" -msgstr "Грешка стапања" - -#. +> trunk5 -#: directorymergewindow.cpp:2638 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "Непознат поступак стапања. (Ово никада не сме да се догоди!)" - -#. +> trunk5 -#: directorymergewindow.cpp:2683 -#, kde-format -msgid "Unknown merge operation." -msgstr "Непозната поступак стапања." - -#. +> trunk5 -#: directorymergewindow.cpp:2696 -#, kde-format -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" -"Изаберите „~%/Do It/“ ако сте прочитали инструкције и знате шта радите.\n" -"Изаберите „~%/Simulate It/“ ако бисте прво да видите шта би се догодило.\n" -"\n" -"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!" - -# >> @title:window -#. +> trunk5 -#: directorymergewindow.cpp:2701 -#, kde-format -msgid "Starting Merge" -msgstr "Почетак стапања" - -#. +> trunk5 -#: directorymergewindow.cpp:2702 -#, kde-format -msgid "Do It" -msgstr "Уради" - -#. +> trunk5 -#: directorymergewindow.cpp:2703 -#, kde-format -msgid "Simulate It" -msgstr "Симулирај" - -#. +> trunk5 -#: directorymergewindow.cpp:2729 -#, kde-format -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта урадити." - -#. +> trunk5 -#: directorymergewindow.cpp:2733 -#, kde-format -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити." - -#. +> trunk5 -#: directorymergewindow.cpp:2737 -#, kde-format -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "Истакнута ставка је измењена у једној фасцикли а обрисана у другој. Изаберите шта урадити." - -#. +> trunk5 -#: directorymergewindow.cpp:2794 -#, kde-format -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "Овај поступак тренутно није могућ зато што је у току стапање фасцикли." - -#. +> trunk5 -#: directorymergewindow.cpp:2852 -#, kde-format -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" -"Желите ли да наставите са ставком која је изазвала грешку или да је прескочите?" - -# >> @title:window -#. +> trunk5 -#: directorymergewindow.cpp:2854 -#, kde-format -msgid "Continue merge after an error" -msgstr "Настављање стапања после грешке" - -#. +> trunk5 -#: directorymergewindow.cpp:2855 -#, kde-format -msgid "Continue With Last Item" -msgstr "Настави са последњом ставком" - -#. +> trunk5 -#: directorymergewindow.cpp:2856 -#, kde-format -msgid "Skip Item" -msgstr "Прескочи ставку" - -#. +> trunk5 -#: directorymergewindow.cpp:2952 -#, kde-format -msgid "Merge operation complete." -msgstr "Поступак стапања је завршен." - -#. +> trunk5 -#: directorymergewindow.cpp:2952 directorymergewindow.cpp:2955 -#, kde-format -msgid "Merge Complete" -msgstr "Стапање завршено" - -#. +> trunk5 -#: directorymergewindow.cpp:2965 -#, kde-format -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "Симулирано стапање је завршено: проверите да ли вам одговарају предложени поступци." - -#. +> trunk5 -#: directorymergewindow.cpp:3001 -#, kde-format -msgid "An error occurred. Press OK to see detailed information.\n" -msgstr "Дошло је до грешке. Кликните на „~%/OK/“ да добијете детаљне информације.\n" - -#. +> trunk5 -#: directorymergewindow.cpp:3034 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "Грешка: у току брисања %1, прављење резерве није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:3041 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "рекурзивно брисање фасцикле (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3043 -#, kde-format -msgid "delete( %1 )" -msgstr "брисање (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3058 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Грешка: поступак брисања фасцикле није успео на месту читања фасцикле." - -#. +> trunk5 -#: directorymergewindow.cpp:3077 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "Грешка: поступак уклањања фасцикле (%1) није успео." - -#. +> trunk5 -#: directorymergewindow.cpp:3087 -#, kde-format -msgid "Error: delete operation failed." -msgstr "Грешка: поступак брисања није успео." - -#. +> trunk5 -#: directorymergewindow.cpp:3113 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "ручно стапање (%1, %2, %3 → %4)" - -#. +> trunk5 -#: directorymergewindow.cpp:3116 -#, kde-format -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr " Напомена: после ручног стапања корисник треба да настави притиском на &f7-a;." - -#. +> trunk5 -#: directorymergewindow.cpp:3141 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:3150 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "копирање везе (%1 → %2 )" - -#. +> trunk5 -#: directorymergewindow.cpp:3161 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "Грешка: копирање везе није успело, удаљене везе још нису подржане." - -#. +> trunk5 -#: directorymergewindow.cpp:3167 -#, kde-format -msgid "Error: copyLink failed." -msgstr "Грешка: копирање везе није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:3192 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "копирање (%1 → %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3218 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се обрише." - -#. +> trunk5 -#: directorymergewindow.cpp:3225 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "преименовање (%1 → %2)" - -#. +> trunk5 -#: directorymergewindow.cpp:3234 -#, kde-format -msgid "Error: Rename failed." -msgstr "Грешка: преименовање није успело." - -#. +> trunk5 -#: directorymergewindow.cpp:3252 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише." - -#. +> trunk5 -#: directorymergewindow.cpp:3269 -#, kde-format -msgid "makeDir( %1 )" -msgstr "прављење фасцикле (%1)" - -#. +> trunk5 -#: directorymergewindow.cpp:3279 -#, kde-format -msgid "Error while creating directory." -msgstr "Грешка у току прављења фасцикле." - -#. +> trunk5 -#: directorymergewindow.cpp:3315 directorymergewindow.cpp:3441 -#, kde-format -msgid "Dest" -msgstr "Одредиште" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3323 directorymergewindow.cpp:3353 -#, kde-format -msgid "Dir" -msgstr "фасцикла" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3323 -#, kde-format -msgid "Type" -msgstr "тип" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3323 -#, kde-format -msgid "Size" -msgstr "величина" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Attr" -msgstr "атрибути" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Last Modification" -msgstr "последња измена" - -# >> @title:column -#. +> trunk5 -#: directorymergewindow.cpp:3324 -#, kde-format -msgid "Link-Destination" -msgstr "одредиште везе" - -#. +> trunk5 -#: directorymergewindow.cpp:3367 -#, kde-format -msgid "not available" -msgstr "недоступно" - -#. +> trunk5 -#: directorymergewindow.cpp:3385 -#, kde-format -msgid "A (Dest): " -msgstr "А (одредиште): " - -#. +> trunk5 -#: directorymergewindow.cpp:3389 -#, kde-format -msgid "A (Base): " -msgstr "А (база): " - -#. +> trunk5 -#: directorymergewindow.cpp:3395 -#, kde-format -msgid "B (Dest): " -msgstr "Б (одредиште): " - -#. +> trunk5 -#: directorymergewindow.cpp:3404 -#, kde-format -msgid "C (Dest): " -msgstr "Ц (одредиште): " - -#. +> trunk5 -#: directorymergewindow.cpp:3411 -#, kde-format -msgid "Dest: " -msgstr "Одредиште: " - -# >> @title:window -#. i18n("Saving Directory Merge State ...")); -#. QString s = KFileDialog::getSaveUrl( QDir::currentPath(), 0, this, i18n("Save As...") ).url(); -#. +> trunk5 -#: directorymergewindow.cpp:3493 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "Уписивање стања стапања фасцикли као..." - -#. +> trunk5 -#: directorymergewindow.cpp:3629 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "Покрени/настави стапање фасцикли" - -#. +> trunk5 -#: directorymergewindow.cpp:3630 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "Изврши поступак за текућу ставку" - -#. +> trunk5 -#: directorymergewindow.cpp:3631 -#, kde-format -msgid "Compare Selected File" -msgstr "Упореди изабрани фајл" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "Merge Current File" -msgstr "Стопи текући фајл" - -#. +> trunk5 -#: directorymergewindow.cpp:3632 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" -"Стопи\n" -"фајл" - -#. +> trunk5 -#: directorymergewindow.cpp:3633 -#, kde-format -msgid "Fold All Subdirs" -msgstr "Сажми све потфасцикле" - -#. +> trunk5 -#: directorymergewindow.cpp:3634 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "Рашири све потфасцикле" - -#. i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); -#. +> trunk5 -#: directorymergewindow.cpp:3638 -#, kde-format -msgid "Choose A for All Items" -msgstr "Изабери А за све ставке" - -#. +> trunk5 -#: directorymergewindow.cpp:3639 -#, kde-format -msgid "Choose B for All Items" -msgstr "Изабери Б за све ставке" - -#. +> trunk5 -#: directorymergewindow.cpp:3640 -#, kde-format -msgid "Choose C for All Items" -msgstr "Изабери Ц за све ставке" - -#. +> trunk5 -#: directorymergewindow.cpp:3641 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "Аутоматски изабери поступак за све ставке" - -#. +> trunk5 -#: directorymergewindow.cpp:3642 -#, kde-format -msgid "No Operation for All Items" -msgstr "Нема поступка за све ставке" - -#. i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); -#. +> trunk5 -#: directorymergewindow.cpp:3647 -#, kde-format -msgid "Show Identical Files" -msgstr "Прикажи истоветне фајлове" - -#. +> trunk5 -#: directorymergewindow.cpp:3647 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" -"Истоветни\n" -"фајлови" - -#. +> trunk5 -#: directorymergewindow.cpp:3648 -#, kde-format -msgid "Show Different Files" -msgstr "Прикажи различите фајлове" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "Show Files only in A" -msgstr "Прикажи фајлове само у А" - -#. +> trunk5 -#: directorymergewindow.cpp:3649 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" -"Фајлови\n" -"само у А" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "Show Files only in B" -msgstr "Прикажи фајлове само у Б" - -#. +> trunk5 -#: directorymergewindow.cpp:3650 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" -"Фајлови\n" -"само у Б" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "Show Files only in C" -msgstr "Прикажи фајлове само у Ц" - -#. +> trunk5 -#: directorymergewindow.cpp:3651 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" -"Фајлови\n" -"само у Ц" - -#. +> trunk5 -#: directorymergewindow.cpp:3655 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "Упореди изричито изабране фајлове" - -#. +> trunk5 -#: directorymergewindow.cpp:3656 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "Стопи изричито изабране фајлове" - -#. +> trunk5 -#: directorymergewindow.cpp:3658 directorymergewindow.cpp:3665 -#, kde-format -msgid "Do Nothing" -msgstr "Не ради ништа" - -#. +> trunk5 -#: directorymergewindow.cpp:3659 -#, kde-format -msgid "A" -msgstr "А" - -#. +> trunk5 -#: directorymergewindow.cpp:3660 -#, kde-format -msgid "B" -msgstr "Б" - -#. +> trunk5 -#: directorymergewindow.cpp:3661 -#, kde-format -msgid "C" -msgstr "Ц" - -#. +> trunk5 -#: directorymergewindow.cpp:3670 -#, kde-format -msgid "Delete A && B" -msgstr "Обриши А и Б" - -#. +> trunk5 -#: directorymergewindow.cpp:3673 -#, kde-format -msgid "Merge to A && B" -msgstr "Стопи у А и Б" - -#. +> trunk5 -#: fileaccess.cpp:949 -#, kde-format -msgid "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " -msgstr "" -"При покушају прављења резерве, брисање старије резерве није успело.\n" -"Име фајла: " - -#. +> trunk5 -#: fileaccess.cpp:956 -#, kde-format -msgid "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " -msgstr "" -"При покушају прављења резерве, преименовање није успело.\n" -"Имена фајлова: " - -#. +> trunk5 -#: fileaccess.cpp:980 -#, kde-format -msgid "Getting file status: %1" -msgstr "Добављам стање фајла: %1" - -#. +> trunk5 -#: fileaccess.cpp:1022 -#, kde-format -msgid "Reading file: %1" -msgstr "Читам фајл: %1" - -#. +> trunk5 -#: fileaccess.cpp:1060 -#, kde-format -msgid "Writing file: %1" -msgstr "Пишем фајл: %1" - -#. +> trunk5 -#: fileaccess.cpp:1088 -#, kde-format -msgid "Out of memory" -msgstr "Нема више меморије" - -#. +> trunk5 -#: fileaccess.cpp:1123 -#, kde-format -msgid "Making directory: %1" -msgstr "Правим фасциклу: %1" - -#. +> trunk5 -#: fileaccess.cpp:1143 -#, kde-format -msgid "Removing directory: %1" -msgstr "Уклањам фасциклу: %1" - -#. +> trunk5 -#: fileaccess.cpp:1158 -#, kde-format -msgid "Removing file: %1" -msgstr "Уклањам фајл: %1" - -#. +> trunk5 -#: fileaccess.cpp:1174 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "Правим симболичку везу: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1202 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "Преименујем фајл: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1234 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "Копирам фајл: %1 → %2" - -#. +> trunk5 -#: fileaccess.cpp:1248 -#, kde-format -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "Грешка током поступка копирања фајлова: отварање фајла ради читања није успело. Име фајла: %1" - -#. +> trunk5 -#: fileaccess.cpp:1254 -#, kde-format -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "Грешка током поступка копирања фајлова: отварање фајла ради писања није успело. Име фајла: %1" - -#. +> trunk5 -#: fileaccess.cpp:1266 -#, kde-format -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Грешка током поступка копирања фајлова: читање није успело. Име фајла: %1" - -#. +> trunk5 -#: fileaccess.cpp:1275 -#, kde-format -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Грешка током поступка копирања фајлова: писање није успело. Име фајла: %1" - -#. +> trunk5 -#: fileaccess.cpp:1558 -#, kde-format -msgid "Reading directory: " -msgstr "Читам фасциклу: " - -#. +> trunk5 -#: fileaccess.cpp:1679 -#, kde-format -msgid "Listing directory: %1" -msgstr "Листам фасциклу: %1" - -#. +> trunk5 -#: kdiff3.cpp:177 -#, kde-format -msgid "Current Configuration:" -msgstr "Тренутна постава:" - -#. +> trunk5 -#: kdiff3.cpp:182 -#, kde-format -msgid "Config Option Error:" -msgstr "Грешка поставне опције:" - -#. i18n("Option --auto used, but no output file specified.")); -#. +> trunk5 -#: kdiff3.cpp:228 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "Опција --auto је употребљена, али није наведен излазни фајл." - -#. +> trunk5 -#: kdiff3.cpp:404 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "Опција --auto се игнорише за поређење фасцикли." - -#. +> trunk5 -#: kdiff3.cpp:451 -#, kde-format -msgid "Saving failed." -msgstr "Уписивање није успело." - -#. +> trunk5 -#: kdiff3.cpp:486 pdiff.cpp:1097 pdiff.cpp:1168 -#, kde-format -msgid "Opening of these files failed:" -msgstr "Отварање ових фајлова није успело:" - -#. +> trunk5 -#: kdiff3.cpp:495 -#, kde-format -msgid "File Open Error" -msgstr "Грешка при отварању фајла" - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:523 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "Отвара документе за поређење." - -#. +> trunk5 -#: kdiff3.cpp:525 -#, kde-format -msgid "Reload" -msgstr "Учитај поново" - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:528 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Уписује резултат стапања. Сви сукоби морају бити разрешени." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:530 -#, kde-format -msgid "Saves the current document as..." -msgstr "Уписује текуће документе под именом." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:533 -#, kde-format -msgid "Print the differences" -msgstr "Штампа разлике." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:536 -#, kde-format -msgid "Quits the application" -msgstr "Напушта програм." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:538 -#, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "Исеца изабрани одељак и ставља га у клипборд." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:540 -#, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Копира изабрани одељак у клипборд." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:542 -#, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Налепљује садржај клипборда на тренутном положају." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:544 -#, kde-format -msgid "Select everything in current window" -msgstr "Изабира све у текућем прозору." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:546 -#, kde-format -msgid "Search for a string" -msgstr "Тражи ниску." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:548 -#, kde-format -msgid "Search again for the string" -msgstr "Поново тражи ниску." - -# >> @info:tooltip -#. +> trunk5 -#: kdiff3.cpp:553 -#, kde-format -msgid "Enables/disables the statusbar" -msgstr "Укључује/искључује траку стања." - -#. +> trunk5 -#: kdiff3.cpp:557 -#, kde-format -msgid "Configure KDiff3..." -msgstr "Подеси &kdiff3-a;..." - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "Go to Current Delta" -msgstr "Иди на текућу делту" - -#. +> trunk5 -#: kdiff3.cpp:577 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" -"Текућа\n" -"делта" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "Go to First Delta" -msgstr "Иди на прву делту" - -#. +> trunk5 -#: kdiff3.cpp:579 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" -"Прва\n" -"делта" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "Go to Last Delta" -msgstr "Иди на последњу делту" - -#. +> trunk5 -#: kdiff3.cpp:581 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" -"Последња\n" -"делта" - -#. +> trunk5 -#: kdiff3.cpp:583 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "(Прескаче разлике у празнинама ако је „~%/Show White Space/“ искључено.)" - -#. +> trunk5 -#: kdiff3.cpp:584 -#, kde-format -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "(Не прескаче разлике празнинама ни када је „~%/Show White Space/“ искључено.)" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "Go to Previous Delta" -msgstr "Иди на претходну делту" - -#. +> trunk5 -#: kdiff3.cpp:585 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Претходна\n" -"делта" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "Go to Next Delta" -msgstr "Иди на следећу делту" - -#. +> trunk5 -#: kdiff3.cpp:587 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" -"Следећа\n" -"делта" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "Иди на претходни сукоб" - -#. +> trunk5 -#: kdiff3.cpp:589 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Претходни\n" -"сукоб" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "Go to Next Conflict" -msgstr "Иди на следећи сукоб" - -#. +> trunk5 -#: kdiff3.cpp:591 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Следећи\n" -"сукоб" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "Иди на претходни нерешени сукоб" - -#. +> trunk5 -#: kdiff3.cpp:593 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Претходни\n" -"нерешени" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "Иди на следећи нерешени сукоб" - -#. +> trunk5 -#: kdiff3.cpp:595 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Следећи\n" -"нерешени" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "Select Line(s) From A" -msgstr "Изаберите редове из А" - -#. +> trunk5 -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" -"Изаберите\n" -"А" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "Select Line(s) From B" -msgstr "Изаберите редове из Б" - -#. +> trunk5 -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" -"Изаберите\n" -"Б" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "Select Line(s) From C" -msgstr "Изаберите редове из Ц" - -#. +> trunk5 -#: kdiff3.cpp:599 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" -"Изаберите\n" -"Ц" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора" - -#. +> trunk5 -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" -"Аутоматски\n" -"следећи" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" -msgid "Show Space && Tabulator Characters" -msgstr "Прикажи знакове размака и табулатора за разлике" - -#. +> trunk5 -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" -"Знакови\n" -"празнина" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "Show White Space" -msgstr "Прикажи празнине" - -#. +> trunk5 -#: kdiff3.cpp:603 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" -"Делте\n" -"празнина" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "Show Line Numbers" -msgstr "Прикажи бројеве редова" - -#. +> trunk5 -#: kdiff3.cpp:605 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Бројеви\n" -"редова" - -#. +> trunk5 -#: kdiff3.cpp:606 -#, kde-format -msgid "Choose A Everywhere" -msgstr "Свуда изабери А" - -#. +> trunk5 -#: kdiff3.cpp:607 -#, kde-format -msgid "Choose B Everywhere" -msgstr "Свуда изабери Б" - -#. +> trunk5 -#: kdiff3.cpp:608 -#, kde-format -msgid "Choose C Everywhere" -msgstr "Свуда изабери Ц" - -#. +> trunk5 -#: kdiff3.cpp:609 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "Изабери А за све нерешене сукобе" - -#. +> trunk5 -#: kdiff3.cpp:610 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "Изабери Б за све нерешене сукобе" - -#. +> trunk5 -#: kdiff3.cpp:611 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "Изабери Ц за све нерешене сукобе" - -#. +> trunk5 -#: kdiff3.cpp:612 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Изабери А за све нерешене сукобе празнина" - -#. +> trunk5 -#: kdiff3.cpp:613 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Изабери Б за све нерешене сукобе празнина" - -#. +> trunk5 -#: kdiff3.cpp:614 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Изабери Ц за све нерешене сукобе празнина" - -#. +> trunk5 -#: kdiff3.cpp:615 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "Аутоматски реши једноставне сукобе" - -#. +> trunk5 -#: kdiff3.cpp:616 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "Постави делте на сукобе" - -#. +> trunk5 -#: kdiff3.cpp:617 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "Аутоматски стопи по регуларним изразима" - -#. +> trunk5 -#: kdiff3.cpp:618 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "Аутоматски реши сукобе историјата" - -#. +> trunk5 -#: kdiff3.cpp:619 -#, kde-format -msgid "Split Diff At Selection" -msgstr "Подели разлику на избору" - -#. +> trunk5 -#: kdiff3.cpp:620 -#, kde-format -msgid "Join Selected Diffs" -msgstr "Споји изабране разлике" - -#. +> trunk5 -#: kdiff3.cpp:622 -#, kde-format -msgid "Show Window A" -msgstr "Прикажи прозор А" - -#. +> trunk5 -#: kdiff3.cpp:623 -#, kde-format -msgid "Show Window B" -msgstr "Прикажи прозор Б" - -#. +> trunk5 -#: kdiff3.cpp:624 -#, kde-format -msgid "Show Window C" -msgstr "Прикажи прозор Ц" - -#. +> trunk5 -#: kdiff3.cpp:626 -#, kde-format -msgid "Normal Overview" -msgstr "Нормалан преглед" - -#. +> trunk5 -#: kdiff3.cpp:627 -#, kde-format -msgid "A vs. B Overview" -msgstr "Преглед А према Б" - -#. +> trunk5 -#: kdiff3.cpp:628 -#, kde-format -msgid "A vs. C Overview" -msgstr "Преглед А према Ц" - -#. +> trunk5 -#: kdiff3.cpp:629 -#, kde-format -msgid "B vs. C Overview" -msgstr "Преглед Б према Ц" - -#. +> trunk5 -#: kdiff3.cpp:630 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "Прелом речи у прозорима разлика" - -#. +> trunk5 -#: kdiff3.cpp:631 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "Додај ручно поравнање разлика" - -#. +> trunk5 -#: kdiff3.cpp:632 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "Очисти сва ручна поравнања разлика" - -#. +> trunk5 -#: kdiff3.cpp:634 -#, kde-format -msgid "Focus Next Window" -msgstr "Фокусирај следећи прозор" - -#. +> trunk5 -#: kdiff3.cpp:635 -#, kde-format -msgid "Focus Prev Window" -msgstr "Фокусирај претходни прозор" - -#. +> trunk5 -#: kdiff3.cpp:636 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "Пребаци оријентацију поделе" - -#. +> trunk5 -#: kdiff3.cpp:638 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "Подељени приказ екрана на фасциклу и текст" - -#. +> trunk5 -#: kdiff3.cpp:640 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "Пребаци приказ фасцикле и текста" - -#. +> trunk5 -#: kdiff3.cpp:692 pdiff.cpp:1924 -#, kde-format -msgid "The merge result hasn't been saved." -msgstr "Резултат стапања није сачуван." - -#. +> trunk5 -#: kdiff3.cpp:694 -#, kde-format -msgid "Save && Quit" -msgstr "Сачувај и напусти" - -#. +> trunk5 -#: kdiff3.cpp:695 -#, kde-format -msgid "Quit Without Saving" -msgstr "Напусти без уписивања" - -#. +> trunk5 -#: kdiff3.cpp:703 pdiff.cpp:1935 -#, kde-format -msgid "Saving the merge result failed." -msgstr "Уписивање резултата стапања није успело." - -#. +> trunk5 -#: kdiff3.cpp:714 pdiff.cpp:1033 -#, kde-format -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?" - -#. +> trunk5 -#: kdiff3.cpp:737 -#, kde-format -msgid "Saving file..." -msgstr "Уписујем фајл..." - -#. +> trunk5 -#: kdiff3.cpp:754 -#, kde-format -msgid "Saving file with a new filename..." -msgstr "Уписујем фајл под новим именом..." - -# >> @title:window -#. +> trunk5 -#: kdiff3.cpp:756 kreplacements/kreplacements.cpp:630 -#, kde-format -msgid "Save As..." -msgstr "Уписивање као" - -#. +> trunk5 -#: kdiff3.cpp:815 -#, kde-format -msgid "Printing not implemented." -msgstr "Штампање није изведено." - -#. +> trunk5 -#: kdiff3.cpp:853 -#, kde-format -msgid "Printing..." -msgstr "Штампам..." - -#. +> trunk5 -#: kdiff3.cpp:939 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#. +> trunk5 -#: kdiff3.cpp:996 -#, kde-format -msgid "Selection" -msgstr "Избор" - -#. +> trunk5 -#: kdiff3.cpp:1023 -#, kde-format -msgid "Printing completed." -msgstr "Штампање завршено." - -#. +> trunk5 -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing aborted." -msgstr "Штампање обустављено." - -#. +> trunk5 -#: kdiff3.cpp:1034 -#, kde-format -msgid "Exiting..." -msgstr "Напуштам..." - -#. +> trunk5 -#: kdiff3.cpp:1045 -#, kde-format -msgid "Toggling toolbar..." -msgstr "Пребацујем траку алатки..." - -#. +> trunk5 -#: kdiff3.cpp:1066 -#, kde-format -msgid "Toggle the statusbar..." -msgstr "Пребацујем траку стања..." - -#. +> trunk5 -#: kdiff3_part.cpp:46 -#, fuzzy, kde-format -#| msgid "KDiff3Part" -msgid "KDiff3 Part" -msgstr "&Kdiff3-n; део" - -#. +> trunk5 -#: kdiff3_part.cpp:47 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" - -#. +> trunk5 -#: kdiff3_part.cpp:50 -#, kde-format -msgid "Joachim Eibl" -msgstr "&joachimeibl-n;" - -#. +> trunk5 -#: kdiff3_part.cpp:173 kdiff3_part.cpp:249 -#, kde-format -msgid "Couldn't find files for comparison." -msgstr "Не могу да нађем фајлове за поређење." - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:4 -#, kde-format -msgid "&KDiff3" -msgstr "&&Kdiff3-n;" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_part.rc:13 -#, kde-format -msgid "Configure KDiff3" -msgstr "Подеси &kdiff3-a;" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_part.rc:16 -#, kde-format -msgid "KDiff3" -msgstr "&&Kdiff3-n;" - -#. +> trunk5 -#: kdiff3_shell.cpp:78 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"Не могу да припремим &kdiff3-a; део.\n" -"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља." - -#. i18n: ectx: Menu (file) -#. +> trunk5 -#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:304 -#, kde-format -msgid "&File" -msgstr "&Фајл" - -#. i18n: ectx: Menu (directory) -#. +> trunk5 -#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:306 -#, kde-format -msgid "&Directory" -msgstr "Ф&асцикла" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#. +> trunk5 -#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:504 -#: kreplacements/kreplacements.cpp:513 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "Поступак стапања текуће ставке" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#. +> trunk5 -#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:505 -#: kreplacements/kreplacements.cpp:514 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "Поступак синхронизовања текуће ставке" - -#. i18n: ectx: Menu (movement) -#. +> trunk5 -#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:309 -#, kde-format -msgid "&Movement" -msgstr "&Кретање" - -#. i18n: ectx: Menu (diff) -#. +> trunk5 -#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:310 -#, kde-format -msgid "D&iffview" -msgstr "Приказ &разлике" - -#. i18n: ectx: Menu (merge) -#. +> trunk5 -#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:311 -#, kde-format -msgid "&Merge" -msgstr "&Стапање" - -#. i18n: ectx: Menu (window) -#. +> trunk5 -#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:312 -#, kde-format -msgid "&Window" -msgstr "Про&зор" - -#. i18n: ectx: ToolBar (mainToolBar) -#. +> trunk5 -#: kdiff3_shell.rc:106 -#, kde-format -msgid "Main Toolbar" -msgstr "Главна трака" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:166 kreplacements/kreplacements.cpp:197 -#: kreplacements/kreplacements.h:107 -#, kde-format -msgid "Cancel" -msgstr "Одустани" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:185 kreplacements/kreplacements.cpp:349 -#, kde-format -msgid "Ok" -msgstr "У реду" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:189 kreplacements/kreplacements.cpp:731 -#, kde-format -msgid "Help" -msgstr "Помоћ" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:193 -#, kde-format -msgid "Defaults" -msgstr "Подразумевано" - -# >> @title:menu -#. +> trunk5 -#: kreplacements/kreplacements.cpp:305 -#, kde-format -msgid "&Edit" -msgstr "&Уређивање" - -# >> @title:menu -#. +> trunk5 -#: kreplacements/kreplacements.cpp:313 -#, kde-format -msgid "&Settings" -msgstr "&Подешавање" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:314 -#, kde-format -msgid "&Help" -msgstr "П&омоћ" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:363 -#, kde-format -msgid "&About" -msgstr "&О пројекту" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:379 -#, kde-format -msgid "A&uthor" -msgstr "&Аутор" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:393 -#, kde-format -msgid "&Thanks To" -msgstr "&Захвалнице" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:613 -#, kde-format -msgid "Open" -msgstr "Отвори" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:622 -#, kde-format -msgid "Save" -msgstr "Сачувај" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:639 -#, kde-format -msgid "Print..." -msgstr "Штампај..." - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:647 kreplacements/kreplacements.h:108 -#, kde-format -msgid "Quit" -msgstr "Напусти" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:655 -#, kde-format -msgid "Cut" -msgstr "Исеци" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:663 -#, kde-format -msgid "Copy" -msgstr "Копирај" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:671 -#, kde-format -msgid "Paste" -msgstr "Налепи" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:679 -#, kde-format -msgid "Select All" -msgstr "Изабери све" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:687 -#, kde-format -msgid "Show Toolbar" -msgstr "Прикажи траку алатки" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:695 -#, kde-format -msgid "Show &Status Bar" -msgstr "Прикажи траку &стања" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:703 -#, kde-format -msgid "&Configure %1..." -msgstr "" -"&Подеси %1..." -"|/|" -"&Подеси $[аку %1]..." - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:715 kreplacements/kreplacements.cpp:723 -#, kde-format -msgid "About" -msgstr "О програму" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:738 -#, kde-format -msgid "Find" -msgstr "Нађи" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:746 -#, kde-format -msgid "Find Next" -msgstr "Нађи следеће" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:1099 -#, kde-format -msgid "For more documentation, see the help-menu or the subdirectory doc." -msgstr "За више документације, погледајте мени помоћи или потфасциклу ~!|‘doc’|." - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:1102 -#, kde-format -msgid "KDiff3-Usage" -msgstr "Употреба &kdiff3-g;" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:1102 -#, kde-format -msgid "Ignore" -msgstr "Игнориши" - -#. +> trunk5 -#: kreplacements/kreplacements.cpp:1102 -#, kde-format -msgid "Exit" -msgstr "Напусти" - -#. +> trunk5 -#: kreplacements/kreplacements.h:106 -#, kde-format -msgid "Continue" -msgstr "Настави" - -#. +> trunk5 -#: main.cpp:78 main.cpp:82 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "Игнорисано (кориснички дефинисано)." - -#. +> trunk5 -#: main.cpp:129 -#, kde-format -msgid "kdiff3" -msgstr "&kdiff3-n;" - -#. +> trunk5 -#: main.cpp:135 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Алатка за поређење и стапање фајлова и фасцикли" - -#. +> trunk5 -#: main.cpp:136 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeve KF5/Qt5 port" -msgstr "" - -#. +> trunk5 -#: main.cpp:153 -#, kde-format -msgid "Merge the input." -msgstr "Стопи улаз." - -#. +> trunk5 -#: main.cpp:154 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "Изричит базни фајл. За сагласност са појединим алаткама." - -#. +> trunk5 -#: main.cpp:155 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Излазни фајл. Имплицира ~!/-m/. Нпр: ~!/-o novifajl.txt/" - -#. +> trunk5 -#: main.cpp:156 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "Излазни фајл, поново. За сагласност са појединим алаткама." - -#. +> trunk5 -#: main.cpp:157 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "Без &gui-g; ако су сви сукоби решиви аутоматски. Захтева ~!/-o fajl/." - -#. +> trunk5 -#: main.cpp:158 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" -msgid "Don't solve conflicts automatically." -msgstr "Не решавај сукобе аутоматски. За сагласност..." - -#. +> trunk5 -#: main.cpp:159 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "Замена видљивог имена за улазни фајл 1 (базни)." - -#. +> trunk5 -#: main.cpp:160 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "Замена видљивог имена за улазни фајл 2." - -#. +> trunk5 -#: main.cpp:161 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "Замена видљивог имена за улазни фајл 3." - -#. +> trunk5 -#: main.cpp:162 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз." - -#. +> trunk5 -#: main.cpp:163 -#, kde-format -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"|" - -#. +> trunk5 -#: main.cpp:164 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "Наброји поставке и тренутне вредности из поставе." - -#. +> trunk5 -#: main.cpp:165 -#, kde-format -msgid "Use a different config file." -msgstr "Употреби други поставни фајл." - -#. +> trunk5 -#: main.cpp:168 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "Фајл 1 за отварање (базни, ако није наведен преко --base)." - -#. +> trunk5 -#: main.cpp:169 -#, kde-format -msgid "file2 to open" -msgstr "Фајл 2 за отварање." - -#. +> trunk5 -#: main.cpp:170 -#, kde-format -msgid "file3 to open" -msgstr "Фајл 3 за отварање." - -#. +> trunk5 -#: mergeresultwindow.cpp:159 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Број преосталих нерешених сукоба: %1 (од чега %2 празнине)." - -#. +> trunk5 -#: mergeresultwindow.cpp:340 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Излаз је измењен.\n" -"Ако наставите измене ће бити изгубљене." - -#. +> trunk5 -#: mergeresultwindow.cpp:904 pdiff.cpp:776 -#, kde-format -msgid "All input files are binary equal." -msgstr "Сви улазни фајлови бинарно су једнаки." - -#. +> trunk5 -#: mergeresultwindow.cpp:906 -#, kde-format -msgid "All input files contain the same text." -msgstr "Сви улазни фајлови садрже исти текст." - -#. +> trunk5 -#: mergeresultwindow.cpp:910 mergeresultwindow.cpp:914 -#: mergeresultwindow.cpp:918 pdiff.cpp:782 pdiff.cpp:786 pdiff.cpp:790 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "Фајлови %1 и %2 бинарно су једнаки.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:912 mergeresultwindow.cpp:916 -#: mergeresultwindow.cpp:920 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "Фајлови %1 и %2 садрже исти текст.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:926 -#, kde-format -msgid "Total number of conflicts: " -msgstr "Укупан број сукоба: " - -#. +> trunk5 -#: mergeresultwindow.cpp:927 -#, kde-format -msgid "" -"\n" -"Nr of automatically solved conflicts: " -msgstr "" -"\n" -"Број аутоматски решених сукоба: " - -#. +> trunk5 -#: mergeresultwindow.cpp:928 -#, kde-format -msgid "" -"\n" -"Nr of unsolved conflicts: " -msgstr "" -"\n" -"Број нерешених сукоба: " - -#. +> trunk5 -#: mergeresultwindow.cpp:930 -#, kde-format -msgid "Conflicts" -msgstr "Сукоби" - -#. +> trunk5 -#: mergeresultwindow.cpp:1833 -#, kde-format -msgid "" -msgstr "<нема изворног реда>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1841 -#, kde-format -msgid "" -msgstr "<сукоб стапања (само празнине)>" - -#. +> trunk5 -#: mergeresultwindow.cpp:1843 mergeresultwindow.cpp:2702 -#, kde-format -msgid "" -msgstr "<сукоб стапања>" - -#. +> trunk5 -#: mergeresultwindow.cpp:2914 -#, kde-format -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" -msgstr "" -"Још нису решени сви сукоби.\n" -"Фајл није сачуван.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2916 mergeresultwindow.cpp:2925 -#, kde-format -msgid "Conflicts Left" -msgstr "Преостали сукоби" - -#. +> trunk5 -#: mergeresultwindow.cpp:2923 -#, kde-format -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" -msgstr "" -"Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" -"Фајл није сачуван.\n" - -#. +> trunk5 -#: mergeresultwindow.cpp:2937 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Прављење резерве није успело. Фајл није сачуван." - -#. +> trunk5 -#: mergeresultwindow.cpp:2937 mergeresultwindow.cpp:2985 -#, kde-format -msgid "File Save Error" -msgstr "Грешка уписивања фајла" - -#. +> trunk5 -#: mergeresultwindow.cpp:2985 -#, kde-format -msgid "Error while writing." -msgstr "Грешка при писању." - -#. +> trunk5 -#: mergeresultwindow.cpp:3345 -#, kde-format -msgid "Output" -msgstr "Излаз" - -#. +> trunk5 -#: mergeresultwindow.cpp:3357 mergeresultwindow.cpp:3548 -#, kde-format -msgid "[Modified]" -msgstr "[измењен]" - -#. +> trunk5 -#: mergeresultwindow.cpp:3364 -#, kde-format -msgid "Encoding for saving" -msgstr "Кодирање за уписивање" - -#. +> trunk5 -#: mergeresultwindow.cpp:3463 -#, kde-format -msgid "Conflict" -msgstr "Сукоб" - -# >! Merge sentence. -#. +> trunk5 -#: mergeresultwindow.cpp:3495 mergeresultwindow.cpp:3497 -#: mergeresultwindow.cpp:3499 -#, kde-format -msgid "Codec from" -msgstr "Кодирање из" - -#. +> trunk5 -#: optiondialog.cpp:228 -#, kde-format -msgid "Change Font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:244 optiondialog.cpp:254 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:509 -#, kde-format -msgid "Unicode" -msgstr "&unicode-n;" - -#. +> trunk5 -#: optiondialog.cpp:510 -#, kde-format -msgid "Latin1" -msgstr "&latin1-n;" - -#. +> trunk5 -#: optiondialog.cpp:529 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Измените ово ако су не-&ascii-; знакови погрешно приказани." - -# >> @title:window -#. +> trunk5 -#: optiondialog.cpp:614 -#, kde-format -msgid "Configure" -msgstr "Подешавање" - -#. +> trunk5 -#: optiondialog.cpp:691 -#, kde-format -msgid "Font" -msgstr "Фонт" - -#. +> trunk5 -#: optiondialog.cpp:693 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "Фонт уређивача и излаза разлике" - -#. +> trunk5 -#: optiondialog.cpp:711 -#, kde-format -msgid "Application font" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:715 -#, fuzzy, kde-format -#| msgid "File Save Error" -msgid "File view font" -msgstr "Грешка уписивања фајла" - -#. +> trunk5 -#: optiondialog.cpp:733 -#, kde-format -msgid "Color" -msgstr "Боја" - -#. +> trunk5 -#: optiondialog.cpp:734 -#, kde-format -msgid "Colors Settings" -msgstr "Поставке боја" - -#. +> trunk5 -#: optiondialog.cpp:751 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "Уређивач и прикази разлика:" - -#. +> trunk5 -#: optiondialog.cpp:759 -#, kde-format -msgid "Foreground color:" -msgstr "Боја текста:" - -#. +> trunk5 -#: optiondialog.cpp:766 -#, kde-format -msgid "Background color:" -msgstr "Боја позадине:" - -#. +> trunk5 -#: optiondialog.cpp:775 -#, kde-format -msgid "Diff background color:" -msgstr "Боја позадине разлика:" - -#. +> trunk5 -#: optiondialog.cpp:783 -#, kde-format -msgid "Color A:" -msgstr "Боја А:" - -#. +> trunk5 -#: optiondialog.cpp:791 -#, kde-format -msgid "Color B:" -msgstr "Боја Б:" - -#. +> trunk5 -#: optiondialog.cpp:799 -#, kde-format -msgid "Color C:" -msgstr "Боја Ц:" - -#. +> trunk5 -#: optiondialog.cpp:806 -#, kde-format -msgid "Conflict color:" -msgstr "Боја сукоба:" - -#. +> trunk5 -#: optiondialog.cpp:814 -#, kde-format -msgid "Current range background color:" -msgstr "Позадинска боја текућег опсега:" - -#. +> trunk5 -#: optiondialog.cpp:822 -#, kde-format -msgid "Current range diff background color:" -msgstr "Позадинска боја текућег опсега разлика:" - -#. +> trunk5 -#: optiondialog.cpp:829 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "Боја ручно поравнатих опсега разлика:" - -#. +> trunk5 -#: optiondialog.cpp:835 -#, kde-format -msgid "Directory Comparison View:" -msgstr "Приказ поређења фасцикли:" - -#. +> trunk5 -#: optiondialog.cpp:841 -#, kde-format -msgid "Newest file color:" -msgstr "Боја најновијег фајла:" - -#. +> trunk5 -#: optiondialog.cpp:845 -#, kde-format -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "Измена ове боје ступиће на снагу од првог наредног поређења фасцикли." - -#. +> trunk5 -#: optiondialog.cpp:850 -#, kde-format -msgid "Oldest file color:" -msgstr "Боја најстаријег фајла:" - -#. +> trunk5 -#: optiondialog.cpp:858 -#, kde-format -msgid "Middle age file color:" -msgstr "Боја фајла средње старости:" - -#. +> trunk5 -#: optiondialog.cpp:866 -#, kde-format -msgid "Color for missing files:" -msgstr "Боја за недостајуће фајлове:" - -#. +> trunk5 -#: optiondialog.cpp:879 -#, kde-format -msgid "Editor" -msgstr "Уређивач" - -#. +> trunk5 -#: optiondialog.cpp:880 -#, kde-format -msgid "Editor Behavior" -msgstr "Понашање уређивача" - -# skip-rule: t-tab -#. +> trunk5 -#: optiondialog.cpp:893 -#, kde-format -msgid "Tab inserts spaces" -msgstr "&Tab-n; умеће размаке" - -# rewrite-msgid: /generate/insert/ -#. +> trunk5 -#: optiondialog.cpp:896 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Укључено: притиском &tab-g; умеће се одговарајући број размака.\n" -"Искључено: умеће се знак табулатора." - -#. +> trunk5 -#: optiondialog.cpp:901 -#, kde-format -msgid "Tab size:" -msgstr "Величина табулатора:" - -#. +> trunk5 -#: optiondialog.cpp:907 -#, kde-format -msgid "Auto indentation" -msgstr "Аутоматско увлачење" - -#. +> trunk5 -#: optiondialog.cpp:910 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "Укључено: увлачење претходног реда узима се за нови ред.\n" - -#. +> trunk5 -#: optiondialog.cpp:913 -#, kde-format -msgid "Auto copy selection" -msgstr "Аутоматско копирање избора" - -#. +> trunk5 -#: optiondialog.cpp:916 -#, kde-format -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"Укључено: сваки избор се одмах уписује у клипборд.\n" -"Искључено: морате изричито копирати, нпр. помоћу ~!/&ctrl-n;+C/." - -#. +> trunk5 -#: optiondialog.cpp:930 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Поставља завршетке редова када се измењени фајл сачува.\n" -"&dosos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/." - -#. +> trunk5 -#: optiondialog.cpp:940 -#, kde-format -msgid "Diff" -msgstr "Разликовање" - -#. +> trunk5 -#: optiondialog.cpp:941 -#, kde-format -msgid "Diff Settings" -msgstr "Поставке разликовања" - -# >! Merge sentence. -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#. +> trunk5 -#: optiondialog.cpp:965 -#, kde-format -msgid "Treat as white space." -msgstr "Третирај као празнине." - -#. +> trunk5 -#: optiondialog.cpp:967 -#, kde-format -msgid "Ignore numbers" -msgstr "Игнориши бројеве" - -#. +> trunk5 -#: optiondialog.cpp:970 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Игнориши цифарске знакове у фази поклапања редова (слично игнорисању празнина).\n" -"Може бити корисно при поређењу фајлова са нумеричким подацима." - -#. +> trunk5 -#: optiondialog.cpp:974 -#, kde-format -msgid "Ignore C/C++ comments" -msgstr "Игнориши &clang-;/&cpp-; коментаре" - -#. +> trunk5 -#: optiondialog.cpp:976 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "Третирај &clang-;/&cpp-; коментаре као празнине." - -#. +> trunk5 -#: optiondialog.cpp:979 -#, kde-format -msgid "Ignore case" -msgstr "Игнориши величину слова" - -#. +> trunk5 -#: optiondialog.cpp:982 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’)." - -#. +> trunk5 -#: optiondialog.cpp:985 -#, kde-format -msgid "Preprocessor command:" -msgstr "Предобрадна наредба:" - -#. +> trunk5 -#: optiondialog.cpp:989 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "Кориснички дефинисана предобрада. Погледајте документацију за детаље." - -#. +> trunk5 -#: optiondialog.cpp:992 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "Предобрадна наредба за поклапање редова:" - -#. +> trunk5 -#: optiondialog.cpp:996 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Предобрада се користи само током поклапања редова.\n" -"Погледајте документацију за детаље." - -#. +> trunk5 -#: optiondialog.cpp:999 -#, kde-format -msgid "Try hard (slower)" -msgstr "Потруди се (спорије)" - -#. +> trunk5 -#: optiondialog.cpp:1002 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Укључује опцију --minimal за спољашње разликовање.\n" -"Анализа великих фајлова ће бити много спорија." - -#. +> trunk5 -#: optiondialog.cpp:1006 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "Поравнај Б и Ц за три улазна фајла" - -#. +> trunk5 -#: optiondialog.cpp:1009 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n" -"Није препоручљиво за стапање зато што га може учинити сложенијим.\n" -"Подразумевано је искључено." - -#. +> trunk5 -#: optiondialog.cpp:1021 -#, kde-format -msgid "Merge Settings" -msgstr "Поставке стапања" - -#. +> trunk5 -#: optiondialog.cpp:1035 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "Застој аутоматског напредовања (~!/ms/):" - -#. +> trunk5 -#: optiondialog.cpp:1040 -#, kde-format -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 "" -"У режиму аутоматског напредовања резултат текућег избора приказује се \n" -"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/." - -#. +> trunk5 -#: optiondialog.cpp:1044 -#, kde-format -msgid "Show info dialogs" -msgstr "Приказуј информативне дијалоге" - -#. +> trunk5 -#: optiondialog.cpp:1046 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "Приказује дијалог са информацијом о броју сукоба." - -#. +> trunk5 -#: optiondialog.cpp:1049 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "Подразумевано стапање празнина два фајла:" - -#. +> trunk5 -#: optiondialog.cpp:1053 optiondialog.cpp:1065 -#, kde-format -msgid "Manual Choice" -msgstr "Ручни избор" - -#. +> trunk5 -#: optiondialog.cpp:1057 optiondialog.cpp:1070 -#, kde-format -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама." - -#. +> trunk5 -#: optiondialog.cpp:1061 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "Подразумевано стапање празнина три фајла:" - -#. +> trunk5 -#: optiondialog.cpp:1074 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "Регуларни израз за аутоматско стапање" - -#. +> trunk5 -#: optiondialog.cpp:1082 smalldialogs.cpp:448 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "Регуларни израз за аутоматско стапање:" - -#. +> trunk5 -#: optiondialog.cpp:1086 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б." - -#. +> trunk5 -#: optiondialog.cpp:1092 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "Аутоматски стопи по регуларном изразу на почетку стапања" - -#. +> trunk5 -#: optiondialog.cpp:1094 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n" - -#. +> trunk5 -#: optiondialog.cpp:1099 -#, kde-format -msgid "Version Control History Merging" -msgstr "Стапање историјата управљања верзијама" - -#. +> trunk5 -#: optiondialog.cpp:1107 smalldialogs.cpp:475 -#, kde-format -msgid "History start regular expression:" -msgstr "Регуларни израз за почетак историјата:" - -# literal-segment: Log -#. +> trunk5 -#: optiondialog.cpp:1111 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Регуларни израз за почетак уноса у историјату управљања верзијама.\n" -"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n" -"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/." - -#. +> trunk5 -#: optiondialog.cpp:1117 smalldialogs.cpp:503 -#, kde-format -msgid "History entry start regular expression:" -msgstr "Регуларни израз за почетак уноса историјата:" - -#. +> trunk5 -#: optiondialog.cpp:1129 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"Унос у историјату управљања верзијама чини неколико редова.\n" -"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n" -"Користите заграде да групишете кључеве по којима ће се ређати.\n" -"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n" -"Детаље потражите у документацији." - -#. +> trunk5 -#: optiondialog.cpp:1137 -#, kde-format -msgid "History merge sorting" -msgstr "Ређање у стапању историјата" - -#. +> trunk5 -#: optiondialog.cpp:1139 -#, kde-format -msgid "Sort version control history by a key." -msgstr "Ређа историјат управљања верзијама по кључу." - -#. +> trunk5 -#: optiondialog.cpp:1149 -#, kde-format -msgid "History entry start sort key order:" -msgstr "Редослед ређања за кључеве уноса историјата:" - -#. +> trunk5 -#: optiondialog.cpp:1153 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n" -"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n" -"Ако се остави празно, ређање се не спроводи.\n" -"Детаље потражите у документацији." - -#. +> trunk5 -#: optiondialog.cpp:1164 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "Стопи историјат управљања верзијама на почетку стапања" - -#. +> trunk5 -#: optiondialog.cpp:1166 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања." - -#. +> trunk5 -#: optiondialog.cpp:1170 -#, kde-format -msgid "Max number of history entries:" -msgstr "Највећи број уноса историјата:" - -# skip-rule: t-cut -#. +> trunk5 -#: optiondialog.cpp:1173 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса." - -# >> @action:button -#. +> trunk5 -#: optiondialog.cpp:1177 -#, kde-format -msgid "Test your regular expressions" -msgstr "Испробај регуларне изразе" - -#. +> trunk5 -#: optiondialog.cpp:1182 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "Наредба при безначајном стапању:" - -#. +> trunk5 -#: optiondialog.cpp:1186 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n" -"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3" - -#. +> trunk5 -#: optiondialog.cpp:1191 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "Аутоматски сачувај и напусти при стапању без сукоба" - -#. +> trunk5 -#: optiondialog.cpp:1194 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n" -"Слично опцији командне линије --auto." - -#. +> trunk5 -#: optiondialog.cpp:1205 optiondialog.cpp:1206 -#, kde-format -msgid "Directory" -msgstr "Фасцикла" - -#. +> trunk5 -#: optiondialog.cpp:1218 -#, kde-format -msgid "Recursive directories" -msgstr "Рекурзивно кроз фасцикле" - -#. +> trunk5 -#: optiondialog.cpp:1220 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "Да ли анализирати потфасцикле." - -#. +> trunk5 -#: optiondialog.cpp:1222 -#, kde-format -msgid "File pattern(s):" -msgstr "Обрасци фајлова:" - -#. +> trunk5 -#: optiondialog.cpp:1227 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Обрасци за фајлове које треба анализирати.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем." - -#. +> trunk5 -#: optiondialog.cpp:1232 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "Противобрасци фајлова:" - -#. +> trunk5 -#: optiondialog.cpp:1237 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Обрасци за фајлове које треба искључити из анализе.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем." - -#. +> trunk5 -#: optiondialog.cpp:1242 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "Противобрасци фасцикли:" - -#. +> trunk5 -#: optiondialog.cpp:1247 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Обрасци за фасцикле које треба искључити из анализе.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем." - -#. +> trunk5 -#: optiondialog.cpp:1252 -#, kde-format -msgid "Use .cvsignore" -msgstr "Користи ~!/.cvsignore/" - -#. +> trunk5 -#: optiondialog.cpp:1255 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Проширује противобрасце на све што би игнорисао &cvs-n;.\n" -"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли." - -#. +> trunk5 -#: optiondialog.cpp:1259 -#, kde-format -msgid "Find hidden files and directories" -msgstr "Пронађи скривене фајлове и фасцикле" - -#. +> trunk5 -#: optiondialog.cpp:1262 -#, kde-format -msgid "Finds files and directories with the hidden attribute." -msgstr "Налази фајлове и фасцикле са атрибутом скривености." - -#. +> trunk5 -#: optiondialog.cpp:1264 -#, kde-format -msgid "Finds files and directories starting with '.'." -msgstr "Налази фајлове и фасцикле које почињу са ‘.’." - -#. +> trunk5 -#: optiondialog.cpp:1268 -#, kde-format -msgid "Follow file links" -msgstr "Прати везе фајлова" - -#. +> trunk5 -#: optiondialog.cpp:1271 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Укључено: пореди фајлове на које показују везе.\n" -"Искључено: пореди везе." - -#. +> trunk5 -#: optiondialog.cpp:1275 -#, kde-format -msgid "Follow directory links" -msgstr "Прати везе фасцикли" - -#. +> trunk5 -#: optiondialog.cpp:1278 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Укључено: пореди фасцикле на које показују везе.\n" -"Искључено: пореди везе." - -#. +> trunk5 -#: optiondialog.cpp:1293 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "Поређење имена фајлова разликује величину слова" - -#. +> trunk5 -#: optiondialog.cpp:1296 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено." - -#. +> trunk5 -#: optiondialog.cpp:1300 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" -msgid "Unfold all subdirectories on load" -msgstr "Рашири све потфасцикле" - -#. +> trunk5 -#: optiondialog.cpp:1303 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1307 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1310 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#. +> trunk5 -#: optiondialog.cpp:1314 -#, kde-format -msgid "File Comparison Mode" -msgstr "Режим поређења фајлова" - -#. +> trunk5 -#: optiondialog.cpp:1319 -#, kde-format -msgid "Binary comparison" -msgstr "Бинарно поређење" - -#. +> trunk5 -#: optiondialog.cpp:1320 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "Бинарно поређење за сваки фајл (подразумевано)." - -#. +> trunk5 -#: optiondialog.cpp:1323 -#, kde-format -msgid "Full analysis" -msgstr "Пуна анализа" - -#. +> trunk5 -#: optiondialog.cpp:1324 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" -"Спорије него бинарно поређење, много спорије за бинарне фајлове." - -#. +> trunk5 -#: optiondialog.cpp:1328 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "Веруј величини и датуму измене (несигурно)" - -#. +> trunk5 -#: optiondialog.cpp:1329 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" -"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n" -"Корисно за велике фасцикле или споре мреже." - -#. +> trunk5 -#: optiondialog.cpp:1334 -#, kde-format -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)" - -#. +> trunk5 -#: optiondialog.cpp:1335 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" -"Ако датуми нису исти али величина јесте, бинарно упоређује.\n" -"Корисно за велике фасцикле или споре мреже." - -#. +> trunk5 -#: optiondialog.cpp:1340 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "Веруј величини (несигурно)" - -#. +> trunk5 -#: optiondialog.cpp:1341 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" -"Претпоставља да су фајлови једнаки ако им једнаке величине.\n" -"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања." - -#. +> trunk5 -#: optiondialog.cpp:1348 -#, kde-format -msgid "Synchronize directories" -msgstr "Синхронизуј фасцикле" - -#. +> trunk5 -#: optiondialog.cpp:1351 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" -"Ради само када се пореде две фасцикле без задавања одредишта." - -#. +> trunk5 -#: optiondialog.cpp:1357 -#, kde-format -msgid "White space differences considered equal" -msgstr "Разлике у празнинама сматрају се једнаким" - -#. +> trunk5 -#: optiondialog.cpp:1360 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n" -"Ово је активно само када се изабере пуна анализа." - -# >> copy newer file -#. +> trunk5 -#: optiondialog.cpp:1366 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "Копирај новији уместо стапања (несигурно)" - -#. +> trunk5 -#: optiondialog.cpp:1369 -#, kde-format -msgid "" -"Don't look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" -"Не гледа садржај, само узима новији фајл.\n" -"Користите ово само ако знате шта радите!\n" -"Има ефекта само при поређењу две фасцикле." - -#. +> trunk5 -#: optiondialog.cpp:1374 -#, kde-format -msgid "Backup files (.orig)" -msgstr "Прави резерве фајлова (~!/.orig/)" - -#. +> trunk5 -#: optiondialog.cpp:1377 -#, kde-format -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан." - -# rewrite-msgid: /Regional/Locale/ -#. +> trunk5 -#: optiondialog.cpp:1453 optiondialog.cpp:1454 -#, kde-format -msgid "Regional Settings" -msgstr "Поставке локалитета" - -#. +> trunk5 -#: optiondialog.cpp:1555 -#, kde-format -msgid "Language (restart required)" -msgstr "Језик (потребно поновно покретање)" - -#. +> trunk5 -#: optiondialog.cpp:1598 -#, kde-format -msgid "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." -msgstr "" -"Изаберите језик ниски у сучељу, или „аутоматски“.\n" -"Напустите па покрените &kdiff3-a; да би промена језика ступила на снагу." - -#. +> trunk5 -#: optiondialog.cpp:1615 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "Исто кодирање за све:" - -#. +> trunk5 -#: optiondialog.cpp:1618 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Укључивањем овог можете променити сва кодирања променом само првог.\n" -"Искључите ово ако поједине поставке треба да буду различите." - -# >! Merge sentence. -#. +> trunk5 -#: optiondialog.cpp:1622 -#, kde-format -msgid "Note: Local Encoding is " -msgstr "Напомена: локално кодирање је " - -#. +> trunk5 -#: optiondialog.cpp:1626 -#, kde-format -msgid "File Encoding for A:" -msgstr "Кодирање фајла за А:" - -#. +> trunk5 -#: optiondialog.cpp:1632 -#, kde-format -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n" -"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n" -"Откривање &unicode-g; зависи од првих бајтова у фајлу." - -#. +> trunk5 -#: optiondialog.cpp:1635 optiondialog.cpp:1644 optiondialog.cpp:1653 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "Аутоматски откриј &unicode-a;" - -#. +> trunk5 -#: optiondialog.cpp:1640 -#, kde-format -msgid "File Encoding for B:" -msgstr "Кодирање фајла за Б:" - -#. +> trunk5 -#: optiondialog.cpp:1649 -#, kde-format -msgid "File Encoding for C:" -msgstr "Кодирање фајла за Ц:" - -#. +> trunk5 -#: optiondialog.cpp:1658 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "Кодирање фајла за стопљени излаз и уписивање:" - -#. +> trunk5 -#: optiondialog.cpp:1662 -#, kde-format -msgid "Auto Select" -msgstr "Аутоматски изабери" - -#. +> trunk5 -#: optiondialog.cpp:1665 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Ако је укључено, узима се кодирање према улазним фајловима.\n" -"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање." - -#. +> trunk5 -#: optiondialog.cpp:1668 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "Кодирање фајла за предобрадне фајлове:" - -#. +> trunk5 -#: optiondialog.cpp:1679 -#, kde-format -msgid "Right To Left Language" -msgstr "Језици здесна улево" - -#. +> trunk5 -#: optiondialog.cpp:1682 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Неки језици се читају здесна улево.\n" -"Ова поставка прилагођава томе приказивач и уређивач." - -#. +> trunk5 -#: optiondialog.cpp:1701 -#, kde-format -msgid "Integration" -msgstr "Уклапање" - -#. +> trunk5 -#: optiondialog.cpp:1702 -#, kde-format -msgid "Integration Settings" -msgstr "Поставке уклапања" - -#. +> trunk5 -#: optiondialog.cpp:1715 -#, kde-format -msgid "Command line options to ignore:" -msgstr "Занемари опције командне линије:" - -#. +> trunk5 -#: optiondialog.cpp:1720 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n" -"Више вредности можете задати раздвојене тачка-запетом.\n" -"Овим се сузбија грешка „непозната опција“." - -#. +> trunk5 -#: optiondialog.cpp:1725 -#, kde-format -msgid "Quit also via Escape key" -msgstr "Напуштање и преко тастера &esc-n;" - -#. +> trunk5 -#: optiondialog.cpp:1728 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Брз начин напуштања.\n" -"За оне навикнуте на тастер &esc-n; у ову сврху." - -#. +> trunk5 -#: optiondialog.cpp:1733 -#, kde-format -msgid "Integrate with ClearCase" -msgstr "Уклопи са &clearcase-i;" - -#. +> trunk5 -#: optiondialog.cpp:1736 -#, kde-format -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"Уклапање са &ibm-imp; &clearcase_rm-i;.\n" -"Уноси измене у фајл ~!/map/ у &clearcase-lzp; потфасцикли ~!|lib/mgrs|.\n" -"Активно само ако је &clearcase-nzp; фасцикла ~!/bin/ у путањи." - -#. +> trunk5 -#: optiondialog.cpp:1742 -#, kde-format -msgid "Remove ClearCase Integration" -msgstr "Уклони уклапање са &clearcase-i;" - -#. +> trunk5 -#: optiondialog.cpp:1745 -#, kde-format -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "Враћа стари фајл ~!/map/, какав је био пре уклапања са &clearcase-i;." - -#. +> trunk5 -#: optiondialog.cpp:1849 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "Ово ресетује све опције, и то не само оне у текућој теми." - -#. +> trunk5 -#: pdiff.cpp:89 pdiff.cpp:103 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Грешка, губитак података:\n" -"Ако је можете поновити, контактирајте аутора.\n" - -#. +> trunk5 -#: pdiff.cpp:91 pdiff.cpp:105 -#, kde-format -msgid "Severe Internal Error" -msgstr "Озбиљна унутрашња грешка" - -#. +> trunk5 -#: pdiff.cpp:133 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "Наредба предобраде: " - -#. +> trunk5 -#: pdiff.cpp:138 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "Следеће опције које сте изабрали могу изменити податке:\n" - -#. +> trunk5 -#: pdiff.cpp:139 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Врло вероватно не желите ово приликом стапања.\n" -"Желите ли да искључите ове поставке или да наставите даље са њима?" - -#. +> trunk5 -#: pdiff.cpp:141 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "Опција несигурна за стапање" - -#. +> trunk5 -#: pdiff.cpp:142 -#, kde-format -msgid "Use These Options During Merge" -msgstr "Користи ове опције при стапању" - -#. +> trunk5 -#: pdiff.cpp:143 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "Искључи несигурне опције" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:173 -#, kde-format -msgid "Loading A" -msgstr "Учитавам А" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:184 -#, kde-format -msgid "Loading B" -msgstr "Учитавам Б" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:208 pdiff.cpp:238 -#, kde-format -msgid "Diff: A <-> B" -msgstr "Разликујем А и Б" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:215 pdiff.cpp:266 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "Разликујем редове А и Б" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:226 -#, kde-format -msgid "Loading C" -msgstr "Учитавам Ц" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:242 -#, kde-format -msgid "Diff: B <-> C" -msgstr "Разликујем Б и Ц" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:246 -#, kde-format -msgid "Diff: A <-> C" -msgstr "Разликујем А и Ц" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:269 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "Разликујем редове Б и Ц" - -# >> @info:progress -#. +> trunk5 -#: pdiff.cpp:272 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "Разликујем редове А и Ц" - -#. +> trunk5 -#: pdiff.cpp:778 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки." - -#. +> trunk5 -#: pdiff.cpp:784 pdiff.cpp:788 pdiff.cpp:792 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" - -#. +> trunk5 -#: pdiff.cpp:802 -#, kde-format -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 "" -"Изгледа да неки улазни фајлови нису чисто текстуални.\n" -"Имајте на уму да стапање у &kdiff3-l; није намењено бинарним подацима.\n" -"Наставите на сопствену одговорност." - -#. +> trunk5 -#: pdiff.cpp:816 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Don't save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Неке улазни знакови не могу да се претворе у &unicode-a;.\n" -"Можда сте изабрали погрешно кодирање (нпр. &utf8-n; за не-&utf8-; фајлове).\n" -"Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" -"Погођени улазни фајлови налазе се у %1." - -#. +> trunk5 -#: pdiff.cpp:1035 -#, kde-format -msgid "Abort" -msgstr "Обустави" - -#. +> trunk5 -#: pdiff.cpp:1041 pdiff.cpp:1129 -#, kde-format -msgid "Opening files..." -msgstr "Отварам фајлове..." - -#. +> trunk5 -#: pdiff.cpp:1106 pdiff.cpp:1177 -#, kde-format -msgid "File open error" -msgstr "Грешка при отварању фајла" - -#. +> trunk5 -#: pdiff.cpp:1216 -#, kde-format -msgid "Cutting selection..." -msgstr "Исецам изабрано..." - -#. +> trunk5 -#: pdiff.cpp:1237 -#, kde-format -msgid "Copying selection to clipboard..." -msgstr "Копирам избор у клипборд..." - -#. +> trunk5 -#: pdiff.cpp:1253 -#, kde-format -msgid "Inserting clipboard contents..." -msgstr "Умећем садржај клипборда..." - -#. +> trunk5 -#: pdiff.cpp:1714 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1715 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#. +> trunk5 -#: pdiff.cpp:1926 -#, kde-format -msgid "Save && Continue" -msgstr "Сачувај и настави" - -#. +> trunk5 -#: pdiff.cpp:1927 -#, kde-format -msgid "Continue Without Saving" -msgstr "Настави без уписивања" - -#. +> trunk5 -#: pdiff.cpp:2139 -#, kde-format -msgid "Search complete." -msgstr "Претрага је готова." - -#. +> trunk5 -#: pdiff.cpp:2139 -#, kde-format -msgid "Search Complete" -msgstr "Претрага завршена" - -#. +> trunk5 -#: pdiff.cpp:2381 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "Ништа није изабрано ни у једном прозору улаза разлике." - -#. +> trunk5 -#: pdiff.cpp:2381 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "Грешка при додавању ручног опсега разлике" - -#. +> trunk5 -#: progress.cpp:57 progress.cpp:69 -#, kde-format -msgid "&Cancel" -msgstr "&Одустани" - -#. +> trunk5 -#: smalldialogs.cpp:60 -#, kde-format -msgid "A (Base):" -msgstr "А (база):" - -#. +> trunk5 -#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 -#: smalldialogs.cpp:143 -#, kde-format -msgid "File..." -msgstr "Фајл..." - -#. +> trunk5 -#: smalldialogs.cpp:69 smalldialogs.cpp:86 smalldialogs.cpp:103 -#: smalldialogs.cpp:145 -#, kde-format -msgid "Dir..." -msgstr "Фасцикла..." - -#. +> trunk5 -#: smalldialogs.cpp:95 -#, kde-format -msgid "C (Optional):" -msgstr "Ц (опционо):" - -#. +> trunk5 -#: smalldialogs.cpp:118 -#, kde-format -msgid "Swap/Copy Names ..." -msgstr "Размени/копирај имена..." - -#. +> trunk5 -#: smalldialogs.cpp:123 smalldialogs.cpp:124 smalldialogs.cpp:125 -#, kde-format -msgid "Swap %1<->%2" -msgstr "Размени %1 и %2" - -#. +> trunk5 -#: smalldialogs.cpp:126 smalldialogs.cpp:127 smalldialogs.cpp:128 -#, kde-format -msgid "Copy %1->Output" -msgstr "Копирај %1 у излаз" - -#. +> trunk5 -#: smalldialogs.cpp:129 smalldialogs.cpp:130 smalldialogs.cpp:131 -#, kde-format -msgid "Swap %1<->Output" -msgstr "Размени %1 и излаз" - -#. +> trunk5 -#: smalldialogs.cpp:137 -#, kde-format -msgid "Output (optional):" -msgstr "Излаз (опционо):" - -#. +> trunk5 -#: smalldialogs.cpp:167 -#, kde-format -msgid "Configure..." -msgstr "Подеси..." - -#. +> trunk5 -#: smalldialogs.cpp:232 -#, fuzzy, kde-format -#| msgid "Directory" -msgid "Open Directory" -msgstr "Фасцикла" - -#. +> trunk5 -#: smalldialogs.cpp:233 -#, kde-format -msgid "Select Output File" -msgstr "" - -#. +> trunk5 -#: smalldialogs.cpp:392 -#, kde-format -msgid "Search text:" -msgstr "Тражени текст:" - -#. +> trunk5 -#: smalldialogs.cpp:399 -#, kde-format -msgid "Case sensitive" -msgstr "Разликуј величину слова" - -#. +> trunk5 -#: smalldialogs.cpp:402 -#, kde-format -msgid "Search A" -msgstr "Претражи А" - -#. +> trunk5 -#: smalldialogs.cpp:407 -#, kde-format -msgid "Search B" -msgstr "Претражи Б" - -#. +> trunk5 -#: smalldialogs.cpp:412 -#, kde-format -msgid "Search C" -msgstr "Претражи Ц" - -#. +> trunk5 -#: smalldialogs.cpp:417 -#, kde-format -msgid "Search output" -msgstr "Излаз претраге" - -#. +> trunk5 -#: smalldialogs.cpp:424 -#, kde-format -msgid "&Search" -msgstr "&Тражи" - -#. +> trunk5 -#: smalldialogs.cpp:443 -#, kde-format -msgid "Regular Expression Tester" -msgstr "Проба регуларних израза" - -#. +> trunk5 -#: smalldialogs.cpp:456 -#, kde-format -msgid "Example auto merge line:" -msgstr "Пример реда за аутоматско стапање:" - -#. +> trunk5 -#: smalldialogs.cpp:458 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима." - -#. +> trunk5 -#: smalldialogs.cpp:464 smalldialogs.cpp:492 smalldialogs.cpp:528 -#, kde-format -msgid "Match result:" -msgstr "Резултат поклапања:" - -#. +> trunk5 -#: smalldialogs.cpp:483 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "Пример почетног реда историјата (са водећим коментаром):" - -#. +> trunk5 -#: smalldialogs.cpp:485 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар." - -#. +> trunk5 -#: smalldialogs.cpp:511 -#, kde-format -msgid "History sort key order:" -msgstr "Редослед ређања кључева историјата:" - -#. +> trunk5 -#: smalldialogs.cpp:519 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "Пример почетног реда ставке историјата (без водећег коментара):" - -#. +> trunk5 -#: smalldialogs.cpp:521 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар." - -#. +> trunk5 -#: smalldialogs.cpp:535 -#, kde-format -msgid "Sort key result:" -msgstr "Резултат ређања кључева:" - -#. +> trunk5 -#: smalldialogs.cpp:583 smalldialogs.cpp:593 smalldialogs.cpp:613 -#, kde-format -msgid "Match success." -msgstr "Поклапање је успело." - -#. +> trunk5 -#: smalldialogs.cpp:587 smalldialogs.cpp:597 smalldialogs.cpp:619 -#, kde-format -msgid "Match failed." -msgstr "Поклапање није успело." - -#. +> trunk5 -#: smalldialogs.cpp:604 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу." - -#~ msgid "&OK" -#~ msgstr "&У реду" - -#~ msgid "OK" -#~ msgstr "У реду" - -#, fuzzy -#~| msgid "(c) 2002-2011 Joachim Eibl" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "© 2002–2011, &joachimeibl-n;" - -#~ 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" -#~ "~!|mergeResultSaved: m_pMFI=0|\n" -#~ "\n" -#~ "Ако знате како ово да поновите, обратите се аутору програма." - -#~ msgid "Program Error" -#~ msgstr "Грешка у програму" - -#~ msgid "Error." -#~ msgstr "Грешка." - -#~ msgid "Select Font" -#~ msgstr "Изабери фонт" - -#~ 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" -#~ "\n" -#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" -#~ "ширине, можете искусити проблеме у току уређивања.\n" -#~ "\n" -#~ "Желите ли да наставите или да изаберете други фонт?" - -# >> @title:window -#~ msgid "Incompatible font." -#~ msgstr "Несагласан фонт" - -#~ msgid "Continue at my own risk" -#~ msgstr "Настави на моју одговорност" - -#~ msgid "Select another font" -#~ msgstr "Изабери други фонт" - -#~ msgid "Eike Sauer" -#~ msgstr "&eikesauer-n;" - -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "Исправке грешака, одржавалац &debian-gmp; пакета" - -#~ msgid "Sebastien Fricker" -#~ msgstr "&sebastienfricker-n;" - -#~ msgid "Windows installer" -#~ msgstr "Инсталатер за &windowsos-a;" - -#~ msgid "Stephan Binner" -#~ msgstr "&stephanbinner-n;" - -#~ msgid "i18n-help" -#~ msgstr "Помоћ у интернационализацији" - -#~ msgid "Stefan Partheymueller" -#~ msgstr "&stefanpartheymueller-n;" - -#~ msgid "Clipboard-patch" -#~ msgstr "Закрпа за клипборд" - -#~ msgid "David Faure" -#~ msgstr "&davidfaure-n;" - -#~ msgid "KIO-Help" -#~ msgstr "Помоћ за &ioslave-ak;" - -#~ msgid "Bernd Gehrmann" -#~ msgstr "&berndgehrmann-n;" - -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Класа ~!/CvsIgnoreList/ из &cervisia-g;" - -#~ msgid "Andre Woebbeking" -#~ msgstr "&andrewoebbeking-n;" - -#~ msgid "Class StringMatcher" -#~ msgstr "Класа ~!/StringMatcher/" - -#~ msgid "Michael Denio" -#~ msgstr "&michaeldenio-n;" - -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "Закрпа за бојење једнакости фасцикли" - -#~ msgid "Manfred Koehler" -#~ msgstr "&manfredkoehler-n;" - -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Поправка за споро покретање под &windowsos-i;" - -#~ msgid "Sergey Zorin" -#~ msgstr "&sergeyzorin-n;" - -#~ msgid "Diff Ext for Windows" -#~ msgstr "Проширење за разликовање под &windowsos-i;" - -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "&pauleggert-n;, &mikehaertel-n;, &davidhayes-n;, &richardmstallman-n;, &leonardhtower-n;" - -#~ msgid "GNU-Diffutils" -#~ msgstr "&Gnu-nzkp; алатке за разликовање" - -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "&tinoboellsterling-n;, &timothymee-n;" - -#~ msgid "Intensive test, use and feedback" -#~ msgstr "Интензивно испробавање, употреба и реаговања" - -#~ msgid "Michael Schmidt" -#~ msgstr "&michaelschmidt-n;" - -#~ msgid "Mac support" -#~ msgstr "Подршка за &maccomp-a;" - -#~ msgid "Valentin Rusu" -#~ msgstr "&valentinrusu-n;" - -#~ msgid "KDE4 porting" -#~ msgstr "Преношење на &kde4-a;" - -#~ msgid "Albert Astals Cid" -#~ msgstr "&albertastalscid-n;" - -#~ msgid "Silvan Scherrer" -#~ msgstr "&silvanscherrer-n;" - -#~ msgid "OS2 port" -#~ msgstr "Преношење на &os2-a;" - -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "+ Пуно хвала свима који су пријављивали грешке и прилагали идеје!" - -#~ msgid "Italic font for deltas" -#~ msgstr "Курзивни фонт за делте" - -# rewrite-msgid: /italic characters/italics/ -#~ 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" -#~ "Ако фонт не подржава курзив, онда ово не ради ништа." - -#~ msgid "Incompatible Font" -#~ msgstr "Несагласан фонт" - -#~ msgid "Continue at Own Risk" -#~ msgstr "Настави на моју одговорност" - -#~ msgid "Select Another Font" -#~ msgstr "Изабери други фонт" Index: trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,57 +0,0 @@ -# Translation of kdiff3.desktop.po into Serbian. -# Slobodan Simic , 2005, 2009, 2010. -# Chusslove Illich , 2005, 2012, 2017. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3.desktop\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-22 08:59+0100\n" -"PO-Revision-Date: 2017-09-28 17:57+0200\n" -"Last-Translator: Chusslove Illich \n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: xmlents\n" -"X-Environment: kde\n" -"X-Wrapping: fine\n" - -#. +> trunk5 -#: src/kdiff3part.desktop:2 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "&Kdiff3-n; део" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:2 -msgctxt "Name" -msgid "KDiff3" -msgstr "&kdiff3-n;" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:51 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "Прочеље за ~!/diff/ и ~!/patch/" - -#. +> trunk5 -#: src/org.kde.kdiff3.desktop:104 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "Алатка за поређење и стапање фајлова и фасцикли" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "Поређење и стапање фајлова и фасцикли &kdiff3-i;" - -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "&kdiff3-n;" - -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "Поређење и стапање фајлова и фасцикли" Index: trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._json_.po =================================================================== --- trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._json_.po (revision 1522186) +++ trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3._json_.po (nonexistent) @@ -1,23 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: json files\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2018-02-23 09:24+0100\n" -"Last-Translator: Simulacrum\n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Accelerator-Marker: \n" -"X-Text-Markup: xmlents\n" -"X-Environment: kde\n" -"X-Wrapping: fine\n" - -#. +> trunk5 -#: kdiff3fileitemactionplugin/kdiff3fileitemaction.json -msgctxt "Name" -msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "" Index: trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/sr/summit/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,122 +0,0 @@ -# Translation of kdiff3fileitemactionplugin.po into Serbian. -# Chusslove Illich , 2012, 2017. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-21 09:16+0100\n" -"PO-Revision-Date: 2017-09-28 17:57+0200\n" -"Last-Translator: Chusslove Illich \n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Wrapping: fine\n" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:93 -#, kde-format -msgid "KDiff3 ..." -msgstr "&Kdiff3-n;..." - -# >> %1 file path -#. +> trunk5 -#: kdiff3fileitemaction.cpp:125 -#, kde-format -msgid "Compare with %1" -msgstr "Упореди са %1" - -# >> %1 file path -#. +> trunk5 -#: kdiff3fileitemaction.cpp:131 -#, kde-format -msgid "Merge with %1" -msgstr "Стопи са %1" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:137 -#, kde-format -msgid "Save '%1' for later" -msgstr "Сачувај „%1“ за касније" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:143 -#, kde-format -msgid "3-way merge with base" -msgstr "Тространо стопи са базом" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:150 -#, kde-format -msgid "Compare with ..." -msgstr "Упореди са..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:162 -#, kde-format -msgid "Clear list" -msgstr "Очисти списак" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:170 -#, kde-format -msgid "Compare" -msgstr "Упореди" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:176 -#, kde-format -msgid "3 way comparison" -msgstr "Тространо упореди" - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:180 -#, kde-format -msgid "About KDiff3 menu plugin ..." -msgstr "О прикључку менија за &kdiff3-a;..." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:288 -#, kde-format -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Прикључак за радње над фајловима &kdiff3-g;: © 2011, &joachimeibl-n;\n" -"Домаћа страница &kdiff3-g;: http://kdiff3.sourceforge.net\n" -"\n" - -# >! Wtf: ...then the branch to merge... -#. +> trunk5 -#: kdiff3fileitemaction.cpp:290 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#| "Same also applies to directory comparison and merge." -msgid "" -"Using the contextmenu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Коришћење проширења контекстног менија:\n" -"За једноставно поређење, изаберите „~%/Compare/“.\n" -"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" -"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" -"Исто важи за поређење и стапање фасцикли." - -#. +> trunk5 -#: kdiff3fileitemaction.cpp:298 -#, kde-format -msgid "About KDiff3 File Item Action Plugin" -msgstr "О прикључку за радње над фајловима &kdiff3-g;" Index: trunk/l10n-support/sr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po =================================================================== --- trunk/l10n-support/sr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (revision 1522186) +++ trunk/l10n-support/sr/summit/messages/playground-devtools/org.kde.kdiff3.appdata.po (nonexistent) @@ -1,28 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: org.kde.kdiff3.appdata\n" -"POT-Creation-Date: 2018-02-15 08:55+0100\n" -"PO-Revision-Date: 2018-02-16 11:10+0100\n" -"Last-Translator: Simulacrum\n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Wrapping: fine\n" - -#. (itstool) path: component/name -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:6 -msgid "KDiff3" -msgstr "" - -#. (itstool) path: component/summary -#. +> trunk5 -#: org.kde.kdiff3.appdata.xml:7 -msgid "A File And Directory Comparison And Merge Tool" -msgstr "" Index: trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3._desktop_.po (nonexistent) +++ trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3._desktop_.po (revision 1522187) @@ -0,0 +1,101 @@ +# Ascription shadow for desktop_extragear-utils_kdiff3.po +# Copyright same as for the original catalog. +# License same as for the original catalog. +# Ascriber +# ===== DO NOT EDIT MANUALLY ===== +msgid "" +msgstr "" +"Project-Id-Version: desktop_extragear-utils_kdiff3\n" +"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" +"POT-Creation-Date: 2009-01-02 15:39+0100\n" +"PO-Revision-Date: 2018-02-23 09:26+0100\n" +"Last-Translator: Ascriber \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 +#. modified: simic | 2009-01-21 14:09:09+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgctxt "Name" +msgid "KDiff3" +msgstr "" +"KDiff3|~\n" +"&kdiff3-n;|~" + +#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 +#. modified: simic | 2009-01-21 14:09:09+0100 | 1 +#. modified: simic | 2010-03-13 02:27:53+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgctxt "GenericName" +msgid "Diff/Patch Frontend" +msgstr "" +"Интерфејс за diff и patch|~\n" +"Интерфејс за diff и patch|~\n" +"Сучеље за diff и patch|~\n" +"Прочеље за diff и patch|~\n" +"Прочеље за ~!/diff/ и ~!/patch/|~" + +#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgctxt "Comment" +msgid "A File And Directory Comparison And Merge Tool" +msgstr "" +"Алат за поређење и стапање фајлова и директоријума|~\n" +"Алатка за поређење и стапање фајлова и фасцикли|~" + +#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 +#. modified: simic | 2009-01-21 14:09:09+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgctxt "Name" +msgid "KDiff3Part" +msgstr "" +"KDiff3Part|~\n" +"&kdiff3part-n;|~\n" +"&Kdiff3-n; део|~" + +#. modified: simic | 2009-01-21 14:09:09+0100 | 1 +#. modified: simic | 2010-03-13 02:27:53+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-23 09:26:46+0100 | o +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories with KDiff3" +#~ msgstr "" +#~ "Упореди/стопи Фајлове/директоријуме &kdiff3-i;|~\n" +#~ "Упореди/стопи фајлове/директоријуме &kdiff3-i;|~\n" +#~ "Поређење и стапање фајлова и фасцикли &kdiff3-i;|~" + +#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-23 09:26:46+0100 | o +#~| msgctxt "" +#~| "Name|~\n" +#~| "|~x" +#~| msgid "" +#~| "KDiff3|~\n" +#~| "|~x" +#~ msgctxt "X-KDE-Submenu" +#~ msgid "KDiff3" +#~ msgstr "" +#~ "&kdiff3-n;|~\n" +#~ "|~e0" + +#. modified: simic | 2009-01-21 14:09:09+0100 | 1 +#. modified: simic | 2010-03-13 02:27:53+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgctxt "Name" +#~ msgid "Compare/Merge Files/Directories" +#~ msgstr "" +#~ "Упореди/стопи Фајлове/директоријуме|~\n" +#~ "Упореди/стопи фајлове/директоријуме|~\n" +#~ "Поређење и стапање фајлова и фасцикли|~" Index: trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3.po (nonexistent) +++ trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3.po (revision 1522187) @@ -0,0 +1,5123 @@ +# Ascription shadow for kdiff3.po +# Copyright same as for the original catalog. +# License same as for the original catalog. +# Ascriber +# ===== DO NOT EDIT MANUALLY ===== +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" +"POT-Creation-Date: 2009-01-14 14:50+0100\n" +"PO-Revision-Date: 2018-05-19 13:24+0200\n" +"Last-Translator: Ascriber \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" +"Слободан Симић|~\n" +"Слободан Симић,Часлав Илић|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2010-01-31 22:23:21+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" +"simicsl@verat.net|~\n" +"slsimic@gmail.com|~\n" +"slsimic@gmail.com,caslav.ilic@gmx.net|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Writing clipboard data to temp file failed." +msgstr "Уписивање података из клипборда у привремени фајл није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "From Clipboard" +msgstr "Из клипборда|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" +"Предобрада је вероватно неуспешна. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Наредба предобраде ће сада бити искључена.|~\n" +"Изгледа да је предобрада пропала. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Наредба предобраде ће сада бити деактивирана.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" +"Предобрада поклапања линија је неуспешна. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Предобрада поклапања линија ће сада бити искључена.|~\n" +"Изгледа да је предобрада поклапања редова пропала. Проверите ову наредбу:\n" +"\n" +" %1\n" +"\n" +"Предобрада поклапања редова сада ће бити деактивирана.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Severe Internal Error" +msgstr "Озбиљна унутрашња грешка|~" + +# |~x +# >! Merge whole string. +# >> @item:intext|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File" +msgstr "" +"Фајл|~\n" +"фајл|~" + +# |~x +# >> @item:intext|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Line" +msgstr "" +"Линија|~\n" +"ред|~" + +# |~x +# >! Merge whole string.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Top line" +msgstr "" +"Највиша линија|~\n" +"Први ред|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "End" +msgstr "Крај|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Mix of links and normal files." +msgstr "Мешавина веза и нормалних фајлова.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Link: " +msgstr "Веза: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Size. " +msgstr "Величина: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Date & Size: " +msgstr "Датум и величина: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Creating temp copy of %1 failed." +msgstr "Прављење привремене копије фајла %1 није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Opening %1 failed." +msgstr "Отварање фајла %1 није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Comparing file..." +msgstr "Упоређујем фајл...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error reading from %1" +msgstr "Грешка при читању из %1|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Name" +msgstr "" +"Име|~\n" +"име|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Operation" +msgstr "" +"Операција|~\n" +"поступак|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Status" +msgstr "" +"Статус|~\n" +"стање|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unsolved" +msgstr "" +"Нерешен|~\n" +"нерешено|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Solved" +msgstr "" +"Решен|~\n" +"решено|~" + +# |~x +# >> non-whitespace +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Nonwhite" +msgstr "" +"Не-бело|~\n" +"непразно|~" + +# |~x +# >> whitespace +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "White" +msgstr "" +"Бела|~\n" +"празно|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" +msgstr "" +"Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и поново скенирате директоријум?|~\n" +"Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново скенирате фасциклу?|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Warning" +msgstr "Упозорење|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Rescan" +msgstr "Поново скенирај|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Continue Merging" +msgstr "Настави стапање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Opening of directories failed:" +msgstr "" +"Отварање директоријума није успело:|~\n" +"Отварање фасцикли није успело:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "" +"Дир. А „%1“ не постоји или није директоријум.\n" +"|~\n" +"Фасцикла А „%1“ не постоји или није фасцикла.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "" +"Дир. Б „%1“ не постоји или није директоријум.\n" +"|~\n" +"Фасцикла Б „%1“ не постоји или није фасцикла.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "" +"Дир. Ц „%1“ не постоји или није директоријум.\n" +"|~\n" +"Фасцикла Ц „%1“ не постоји или није фасцикла.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Directory Open Error" +msgstr "" +"Грешка при отварању директоријума|~\n" +"Грешка при отварању фасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"The destination directory must not be the same as A or B when three directories are merged.\n" +"Check again before continuing." +msgstr "" +"Одредишни директоријум не сме бити исти као А или Б када се стапају три директоријума.\n" +"Проверите поново пре него наставите.|~\n" +"Одредишна фасцикла не сме бити иста као А или Б када се стапају три фасцикле.\n" +"Проверите поново пре него што наставите.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Parameter Warning" +msgstr "Упозорење о параметрима|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Scanning directories..." +msgstr "" +"Прегледам директоријуме...|~\n" +"Скенирам фасцикле...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reading Directory A" +msgstr "" +"Читам директоријум А|~\n" +"Читам фасциклу А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reading Directory B" +msgstr "" +"Читам директоријум Б|~\n" +"Читам фасциклу Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reading Directory C" +msgstr "" +"Читам директоријум Ц|~\n" +"Читам фасциклу Ц|~" + +# |~x +# >! Merge sentence.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Some subdirectories were not readable in" +msgstr "" +"Неки поддиректоријуми нису били читљиви у|~\n" +"Неке потфасцикле нису биле читљиве у|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Check the permissions of the subdirectories." +msgstr "" +"Проверите дозволе поддиректоријума.|~\n" +"Проверите дозволе потфасцикли.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Ready." +msgstr "Спреман.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Directory Comparison Status" +msgstr "" +"Статус поређења директоријума|~\n" +"Стање поређења фасцикли|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Number of subdirectories:" +msgstr "" +"Број поддиректоријума:|~\n" +"Број потфасцикли:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Number of equal files:" +msgstr "Број једнаких фајлова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Number of different files:" +msgstr "Број различитих фајлова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Number of manual merges:" +msgstr "Број ручних стапања:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "This affects all merge operations." +msgstr "" +"Ово утиче на све операције стапања.|~\n" +"Ово утиче на све поступке стапања.|~" + +# |~x +# >> @title:window|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Changing All Merge Operations" +msgstr "" +"Мењам све операције стапања|~\n" +"Мењање свих поступака стапања|~" + +# |~x +# >! Merge sentence.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Processing " +msgstr "" +"Обрађујем |~\n" +"|~e0" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "To do." +msgstr "Урадити.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copy A to B" +msgstr "Копирај А у Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copy B to A" +msgstr "Копирај Б у А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Delete A" +msgstr "Обриши А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Delete B" +msgstr "Обриши Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Delete A & B" +msgstr "Обриши А и Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge to A" +msgstr "Стопи у А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge to B" +msgstr "Стопи у Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge to A & B" +msgstr "" +"Стопи А и Б|~\n" +"Стопи у А и Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Delete (if exists)" +msgstr "Обриши (ако постоји)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge" +msgstr "Стопи|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge (manual)" +msgstr "Стопи (ручно)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: Conflicting File Types" +msgstr "" +"Грешка: Сукобљени типови фајлова|~\n" +"Грешка: сукобљени типови фајлова.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: Dates are equal but files are not." +msgstr "" +"Грешка: Датуми су једнаки али фајлови нису.|~\n" +"Грешка: датуми су једнаки али фајлови нису.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "This operation is currently not possible." +msgstr "" +"Ова операција тренутно није могућа.|~\n" +"Овај поступак тренутно није могућ.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Operation Not Possible" +msgstr "" +"Операција није могућа|~\n" +"Поступак није могућ|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "An error occurred while copying.\n" +msgstr "" +"Дошло је до грешке у току копирања.\n" +"|~\n" +"Грешка у току копирања.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error" +msgstr "Грешка|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge Error" +msgstr "Грешка стапања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Not saved." +msgstr "" +"Није снимљено.|~\n" +"Није сачувано.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unknown merge operation. (This must never happen!)" +msgstr "" +"Непозната операција стапања. (Ово никад не сме да се деси!)|~\n" +"Непознат поступак стапања. (Ово никада не сме да се догоди!)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unknown merge operation." +msgstr "" +"Непозната операција стапања.|~\n" +"Непозната поступак стапања.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +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" +"Пазите да програм још увек има бета статус и нема НИКАКВИХ ГАРАНЦИЈА уопште! Направите резерву својих најважнијих података!|~\n" +"Стапање ће управо почети.\n" +"\n" +"Изаберите Do It ако сте прочитали инструкције и знате шта радите.\n" +"Изаберите Simulate It ако бисте прво да видите шта би се догодило.\n" +"\n" +"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!|~\n" +"Стапање ће управо почети.\n" +"\n" +"Изаберите „~%/Do It/“ ако сте прочитали инструкције и знате шта радите.\n" +"Изаберите „~%/Simulate It/“ ако бисте прво да видите шта би се догодило.\n" +"\n" +"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!|~" + +# |~x +# >> @title:window|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Starting Merge" +msgstr "" +"Почињем стапање|~\n" +"Почетак стапања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Do It" +msgstr "Уради|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Simulate It" +msgstr "Симулирај|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "The highlighted item has a different type in the different directories. Select what to do." +msgstr "" +"Истакнута ставка има различит тип у различитим директоријумима. Изаберите шта је чинити.|~\n" +"Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта урадити.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "The modification dates of the file are equal but the files are not. Select what to do." +msgstr "" +"Датуми измене фајла су једнаки али фајлови нису. Изаберите шта је чинити.|~\n" +"Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "This operation is currently not possible because directory merge is currently running." +msgstr "" +"Ова операција тренутно није могућа зато што је стапање директоријума у току.|~\n" +"Овај поступак тренутно није могућ зато што је у току стапање фасцикли.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +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" +"Желите ли да наставите са ставком која је изазвала грешку или желите да је прескочите?|~\n" +"Грешка у последњем кораку.\n" +"Желите ли да наставите са ставком која је изазвала грешку или да је прескочите?|~" + +# |~x +# >> @title:window|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Continue merge after an error" +msgstr "" +"Настави стапање после грешке|~\n" +"Настављање стапања после грешке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Continue With Last Item" +msgstr "Настави са последњом ставком|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Skip Item" +msgstr "Прескочи ставку|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Skipped." +msgstr "Прескочено.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "In progress..." +msgstr "У току...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge operation complete." +msgstr "" +"Операција стапања је завршена.|~\n" +"Поступак стапања је завршен.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge Complete" +msgstr "" +"Стапање је завршено|~\n" +"Стапање завршено|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" +"Симулирано стапање је завршено: Проверите да ли се слажете са предложеним операцијама.|~\n" +"Симулирано стапање је завршено: проверите да ли вам одговарају предложени поступци.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "" +"Дошло је до грешке. Притисните „У реду“ да бисте видели детаљне информације.\n" +"|~\n" +"Дошло је до грешке. Кликните на OK да добијете детаљне информације.\n" +"|~\n" +"Дошло је до грешке. Кликните на „~%/OK/“ да добијете детаљне информације.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: While deleting %1: Creating backup failed." +msgstr "" +"Грешка: У току брисања %1: Прављење резерве није успело.|~\n" +"Грешка: у току брисања %1, прављење резерве није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "delete directory recursively( %1 )" +msgstr "" +"обриши директоријум рекурзивно( %1 )|~\n" +"рекурзивно брисање фасцикле (%1)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "delete( %1 )" +msgstr "" +"обриши( %1 )|~\n" +"брисање (%1)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" +"Грешка: Операција брисања директоријума није успела у току покушаја да се директоријум прочита.|~\n" +"Грешка: поступак брисања фасцикле није успео на месту читања фасцикле.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: rmdir( %1 ) operation failed." +msgstr "" +"Грешка: Операција rmdir( %1 ) није успела.|~\n" +"Грешка: поступак уклањања фасцикле (%1) није успео.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: delete operation failed." +msgstr "" +"Грешка: Операција брисања није успела.|~\n" +"Грешка: поступак брисања није успео.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "" +"ручно стапање( %1, %2, %3 -> %4)|~\n" +"ручно стапање (%1, %2, %3 → %4)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid " Note: After a manual merge the user should continue by pressing F7." +msgstr "" +" Напомена: После ручног стапања корисник би требало да настави помоћу F7.|~\n" +" Напомена: после ручног стапања корисник треба да настави притиском на &f7-a;.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" +"Грешка: Копирање( %1 -> %2 ) није успело. Брисање постојећег одредишта није успело.|~\n" +"Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "copyLink( %1 -> %2 )" +msgstr "" +"копирање везе( %1 -> %2 )|~\n" +"копирање везе (%1 → %2 )|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" +"Грешка: Копирање везе није успело: Удаљене везе још увек нису подржане.|~\n" +"Грешка: копирање везе није успело, удаљене везе још нису подржане.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: copyLink failed." +msgstr "" +"Грешка: Копирање везе није успело.|~\n" +"Грешка: копирање везе није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "copy( %1 -> %2 )" +msgstr "" +"копирај( %1 -> %2 )|~\n" +"копирање (%1 → %2)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" +"Грешка у току преименовања( %1 -> %2 ): Не могу да обришем постојеће одредиште.|~\n" +"Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се обрише.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "rename( %1 -> %2 )" +msgstr "" +"преименуј( %1 -> %2 )|~\n" +"преименовање (%1 → %2)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error: Rename failed." +msgstr "" +"Грешка: Преименовање није успело.|~\n" +"Грешка: преименовање није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" +"Грешка у току прављења директоријума %1. Не могу да обришем постојећи фајл.|~\n" +"Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "makeDir( %1 )" +msgstr "" +"направи директоријум( %1 )|~\n" +"прављење фасцикле (%1)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error while creating directory." +msgstr "" +"Грешка у току прављења директоријума.|~\n" +"Грешка у току прављења фасцикле.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dest" +msgstr "" +"Одр.|~\n" +"Одредиште|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir" +msgstr "" +"Дир.|~\n" +"фасцикла|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Type" +msgstr "" +"Врста|~\n" +"тип|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Size" +msgstr "" +"Величина|~\n" +"величина|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Attr" +msgstr "" +"Атр.|~\n" +"атрибути|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Last Modification" +msgstr "" +"Последња измена|~\n" +"последња измена|~" + +# |~x +# >> @title:column|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Link-Destination" +msgstr "" +"Веза-одредиште|~\n" +"одредиште везе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "not available" +msgstr "" +"није доступно|~\n" +"недоступно|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A (Dest): " +msgstr "" +"А (одр.): |~\n" +"А (одредиште): |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A (Base): " +msgstr "А (база): |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "B (Dest): " +msgstr "" +"Б (одр.): |~\n" +"Б (одредиште): |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "C (Dest): " +msgstr "" +"Ц (одр.): |~\n" +"Ц (одредиште): |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dest: " +msgstr "" +"Одр.: |~\n" +"Одредиште: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Start/Continue Directory Merge" +msgstr "" +"Покрени/настави стапање директоријума|~\n" +"Покрени/настави стапање фасцикли|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Run Operation for Current Item" +msgstr "" +"Покрени операцију за текућу ставку|~\n" +"Изврши поступак за текућу ставку|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Compare Selected File" +msgstr "Упореди изабрани фајл|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge Current File" +msgstr "Стопи текући фајл|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Fold All Subdirs" +msgstr "" +"Сажми све поддиректоријуме|~\n" +"Сажми све потфасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unfold All Subdirs" +msgstr "" +"Рашири све поддиректоријуме|~\n" +"Рашири све потфасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose A for All Items" +msgstr "Изабери А за све ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose B for All Items" +msgstr "Изабери Б за све ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose C for All Items" +msgstr "Изабери Ц за све ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto-Choose Operation for All Items" +msgstr "" +"Аутоматски изабери операцију за све ставке|~\n" +"Аутоматски изабери поступак за све ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "No Operation for All Items" +msgstr "" +"Нема операције за све ставке|~\n" +"Нема поступка за све ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Identical Files" +msgstr "" +"Прикажи идентичне фајлове|~\n" +"Прикажи истоветне фајлове|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Different Files" +msgstr "Прикажи различите фајлове|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Do Nothing" +msgstr "Не ради ништа|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A" +msgstr "" +"A|~\n" +"А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "B" +msgstr "" +"B|~\n" +"Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "C" +msgstr "" +"C|~\n" +"Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Delete A && B" +msgstr "Обриши А и Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge to A && B" +msgstr "Стопи у А и Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"While trying to make a backup, deleting an older backup failed. \n" +"Filename: " +msgstr "" +"У току покушаја да се направи резерва, брисање старије резерве није успело.\n" +"Име фајла: |~\n" +"При покушају прављења резерве, брисање старије резерве није успело.\n" +"Име фајла: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"While trying to make a backup, renaming failed. \n" +"Filenames: " +msgstr "" +"У току покушаја да се направи резерва, преименовање није успело.\n" +"Имена фајлова: |~\n" +"При покушају прављења резерве, преименовање није успело.\n" +"Имена фајлова: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Getting file status: %1" +msgstr "" +"Добављам статус фајла: %1|~\n" +"Добављам стање фајла: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reading file: %1" +msgstr "Читам фајл: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Writing file: %1" +msgstr "Пишем фајл: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Out of memory" +msgstr "" +"Нема меморије|~\n" +"Нема више меморије|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Making directory: %1" +msgstr "" +"Правим директоријум: %1|~\n" +"Правим фасциклу: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Removing directory: %1" +msgstr "" +"Уклањам директоријум: %1|~\n" +"Уклањам фасциклу: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Removing file: %1" +msgstr "Уклањам фајл: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Creating symbolic link: %1 -> %2" +msgstr "" +"Правим симболичку везу: %1 -> %2|~\n" +"Правим симболичку везу: %1 → %2|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Renaming file: %1 -> %2" +msgstr "" +"Уклањам фајл: %1 -> %2|~\n" +"Преименујем фајл: %1 → %2|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copying file: %1 -> %2" +msgstr "" +"Копирам фајл: %1 -> %2|~\n" +"Копирам фајл: %1 → %2|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" +msgstr "" +"Грешка током операције копирања фајлова: Отварање фајла за читање није успело. Име фајла: %1|~\n" +"Грешка током поступка копирања фајлова: отварање фајла ради читања није успело. Име фајла: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" +msgstr "" +"Грешка током операције копирања фајлова: Отварање фајла за писање није успело. Име фајла: %1|~\n" +"Грешка током поступка копирања фајлова: отварање фајла ради писања није успело. Име фајла: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during file copy operation: Reading failed. Filename: %1" +msgstr "" +"Грешка током операције копирања фајлова: Читање није успело. Име фајла: %1|~\n" +"Грешка током поступка копирања фајлова: читање није успело. Име фајла: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error during file copy operation: Writing failed. Filename: %1" +msgstr "" +"Грешка током операције копирања фајлова: Писање није успело. Име фајла: %1|~\n" +"Грешка током поступка копирања фајлова: писање није успело. Име фајла: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reading directory: " +msgstr "" +"Читам директоријум: |~\n" +"Читам фасциклу: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Listing directory: %1" +msgstr "" +"Листам директоријум: %1|~\n" +"Листам фасциклу: %1|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Cancel" +msgstr "" +"&Откажи|~\n" +"&Одустани|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Current Configuration:" +msgstr "" +"Тренутно подешавање:|~\n" +"Тренутна постава:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Config Option Error:" +msgstr "" +"Грешка опције подешавања:|~\n" +"Грешка поставне опције:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Option --auto used, but no output file specified." +msgstr "Опција --auto је употребљена, али није наведен излазни фајл.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Option --auto ignored for directory comparison." +msgstr "" +"Опција --auto се игнорише за поређење директоријума.|~\n" +"Опција --auto се игнорише за поређење фасцикли.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saving failed." +msgstr "" +"Снимање није успело.|~\n" +"Уписивање није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Opening of these files failed:" +msgstr "Отварање ових фајлова није успело:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Open Error" +msgstr "Грешка при отварању фајла|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Opens documents for comparison..." +msgstr "" +"Отвара документе за поређење...|~\n" +"Отвара документе за поређење.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Reload" +msgstr "Учитај поново|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "" +"Снима резултат стапања. Сви сукоби морају бити разрешени!|~\n" +"Уписује резултат стапања. Сви сукоби морају бити разрешени.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saves the current document as..." +msgstr "" +"Снима текуће документе као...|~\n" +"Уписује текуће документе под именом.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Print the differences" +msgstr "" +"Штампај разлике|~\n" +"Штампа разлике.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Quits the application" +msgstr "" +"Излази из програма|~\n" +"Напушта програм.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "" +"Исеца изабрану секцију и ставља је у клипборд|~\n" +"Исеца изабрани одељак и ставља га у клипборд.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copies the selected section to the clipboard" +msgstr "" +"Копира тренутни избор у клипборд|~\n" +"Копира изабрани одељак у клипборд.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Select everything in current window" +msgstr "" +"Изабери све у текућем прозору|~\n" +"Изабира све у текућем прозору.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search for a string" +msgstr "" +"Потражи знаковни низ|~\n" +"Тражи ниску.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search again for the string" +msgstr "" +"Поново потражи знаковни низ|~\n" +"Поново тражи ниску.|~" + +# |~x +# >> @info:tooltip|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Enables/disables the statusbar" +msgstr "" +"Укључује/искључује статусну траку|~\n" +"Укључује/искључује траку стања.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Configure KDiff3..." +msgstr "" +"Подеси KDiff3...|~\n" +"Подеси &kdiff3-a;...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Current Delta" +msgstr "Иди на текућу делту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to First Delta" +msgstr "Иди на прву делту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Last Delta" +msgstr "Иди на последњу делту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" +"(прескаче разлике у белим размацима када је „Прикажи беле размаке“ искључено.)|~\n" +"(Прескаче разлике у празнинама ако је Show White Space искључено.)|~\n" +"(Прескаче разлике у празнинама ако је „~%/Show White Space/“ искључено.)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" +msgstr "" +"(не прескаче разлике у белим размацима чак и када је „Прикажи беле размаке“ искључено.)|~\n" +"(Не прескаче разлике празнинама ни када је Show White Space искључено.)|~\n" +"(Не прескаче разлике празнинама ни када је „~%/Show White Space/“ искључено.)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Previous Delta" +msgstr "Иди на претходну делту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Next Delta" +msgstr "Иди на следећу делту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Previous Conflict" +msgstr "Иди на претходни сукоб|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Next Conflict" +msgstr "Иди на следећи сукоб|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Previous Unsolved Conflict" +msgstr "Иди на претходни нерешени сукоб|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Go to Next Unsolved Conflict" +msgstr "Иди на следећи нерешени сукоб|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Select Line(s) From A" +msgstr "" +"Изаберите линије из А|~\n" +"Изаберите редове из А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Select Line(s) From B" +msgstr "" +"Изаберите линије из Б|~\n" +"Изаберите редове из Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Select Line(s) From C" +msgstr "" +"Изаберите линије из Ц|~\n" +"Изаберите редове из Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show White Space" +msgstr "" +"Прикажи беле размаке|~\n" +"Прикажи празнине|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Line Numbers" +msgstr "" +"Прикажи бројеве линија|~\n" +"Прикажи бројеве редова|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose A Everywhere" +msgstr "Свуда изабери А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose B Everywhere" +msgstr "Свуда изабери Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose C Everywhere" +msgstr "Свуда изабери Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose A for All Unsolved Conflicts" +msgstr "Изабери А за све нерешене сукобе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose B for All Unsolved Conflicts" +msgstr "Изабери Б за све нерешене сукобе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose C for All Unsolved Conflicts" +msgstr "Изабери Ц за све нерешене сукобе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "" +"Изабери А за све нерешене сукобе белих размака|~\n" +"Изабери А за све нерешене сукобе празнина|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "" +"Изабери Б за све нерешене сукобе белих размака|~\n" +"Изабери Б за све нерешене сукобе празнина|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "" +"Изабери Ц за све нерешене сукобе белих размака|~\n" +"Изабери Ц за све нерешене сукобе празнина|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Automatically Solve Simple Conflicts" +msgstr "Аутоматски реши једноставне сукобе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Set Deltas to Conflicts" +msgstr "Постави делте на сукобе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Automatically Solve History Conflicts" +msgstr "" +"Аутоматски реши сукобе историје|~\n" +"Аутоматски реши сукобе историјата|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Window A" +msgstr "Прикажи прозор А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Window B" +msgstr "Прикажи прозор Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Window C" +msgstr "Прикажи прозор Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Focus Next Window" +msgstr "Фокусирај следећи прозор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Normal Overview" +msgstr "Нормалан преглед|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A vs. B Overview" +msgstr "Преглед А према Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A vs. C Overview" +msgstr "Преглед А према Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "B vs. C Overview" +msgstr "Преглед Б према Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Word Wrap Diff Windows" +msgstr "" +"Diff прозори прелома речи|~\n" +"Прелом речи у прозорима разлика|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Add Manual Diff Alignment" +msgstr "" +"Додај ручно Diff поравнање|~\n" +"Додај ручно поравнање разлика|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Clear All Manual Diff Alignments" +msgstr "" +"Очисти сва ручна Diff поравнања|~\n" +"Очисти сва ручна поравнања разлика|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Focus Prev Window" +msgstr "Фокусирај претходни прозор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Toggle Split Orientation" +msgstr "" +"Промени оријентацију раздвајања|~\n" +"Пребаци оријентацију поделе|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir && Text Split Screen View" +msgstr "" +"Подељени приказ екрана за дир. и текст|~\n" +"Подељени приказ екрана на фасциклу и текст|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Toggle Between Dir && Text View" +msgstr "" +"Промени између дир. и текст. приказа|~\n" +"Пребаци приказ фасцикле и текста|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "The merge result hasn't been saved." +msgstr "" +"Резултат стапања није снимљен.|~\n" +"Резултат стапања није сачуван.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Save && Quit" +msgstr "" +"Сними и изађи|~\n" +"Сачувај и напусти|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Quit Without Saving" +msgstr "" +"Изађи без снимања|~\n" +"Напусти без уписивања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saving the merge result failed." +msgstr "" +"Снимање резултата стапања није успело.|~\n" +"Уписивање резултата стапања није успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "" +"Тренутно стапате директоријуме. Желите ли заиста да прекинете?|~\n" +"Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saving file..." +msgstr "" +"Снимам фајл...|~\n" +"Уписујем фајл...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Saving file with a new filename..." +msgstr "" +"Снимам фајл под новим именом...|~\n" +"Уписујем фајл под новим именом...|~" + +# |~x +# >> @title:window|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Save As..." +msgstr "" +"Сними као...|~\n" +"Уписивање као|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Printing..." +msgstr "Штампам...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Selection" +msgstr "Избор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Printing completed." +msgstr "" +"Штампање је завршено.|~\n" +"Штампање завршено.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Printing aborted." +msgstr "" +"Штампање је обустављено.|~\n" +"Штампање обустављено.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Exiting..." +msgstr "" +"Излазим...|~\n" +"Напуштам...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Toggling toolbar..." +msgstr "" +"Укључујем/искључујем траку са алатима...|~\n" +"Пребацујем траку алатки...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Toggle the statusbar..." +msgstr "" +"Укључи/искључи статусну траку...|~\n" +"Пребацујем траку стања...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Couldn't find files for comparison." +msgstr "" +"Нисам могао да нађем фајлове за поређење.|~\n" +"Не могу да нађем фајлове за поређење.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&KDiff3" +msgstr "" +"&KDiff3|~\n" +"&&Kdiff3-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Configure KDiff3" +msgstr "" +"Подеси KDiff3|~\n" +"Подеси &kdiff3-a;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "KDiff3" +msgstr "" +"KDiff3|~\n" +"&&Kdiff3-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&File" +msgstr "&Фајл|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Directory" +msgstr "" +"&Директоријум|~\n" +"Ф&асцикла|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Current Item Merge Operation" +msgstr "" +"Операција стапања текуће ставке|~\n" +"Поступак стапања текуће ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Current Item Sync Operation" +msgstr "" +"Операција синх. текуће ставке|~\n" +"Поступак синхронизовања текуће ставке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Movement" +msgstr "&Кретање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "D&iffview" +msgstr "" +"D&iff приказ|~\n" +"Приказ &разлике|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Merge" +msgstr "" +"&Стопи|~\n" +"&Стапање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Window" +msgstr "Про&зор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Main Toolbar" +msgstr "Главна трака|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Cancel" +msgstr "Одустани|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Help" +msgstr "Помоћ|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Defaults" +msgstr "" +"Уобичајене вредности|~\n" +"Подразумевано|~" + +# |~x +# >> @title:menu|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Edit" +msgstr "" +"&Уређивање|~\n" +"|~e0" + +# |~x +# >> @title:menu|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Settings" +msgstr "" +"&Подешавања|~\n" +"&Подешавање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Help" +msgstr "П&омоћ|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&About" +msgstr "&О пројекту|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A&uthor" +msgstr "&Аутор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Thanks To" +msgstr "&Захвалнице|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Open" +msgstr "Отвори|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Save" +msgstr "Сачувај|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Print..." +msgstr "Штампај...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Quit" +msgstr "Напусти|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Cut" +msgstr "Исеци|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copy" +msgstr "Копирај|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Paste" +msgstr "Налепи|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Select All" +msgstr "Изабери све|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Show Toolbar" +msgstr "" +"Прикажи траку са алатима|~\n" +"Прикажи траку алатки|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Configure %1..." +msgstr "" +"&Подеси %1...|~\n" +"&Подеси %1..." +"|/|" +"&Подеси $[аку %1]...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "About" +msgstr "О програму|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Find" +msgstr "Нађи|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Find Next" +msgstr "Нађи следеће|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Ignore" +msgstr "Игнориши|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Exit" +msgstr "" +"Изађи|~\n" +"Напусти|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Continue" +msgstr "Настави|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "" +"Алат за упоређивање и стапање фајлова и директоријума|~\n" +"Алатка за поређење и стапање фајлова и фасцикли|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge the input." +msgstr "Стопи улаз.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" +"Експлицитан базни фајл. За компатибилност са одређеним алатима.|~\n" +"Изричит базни фајл. За сагласност са појединим алаткама.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" +"Излазни фајл. Имплицира -m. Нпр.: -o newfile.txt|~\n" +"Излазни фајл. Имплицира ~!/-m/. Нпр: ~!/-o novifajl.txt/|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" +"Излазни фајл, поново. (За компатибилност са одређеним алатима.)|~\n" +"Излазни фајл, поново. За сагласност са појединим алаткама.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" +"Без GUI-ја ако су сви сукоби аутоматски решиви. (Захтева -o file)|~\n" +"Без &gui-g; ако су сви сукоби решиви аутоматски. Захтева ~!/-o fajl/.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Visible name replacement for input file 1 (base)." +msgstr "" +"Видљива замена имена за улазни фајл 1 (базни).|~\n" +"Замена видљивог имена за улазни фајл 1 (базни).|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Visible name replacement for input file 2." +msgstr "" +"Видљива замена имена за улазни фајл 2.|~\n" +"Замена видљивог имена за улазни фајл 2.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Visible name replacement for input file 3." +msgstr "" +"Видљива замена имена за улазни фајл 3.|~\n" +"Замена видљивог имена за улазни фајл 3.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" +"Алтернатива видљивој замени имена. Задајте ово једном за сваки улаз.|~\n" +"Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Use a different config file." +msgstr "" +"Користи други фајл подешавања.|~\n" +"Употреби други поставни фајл.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "file1 to open (base, if not specified via --base)" +msgstr "" +"фајл1 за отварање (базни, ако није наведен преко --base)|~\n" +"Фајл 1 за отварање (базни, ако није наведен преко --base).|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "file2 to open" +msgstr "" +"фајл2 за отворање|~\n" +"Фајл 2 за отварање.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "file3 to open" +msgstr "" +"фајл3 за отворање|~\n" +"Фајл 3 за отварање.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "" +"Број преосталих нерешених сукоба: %1 (од којих су %2 бели размаци)|~\n" +"Број преосталих нерешених сукоба: %1 (од чега %2 празнине).|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" +"Излаз је измењен.\n" +"Ако наставите, ваше измене ће бити изгубљене.|~\n" +"Излаз је измењен.\n" +"Ако наставите измене ће бити изгубљене.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "All input files are binary equal." +msgstr "" +"Сви улазни фајлови су бинарно једнаки.|~\n" +"Сви улазни фајлови бинарно су једнаки.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "All input files contain the same text." +msgstr "Сви улазни фајлови садрже исти текст.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "" +"Фајлови %1 и %2 су бинарно једнаки.\n" +"|~\n" +"Фајлови %1 и %2 бинарно су једнаки.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Files %1 and %2 have equal text.\n" +msgstr "" +"Фајлови %1и %2имају једнак текст.\n" +"|~\n" +"Фајлови %1 и %2 садрже исти текст.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Total number of conflicts: " +msgstr "Укупан број сукоба: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"\n" +"Nr of automatically solved conflicts: " +msgstr "" +"\n" +"Број аутоматски решених сукоба: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"\n" +"Nr of unsolved conflicts: " +msgstr "" +"\n" +"Број нерешених сукоба: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Conflicts" +msgstr "Сукоби|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:06:20+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "" +msgstr "" +"<Нема изв. линије>|~\n" +"<нема изворног реда>|~\n" +"<нема изворног реда>|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "" +msgstr "" +"<Сукоб у стапању (само бели размаци)>|~\n" +"<сукоб стапања (само празнине)>|~\n" +"<сукоб стапања (само празнине)>|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "" +msgstr "" +"<Сукоб у стапању>|~\n" +"<сукоб стапања>|~\n" +"<сукоб стапања>|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved.\n" +msgstr "" +"Још увек нису решени сви сукоби.\n" +"Фајл није снимљен.\n" +"|~\n" +"Још нису решени сви сукоби.\n" +"Фајл није сачуван.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Conflicts Left" +msgstr "Преостали сукоби|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" +"\n" +"\n" +"Прављење резерве није успело. Фајл није снимљен.|~\n" +"\n" +"\n" +"Прављење резерве није успело. Фајл није сачуван.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Save Error" +msgstr "" +"Грешка у снимању фајла|~\n" +"Грешка уписивања фајла|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Error while writing." +msgstr "" +"Грешка приликом писања.|~\n" +"Грешка при писању.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Output" +msgstr "Излаз|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "[Modified]" +msgstr "" +"[Измењен]|~\n" +"[измењен]|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Encoding for saving" +msgstr "" +"Кодирање за снимање|~\n" +"Кодирање за уписивање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Line end style:" +msgstr "" +"Стил завршетка линије:|~\n" +"Стил краја редова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 +msgid "DOS" +msgstr "" +"DOS|~\n" +"&dos-n;|~\n" +"&dosos-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Conflict" +msgstr "Сукоб|~" + +# |~x +# >! Merge sentence.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Codec from" +msgstr "" +"Кодирање из|~\n" +"|~e0" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unicode, 8 bit" +msgstr "" +"Unicode, 8-битно|~\n" +"&unicode-n;, 8-битни|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Unicode" +msgstr "" +"Unicode|~\n" +"&unicode-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Latin1" +msgstr "" +"Latin1|~\n" +"&latin1-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "" +"Измените ово ако се знакови који нису ASCII не приказују исправно.|~\n" +"Измените ово ако су не-&ascii-; знакови погрешно приказани.|~" + +# |~x +# >> @title:window|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Configure" +msgstr "" +"Подеси|~\n" +"Подешавање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Font" +msgstr "Фонт|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Editor & Diff Output Font" +msgstr "" +"Фонт уређивача и раз. излаза|~\n" +"Фонт уређивача и излаза разлике|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Color" +msgstr "Боја|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Colors Settings" +msgstr "" +"Подешавања боја|~\n" +"Поставке боја|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Editor and Diff Views:" +msgstr "" +"Уређивач и Diff прикази:|~\n" +"Уређивач и прикази разлика:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Foreground color:" +msgstr "" +"Боја исписа:|~\n" +"Боја текста:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Background color:" +msgstr "Боја позадине:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff background color:" +msgstr "Боја позадине разлика:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Color A:" +msgstr "Боја А:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Color B:" +msgstr "Боја Б:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Color C:" +msgstr "Боја Ц:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Conflict color:" +msgstr "Боја сукоба:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Current range background color:" +msgstr "Позадинска боја текућег опсега:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Current range diff background color:" +msgstr "Позадинска боја текућег опсега разлика:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Directory Comparison View:" +msgstr "" +"Приказ поређења директоријума:|~\n" +"Приказ поређења фасцикли:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Newest file color:" +msgstr "Боја најновијег фајла:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Changing this color will only be effective when starting the next directory comparison." +msgstr "" +"Измена ове боје ће утицати само када покренете поређење следећег директоријума.|~\n" +"Измена ове боје ступиће на снагу од првог наредног поређења фасцикли.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Oldest file color:" +msgstr "Боја најстаријег фајла:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Middle age file color:" +msgstr "Боја фајла средње старости:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Color for missing files:" +msgstr "Боја за недостајуће фајлове:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Editor" +msgstr "Уређивач|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Editor Behavior" +msgstr "Понашање уређивача|~" + +# |~x +# skip-rule: t-tab|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Tab inserts spaces" +msgstr "" +"Таб убацује размаке|~\n" +"&Tab-n; умеће размаке|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Tab size:" +msgstr "" +"Величина таба:|~\n" +"Величина табулатора:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto indentation" +msgstr "Аутоматско увлачење|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "" +"Укључено: Увлачење претходне линије користи се за нову линију.\n" +"|~\n" +"Укључено: увлачење претходног реда узима се за нови ред.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto copy selection" +msgstr "Аутоматско копирање избора|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitely copy e.g. via Ctrl-C." +msgstr "" +"Укључено: Сваки избор се одмах уписује у клипборд.\n" +"Искључено: Морате експлицитно копирати, нрп. помоћу Ctrl+C.|~\n" +"Укључено: сваки избор се одмах уписује у клипборд.\n" +"Искључено: морате изричито копирати, нпр. помоћу ~!/&ctrl-n;+C/.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" +"Поставља завршетке линија када се измењени фајл снима.\n" +"DOS/Windows: CR+LF; Unix: LF; са CR=0D, LF=0A|~\n" +"Поставља завршетке редова када се измењени фајл сачува.\n" +"&Dos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/.|~\n" +"Поставља завршетке редова када се измењени фајл сачува.\n" +"&dosos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff" +msgstr "" +"Diff|~\n" +"Разликовање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff Settings" +msgstr "" +"Подешавања разликовања|~\n" +"Поставке разликовања|~" + +# |~x +# >! Merge sentence.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Treat as white space." +msgstr "" +"Третирај као размаке.|~\n" +"Третирај као празнине.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Ignore numbers" +msgstr "Игнориши бројеве|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" +"Might help to compare files with numeric data." +msgstr "" +"Игнориши бројевне знакове током фазе поклапања линија. (Слично игнорисању белих размака.)\n" +"Може вам помоћи при упоређивању фајлова са нумеричким подацима.|~\n" +"Игнориши цифарске знакове у фази поклапања редова (слично игнорисању празнина).\n" +"Може бити корисно при поређењу фајлова са нумеричким подацима.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Ignore C/C++ comments" +msgstr "" +"Игнориши C/C++ коментаре|~\n" +"Игнориши &clang-;/&cpp-; коментаре|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Treat C/C++ comments like white space." +msgstr "" +"Третирај C/C++ коментаре као беле размаке.|~\n" +"Третирај &clang-;/&cpp-; коментаре као празнине.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Ignore case" +msgstr "" +"Игнориши велика/мала слова|~\n" +"Игнориши величину слова|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" +"Третира разлику у величини као промене белог простора. („a“<=>„A“)|~\n" +"Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’).|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Preprocessor command:" +msgstr "Предобрадна наредба:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" +"Кориснички дефинисана предобрада. (Погледајте документацију за детаље.)|~\n" +"Кориснички дефинисана предобрада. Погледајте документацију за детаље.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Line-matching preprocessor command:" +msgstr "" +"Предобрадна наредба за поклапање линија:|~\n" +"Предобрадна наредба за поклапање редова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" +"Предобрада се користи само током поклапања линија.\n" +"(Погледајте документацију за детаље.)|~\n" +"Предобрада се користи само током поклапања редова.\n" +"Погледајте документацију за детаље.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Try hard (slower)" +msgstr "Потруди се (спорије)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" +"Укључује опцију --minimal за спољашње разликовање.\n" +"Анализа великих фајлова ће бити много спорија.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Merge Settings" +msgstr "Поставке стапања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto advance delay (ms):" +msgstr "" +"Застој аутоматског напредовања (ms):|~\n" +"Застој аутоматског напредовања (~!/ms/):|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +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 "" +"У режиму аутоматског напредовања резултат текућег избора приказује се \n" +"наведено време, пре скока на следећи сукоб. Опсег: 0-2000 ms|~\n" +"У режиму аутоматског напредовања резултат текућег избора приказује се \n" +"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "White space 2-file merge default:" +msgstr "" +"Подразумевано стапање белих размака два фајла:|~\n" +"Подразумевано стапање празнина два фајла:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Manual Choice" +msgstr "Ручни избор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." +msgstr "" +"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у белим размацима.|~\n" +"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "White space 3-file merge default:" +msgstr "" +"Подразумевано стапање белих размака три фајла:|~\n" +"Подразумевано стапање празнина три фајла:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto save and quit on merge without conflicts" +msgstr "" +"Аутоматски сачувај и изађи при стапању без конфликата|~\n" +"Аутоматски сачувај и напусти при стапању без сукоба|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Recursive directories" +msgstr "" +"Рекурзивни директоријуми|~\n" +"Рекурзивно кроз фасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Whether to analyze subdirectories or not." +msgstr "" +"Да ли да се анализирају поддиректоријуми.|~\n" +"Да ли анализирати потфасцикле.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File pattern(s):" +msgstr "" +"Облици фајлова:|~\n" +"Обрасци фајлова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:06:20+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Облици фајлова које треба анализирати.\n" +"Џокери: „*“ и „?“\n" +"Више облика можете навести користећи раздвајач: „;“|~\n" +"Обрасци за фајлове које треба анализирати.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File-anti-pattern(s):" +msgstr "" +"Антиоблици фајлова:|~\n" +"Противобрасци фајлова:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Облици фајлова које треба искључити из анализе.\n" +"Џокери: „*“ и „?“\n" +"Више облика можете навести користећи раздвајач: „;“|~\n" +"Обрасци за фајлове које треба искључити из анализе.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir-anti-pattern(s):" +msgstr "" +"Антиоблици директоријума:|~\n" +"Противобрасци фасцикли:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" +"Облици директоријума које треба искључити из анализе.\n" +"Џокери: „*“ и „?“\n" +"Више облика можете навести користећи раздвајач: „;“|~\n" +"Обрасци за фасцикле које треба искључити из анализе.\n" +"Џокери: ‘*’ и ‘?’\n" +"Више образаца наводите са тачка-запетом као раздвајачем.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Use .cvsignore" +msgstr "" +"Користи фајл .cvsignore|~\n" +"Користи ~!/.cvsignore/|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Find hidden files and directories" +msgstr "" +"Пронађи скривене фајлове и директоријуме|~\n" +"Пронађи скривене фајлове и фасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Finds files and directories with the hidden attribute." +msgstr "" +"Налази фајлове и директоријуме са атрибутом скривених.|~\n" +"Налази фајлове и фасцикле са атрибутом скривености.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Finds files and directories starting with '.'." +msgstr "" +"Налази фајлове и директоријуме који почињу са „.“|~\n" +"Налази фајлове и фасцикле које почињу са ‘.’.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Follow file links" +msgstr "Прати везе фајлова|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" +"Укључено: Пореди фајлове на које показују везе.\n" +"Искључено: Пореди везе.|~\n" +"Укључено: пореди фајлове на које показују везе.\n" +"Искључено: пореди везе.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 +msgid "Follow directory links" +msgstr "" +"Прати везе директоријума|~\n" +"Прати везе фасцили|~\n" +"Прати везе фасцикли|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" +"Укључено: Пореди директоријуме на које показују везе.\n" +"Искључено: Пореди везе.|~\n" +"Укључено: пореди фасцикле на које показују везе.\n" +"Искључено: пореди везе.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Comparison Mode" +msgstr "Режим поређења фајлова|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Binary comparison" +msgstr "Бинарно поређење|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Binary comparison of each file. (Default)" +msgstr "" +"Бинарно поређење за сваки фајл. (Подразумевано)|~\n" +"Бинарно поређење за сваки фајл (подразумевано).|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Full analysis" +msgstr "Пуна анализа|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" +"Ради пуну анализу и приказује статистичке податке у додатним колонама.\n" +"(Спорије него бинарно поређење, много спорије за бинарне фајлове.)|~\n" +"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" +"Спорије него бинарно поређење, много спорије за бинарне фајлове.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Trust the size and modification date (unsafe)" +msgstr "" +"Веруј величини и датуму измене (није безбедно)|~\n" +"Веруј величини и датуму измене (несигурно)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"Files with equal contents but different modification dates will appear as different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" +"Фајлови са истим садржајем али различитим датумом измене ће се појавити као различити.\n" +"Корисно за велике директоријуме или споре мреже.|~\n" +"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" +"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n" +"Корисно за велике фасцикле или споре мреже.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Trust the size (unsafe)" +msgstr "" +"Веруј величини (није безбедно)|~\n" +"Веруј величини (несигурно)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during download." +msgstr "" +"Претпостави да су фајлови једнаки ако су њихове дужине једнаке.\n" +"Корисно за велике директоријуме или споре мреже када се датум измене у току преузимања.|~\n" +"Претпоставља да су фајлови једнаки ако им једнаке величине.\n" +"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Synchronize directories" +msgstr "" +"Синхронизуј директоријуме|~\n" +"Синхронизуј фасцикле|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" +"Нуди да складишти фајлове у оба директоријума тако\n" +"да су оба директоријума после тога иста.\n" +"Ради само када се пореде два директоријума без навођења одредишта.|~\n" +"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" +"Ради само када се пореде две фасцикле без задавања одредишта.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "White space differences considered equal" +msgstr "" +"Разлике у белим размацима сматрају се једнаким|~\n" +"Разлике у празнинама сматрају се једнаким|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" +"Ако се фајлови разликују само у белим размацима, сматрају се једнаким.\n" +"Ово је активно само када се изабере пуна анализа.|~\n" +"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n" +"Ово је активно само када се изабере пуна анализа.|~" + +# |~x +# >> copy newer file|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copy newer instead of merging (unsafe)" +msgstr "" +"Копирај новији уместо стапања (није безбедно)|~\n" +"Копирај новији уместо стапања (несигурно)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +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 "" +"Не гледај унутра, само узми новији фајл.\n" +"(Користите ово само ако знате шта радите!)\n" +"Има ефекта само када се пореде два директоријума.|~\n" +"Не гледа садржај, само узима новији фајл.\n" +"Користите ово само ако знате шта радите!\n" +"Има ефекта само при поређењу две фасцикле.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Backup files (.orig)" +msgstr "" +"Резервиши фајлове (.orig)|~\n" +"Прави резерве фајлова (~!/.orig/)|~" + +# |~x +# rewrite-msgid: /Regional/Locale/|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Regional Settings" +msgstr "" +"Регионална подешавања|~\n" +"Поставке локалитета|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Language (restart required)" +msgstr "Језик (потребно поновно покретање)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Use the same encoding for everything:" +msgstr "" +"Користи исто кодирање за све:|~\n" +"Исто кодирање за све:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" +"Укључивањем овог можете променити сва кодирања променом само првог.\n" +"Искључите ово ако су потребна различита поједина подешавања.|~\n" +"Укључивањем овог можете променити сва кодирања променом само првог.\n" +"Искључите ово ако поједине поставке треба да буду различите.|~" + +# |~x +# >! Merge sentence.|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Note: Local Encoding is " +msgstr "" +"Напомна: Локално кодирање је |~\n" +"Напомена: локално кодирање је |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Encoding for A:" +msgstr "Кодирање фајла за А:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto Detect Unicode" +msgstr "" +"Аутоматски детектуј Unicode|~\n" +"Аутоматски откриј &unicode-a;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Encoding for B:" +msgstr "Кодирање фајла за Б:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Encoding for C:" +msgstr "Кодирање фајла за Ц:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Encoding for Merge Output and Saving:" +msgstr "" +"Кодирање фајла за стопљени излаз и снимање:|~\n" +"Кодирање фајла за стопљени излаз и уписивање:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Auto Select" +msgstr "" +"Аутоматски избор|~\n" +"Аутоматски изабери|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File Encoding for Preprocessor Files:" +msgstr "" +"Кодирање фајла за препроцесорке фајлове:|~\n" +"Кодирање фајла за предобрадне фајлове:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Right To Left Language" +msgstr "" +"Језици с десна у лево|~\n" +"Језици здесна улево|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" +"Неки језици се читају с десна у лево.\n" +"Ово подешавање ће прилагодити томе приказивач и уређивач.|~\n" +"Неки језици се читају здесна улево.\n" +"Ова поставка прилагођава томе приказивач и уређивач.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Integration" +msgstr "" +"Интеграција|~\n" +"Уклапање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Integration Settings" +msgstr "" +"Подешавања интеграције|~\n" +"Поставке уклапања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Command line options to ignore:" +msgstr "" +"Опције командне линије које се занемарују:|~\n" +"Занемари опције командне линије:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Remove ClearCase Integration" +msgstr "" +"Уклони ClearCase интеграцију|~\n" +"Уклони уклапање са &clearcase-i;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "This resets all options. Not only those of the current topic." +msgstr "" +"Ово ресетује све опције. Не само оне у текућој теми.|~\n" +"Ово ресетује све опције, и то не само оне у текућој теми.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "PreprocessorCmd: " +msgstr "" +"Препроцесорка наредба: |~\n" +"Наредба предобраде: |~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "The following option(s) you selected might change data:\n" +msgstr "" +"Следеће опције које сте изабрали могу изменити податке:\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" +"\n" +"Врло је вероватно да ово не желите приликом стапања.\n" +"Желите ли да искључите ова подешавања или да наставите даље са њима?|~\n" +"\n" +"Врло вероватно не желите ово приликом стапања.\n" +"Желите ли да искључите ове поставке или да наставите даље са њима?|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Option Unsafe for Merging" +msgstr "" +"Опција није сигурна за стапање|~\n" +"Опција несигурна за стапање|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Use These Options During Merge" +msgstr "Користи ове опције при стапању|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Disable Unsafe Options" +msgstr "Искључи несигурне опције|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Loading A" +msgstr "" +"Учитавам А|~\n" +"|~e0" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Loading B" +msgstr "" +"Учитавам Б|~\n" +"|~e0" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff: A <-> B" +msgstr "" +"Раз.: А <-> Б|~\n" +"Разликујем А и Б|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Linediff: A <-> B" +msgstr "" +"Раз.лин.: А <-> Б|~\n" +"Разликујем редове А и Б|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Loading C" +msgstr "" +"Учитавам Ц|~\n" +"|~e0" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff: B <-> C" +msgstr "" +"Раз.: Б <-> Ц|~\n" +"Разликујем Б и Ц|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Diff: A <-> C" +msgstr "" +"Раз.: А <-> Ц|~\n" +"Разликујем А и Ц|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Linediff: B <-> C" +msgstr "" +"Раз.лин.: Б <-> Ц|~\n" +"Разликујем редове Б и Ц|~" + +# |~x +# >> @info:progress|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Linediff: A <-> C" +msgstr "" +"Раз.лин.: А <-> Ц|~\n" +"Разликујем редове А и Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "All input files contain the same text, but are not binary equal." +msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" +"Фајлови %1 и %2 имају исти текст али нису бинарно једнаки. \n" +"|~\n" +"Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" +"|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +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 "" +"Изгледа да неки улазни фајлови нису чисто текстуални.\n" +"Имајте на уму да KDiff3 стапање није намењено бинарним подацима.\n" +"Наставите на сопствени ризик.|~\n" +"Изгледа да неки улазни фајлови нису чисто текстуални.\n" +"Имајте на уму да стапање у &kdiff3-l; није намењено бинарним подацима.\n" +"Наставите на сопствену одговорност.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Abort" +msgstr "" +"Прекини|~\n" +"Обустави|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Opening files..." +msgstr "Отварам фајлове...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File open error" +msgstr "Грешка при отварању фајла|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Cutting selection..." +msgstr "Исецам изабрано...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copying selection to clipboard..." +msgstr "Копирам избор у клипборд...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Inserting clipboard contents..." +msgstr "Умећем садржај клипборда...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Save && Continue" +msgstr "" +"Сними и настави|~\n" +"Сачувај и настави|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Continue Without Saving" +msgstr "" +"Настави без снимања|~\n" +"Настави без уписивања|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search complete." +msgstr "" +"Претрага је завршена.|~\n" +"Претрага је готова.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search Complete" +msgstr "" +"Претрага је готова|~\n" +"Претрага завршена|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "A (Base):" +msgstr "А (база):|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "File..." +msgstr "Фајл...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Dir..." +msgstr "" +"Дир...|~\n" +"Фасцикла...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "C (Optional):" +msgstr "Ц (опционо):|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Swap/Copy Names ..." +msgstr "" +"Замени/Копирај имена ...|~\n" +"Размени/копирај имена...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Swap %1<->%2" +msgstr "" +"Замени %1<->%2|~\n" +"Размени %1 и %2|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Copy %1->Output" +msgstr "" +"Копирај %1->Излаз|~\n" +"Копирај %1 у излаз|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Swap %1<->Output" +msgstr "" +"Замени %1<->Излаз|~\n" +"Размени %1 и излаз|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Output (optional):" +msgstr "Излаз (опционо):|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Configure..." +msgstr "Подеси...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search text:" +msgstr "" +"Текст за претрагу:|~\n" +"Тражени текст:|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Case sensitive" +msgstr "" +"Разликуј мала и велика слова|~\n" +"Разликуј величину слова|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search A" +msgstr "Претражи А|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search B" +msgstr "Претражи Б|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search C" +msgstr "Претражи Ц|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Search output" +msgstr "Излаз претраге|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "&Search" +msgstr "&Тражи|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Match success." +msgstr "" +"Поклапање успешно.|~\n" +"Поклапање је успело.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +msgid "Match failed." +msgstr "Поклапање није успело.|~" + +#. modified: ilic | 2009-01-23 19:36:45+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Directory" +msgstr "" +"&Директоријум|~\n" +"Фасцикла|~" + +#. modified: ilic | 2009-03-06 11:49:07+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Encoding:" +msgstr "" +"Кодирање фајла за А:|~\n" +"Кодирање:|~" + +#. modified: ilic | 2009-03-06 11:49:07+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." +msgstr "" +"Истакнута ставка има различит тип у различитим директоријумима. Изаберите шта је чинити.|~\n" +"Истакнута ставка је измењена у једној фасцикли а обрисана у другој. Изаберите шта урадити.|~" + +#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show &Status Bar" +msgstr "" +"Приказуј &статусну линију|~\n" +"Прикажи траку &стања|~" + +#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" +msgstr "" +"Веруј величини и датуму, али користи бинарно упоређивање ако се датум не поклапа (није безбедно)|~\n" +"Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)|~" + +#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Assume that files are equal if the modification date and file length are equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" +"Ако датуми нису исти али величина јесте, користи бинарно упоређивање.\n" +"Корисно за велике директоријуме или споре мреже.|~\n" +"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" +"Ако датуми нису исти али величина јесте, бинарно упоређује.\n" +"Корисно за велике фасцикле или споре мреже.|~" + +# |~x +# rewrite-msgid: /generate/insert/|~ +#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" +"Укључено: Притиском на таб генерише се одговарајући број размака.\n" +"Искључено: Знак табулатора ће бити убачен.|~\n" +"Укључено: притиском &tab-g; умеће се одговарајући број размака.\n" +"Искључено: умеће се знак табулатора.|~" + +#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" +"Проширује антиоблик на све што би CVS игнорисао.\n" +"Преко локалних фајлова „.cvsignore“ ово може бити посебно по директоријуму.|~\n" +"Проширује противобрасце на све што би игнорисао &cvs-n;.\n" +"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли.|~" + +#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"If a file would be saved over an old file, then the old file\n" +"will be renamed with a '.orig' extension instead of being deleted." +msgstr "" +"Када треба снимити фајл преко старог фајла, стари фајл ће бити\n" +"преименован са наставком „.orig“ уместо да буде обрисан.|~\n" +"Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан.|~" + +#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Choose the language of the GUI strings or \"Auto\".\n" +"For a change of language to take place, quit and restart KDiff3." +msgstr "" +"Изаберите језик за исписе у програму или „Auto“.\n" +"Да би измена језика била примењена, затворите и поново покрените KDiff3.|~\n" +"Изаберите језик ниски у сучељу, или „аутоматски“.\n" +"Напустите па покрените &kdiff3-a; да би промена језика ступила на снагу.|~" + +#. modified: ilic | 2010-03-16 15:29:51+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#| msgid "" +#| "Data loss error:\n" +#| "If it is reproducable please contact the author.\n" +#| "|~\n" +#| "|~x" +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" +"Грешка, губитак података:\n" +"Ако је можете поновити, контактирајте аутора.\n" +"|~\n" +"|~e0" + +# |~x +# >> @info:tooltip|~ +#. modified: ilic | 2010-12-16 14:52:29+0100 | 1f +#. modified: ilic | 2010-12-16 14:52:29+0100 +#. modified: ilic | 2010-12-26 10:53:36+0100 | f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Pastes the clipboard contents to current position" +msgstr "" +"Преноси садржај клипборда на текућу позицију|~\n" +"Налепљује садржај клипборда на тренутном положају.|~" + +#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f +#. modified: ilic | 2011-05-06 17:32:07+0200 +#. modified: ilic | 2011-05-22 10:36:53+0200 | f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Printing not implemented." +msgstr "" +"Штампање је завршено.|~\n" +"Штампање није изведено.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Line not available" +msgstr "" +"није доступно|~\n" +"ред недоступан|~" + +# |~x +# >> @title:window|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Save Directory Merge State As..." +msgstr "" +"Стапање директоријума|~\n" +"Уписивање стања стапања фасцикли као...|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#| msgid "" +#| "Merge|~\n" +#| "|~x" +msgid "" +"Merge\n" +"File" +msgstr "" +"Стопи|~\n" +"Стопи\n" +"фајл|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Identical\n" +"Files" +msgstr "" +"Прикажи идентичне фајлове|~\n" +"Истоветни\n" +"фајлови|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Compare Explicitly Selected Files" +msgstr "" +"Упореди изабрани фајл|~\n" +"Упореди изричито изабране фајлове|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Merge Explicitly Selected Files" +msgstr "" +"Упореди изабрани фајл|~\n" +"Стопи изричито изабране фајлове|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Current\n" +"Delta" +msgstr "" +"Иди на текућу делту|~\n" +"Текућа\n" +"делта|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"First\n" +"Delta" +msgstr "" +"Иди на прву делту|~\n" +"Прва\n" +"делта|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Last\n" +"Delta" +msgstr "" +"Иди на последњу делту|~\n" +"Последња\n" +"делта|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Prev\n" +"Delta" +msgstr "" +"Иди на претходну делту|~\n" +"Претходна\n" +"делта|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Next\n" +"Delta" +msgstr "" +"Иди на следећу делту|~\n" +"Следећа\n" +"делта|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Prev\n" +"Conflict" +msgstr "" +"Сукоб|~\n" +"Претходни\n" +"сукоб|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Next\n" +"Conflict" +msgstr "" +"Сукоб|~\n" +"Следећи\n" +"сукоб|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#| msgid "" +#| "Unsolved|~\n" +#| "|~x" +msgid "" +"Prev\n" +"Unsolved" +msgstr "" +"Нерешен|~\n" +"Претходни\n" +"нерешени|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#| msgid "" +#| "Unsolved|~\n" +#| "|~x" +msgid "" +"Next\n" +"Unsolved" +msgstr "" +"Нерешен|~\n" +"Следећи\n" +"нерешени|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Auto\n" +"Next" +msgstr "" +"Аутоматски избор|~\n" +"Аутоматски\n" +"следећи|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Line\n" +"Numbers" +msgstr "" +"Прикажи бројеве линија|~\n" +"Бројеви\n" +"редова|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Join Selected Diffs" +msgstr "" +"Упореди изабрани фајл|~\n" +"Споји изабране разлике|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "KDiff3-Usage" +msgstr "" +"KDiff3|~\n" +"Употреба &kdiff3-g;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "kdiff3" +msgstr "" +"KDiff3|~\n" +"&kdiff3-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show info dialogs" +msgstr "" +"Прикажи прозор А|~\n" +"Приказуј информативне дијалоге|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#| msgid "" +#| "Number of subdirectories:|~\n" +#| "|~x" +msgid "Max number of history entries:" +msgstr "" +"Број поддиректоријума:|~\n" +"Највећи број уноса историјата:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Error while adding manual diff range" +msgstr "" +"Грешка у току прављења директоријума.|~\n" +"Грешка при додавању ручног опсега разлике|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Expecting space after closing apostroph." +msgstr "Очекиван размак после затвореног апострофа.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Not matching apostrophs." +msgstr "Апострофи се не поклапају.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Unexpected apostroph within argument." +msgstr "Неочекиван апостроф унутар аргумента.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "No program specified." +msgstr "Наредба није задата.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Unix" +msgstr "&unix-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Error: Changed and Deleted" +msgstr "Грешка: измењено и обрисано.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show Files only in A" +msgstr "Прикажи фајлове само у А|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Files\n" +"only in A" +msgstr "" +"Фајлови\n" +"само у А|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show Files only in B" +msgstr "Прикажи фајлове само у Б|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Files\n" +"only in B" +msgstr "" +"Фајлови\n" +"само у Б|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show Files only in C" +msgstr "Прикажи фајлове само у Ц|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Files\n" +"only in C" +msgstr "" +"Фајлови\n" +"само у Ц|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Choose\n" +"A" +msgstr "" +"Изаберите\n" +"А|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Choose\n" +"B" +msgstr "" +"Изаберите\n" +"Б|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Choose\n" +"C" +msgstr "" +"Изаберите\n" +"Ц|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"White\n" +"Characters" +msgstr "" +"Знакови\n" +"празнина|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"White\n" +"Deltas" +msgstr "" +"Делте\n" +"празнина|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Run Regular Expression Auto Merge" +msgstr "Аутоматски стопи по регуларним изразима|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Split Diff At Selection" +msgstr "Подели разлику на избору|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Joachim Eibl" +msgstr "&joachimeibl-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-file in the source package for details." +msgstr "" +"Не могу да припремим &kdiff3-a; део.\n" +"Ово је обично проблем у инсталацији. Прочитајте фајл README из изворног пакета за више детаља.|~\n" +"Не могу да припремим &kdiff3-a; део.\n" +"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +msgid "For more documentation, see the help-menu or the subdirectory doc." +msgstr "" +"За више документације, погледајте мени помоћи или потфасциклу doc.|~\n" +"За више документације, погледајте мени помоћи или потфасциклу ~!|‘doc’|.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Ignored. (User defined.)" +msgstr "Игнорисано (кориснички дефинисано).|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" +msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"||~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show list of config settings and current values." +msgstr "Наброји поставке и тренутне вредности из поставе.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"There is a line end style conflict. Please choose the line end style manually.\n" +"File not saved.\n" +msgstr "" +"Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" +"Фајл није сачуван.\n" +"|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Color for manually aligned difference ranges:" +msgstr "Боја ручно поравнатих опсега разлика:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Align B and C for 3 input files" +msgstr "Поравнај Б и Ц за три улазна фајла|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" +"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n" +"Није препоручљиво за стапање зато што га може учинити сложенијим.\n" +"Подразумевано је искључено.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Show a dialog with information about the number of conflicts." +msgstr "Приказује дијалог са информацијом о броју сукоба.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Automatic Merge Regular Expression" +msgstr "Регуларни израз за аутоматско стапање|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Auto merge regular expression:" +msgstr "Регуларни израз за аутоматско стапање:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Run regular expression auto merge on merge start" +msgstr "Аутоматски стопи по регуларном изразу на почетку стапања|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" +"Спроводи стапање регуларним изразом чим стапање почне.\n" +"|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Version Control History Merging" +msgstr "Стапање историјата управљања верзијама|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "History start regular expression:" +msgstr "Регуларни израз за почетак историјата:|~" + +# literal-segment: Log|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" +"Регуларни израз за почетак уноса у историјату управљања верзијама.\n" +"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n" +"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "History entry start regular expression:" +msgstr "Регуларни израз за почетак уноса историјата:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"See the documentation for details." +msgstr "" +"Унос у историјату управљања верзијама чини неколико редова.\n" +"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n" +"Користите заграде да групишете кључеве по којима ће се ређати.\n" +"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n" +"Детаље потражите у документацији.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "History merge sorting" +msgstr "Ређање у стапању историјата|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Sort version control history by a key." +msgstr "Ређа историјат управљања верзијама по кључу.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "History entry start sort key order:" +msgstr "Редослед ређања за кључеве уноса историјата:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Each pair of parentheses used in the regular expression for the history start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" +"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n" +"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n" +"Ако се остави празно, ређање се не спроводи.\n" +"Детаље потражите у документацији.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Merge version control history on merge start" +msgstr "Стопи историјат управљања верзијама на почетку стапања|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Run version control history automerge on merge start." +msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања.|~" + +# skip-rule: t-cut|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса.|~" + +# >> @action:button|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Test your regular expressions" +msgstr "Испробај регуларне изразе|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Irrelevant merge command:" +msgstr "Наредба при безначајном стапању:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" +"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n" +"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" +"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n" +"Слично опцији командне линије --auto.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" +"If the file is not Unicode then the selected encoding will be used as fallback.\n" +"(Unicode detection depends on the first bytes of a file.)" +msgstr "" +"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n" +"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n" +"Откривање &unicode-g; зависи од првих бајтова у фајлу.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for saving." +msgstr "" +"Ако је укључено, узима се кодирање према улазним фајловима.\n" +"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"List of command line options that should be ignored when KDiff3 is used by other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" +"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n" +"Више вредности можете задати раздвојене тачка-запетом.\n" +"Овим се сузбија грешка „непозната опција“.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Quit also via Escape key" +msgstr "Напуштање и преко тастера &esc-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" +"Брз начин напуштања.\n" +"За оне навикнуте на тастер &esc-n; у ову сврху.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Integrate with ClearCase" +msgstr "Уклопи са &clearcase-i;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" +"Уклапање са &ibm-imp; &clearcase_rm-i;.\n" +"Уноси измене у фајл ~!/map/ у &clearcase-lzp; потфасцикли ~!|lib/mgrs|.\n" +"Активно само ако је &clearcase-nzp; фасцикла ~!/bin/ у путањи.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Restore the old \"map\" file from before doing the ClearCase integration." +msgstr "Враћа стари фајл ~!/map/, какав је био пре уклапања са &clearcase-i;.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Don't save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" +"Неке улазни знакови не могу да се претворе у &unicode-a;.\n" +"Можда сте изабрали погрешно кодирање (нпр. &utf8-n; за не-&utf8-; фајлове).\n" +"Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" +"Погођени улазни фајлови налазе се у %1.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Nothing is selected in either diff input window." +msgstr "Ништа није изабрано ни у једном прозору улаза разлике.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Regular Expression Tester" +msgstr "Проба регуларних израза|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Example auto merge line:" +msgstr "Пример реда за аутоматско стапање:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "To test auto merge, copy a line as used in your files." +msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Match result:" +msgstr "Резултат поклапања:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Example history start line (with leading comment):" +msgstr "Пример почетног реда историјата (са водећим коментаром):|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "History sort key order:" +msgstr "Редослед ређања кључева историјата:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Example history entry start line (without leading comment):" +msgstr "Пример почетног реда ставке историјата (без водећег коментара):|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар.|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Sort key result:" +msgstr "Резултат ређања кључева:|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу.|~" + +#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 +msgid "Case sensitive filename comparison" +msgstr "Поређење имена фајлова разликује величину слова|~" + +#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 +msgid "" +"The directory comparison will compare files or directories when their names match.\n" +"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" +msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено.|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Opening files...|~" +msgid "Open File" +msgstr "Отварам фајлове...|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Done.|~" +msgid "Done" +msgstr "Готово.|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Show Space && Tabulator Characters for Differences|~" +msgid "Show Space && Tabulator Characters" +msgstr "Прикажи знакове размака и табулатора за разлике|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "KDiff3Part|~" +msgid "KDiff3 Part" +msgstr "&Kdiff3-n; део|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2012-09-21 21:00:16+0200 | o +#. modified: ilic | 2018-02-16 11:13:31+0100 +msgid "Ok" +msgstr "У реду|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Don't solve conflicts automatically. (For compatibility...)|~" +msgid "Don't solve conflicts automatically." +msgstr "Не решавај сукобе аутоматски. За сагласност...|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "File Save Error|~" +msgid "File view font" +msgstr "Грешка уписивања фајла|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Unfold All Subdirs|~" +msgid "Unfold all subdirectories on load" +msgstr "Рашири све потфасцикле|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "Directory|~" +msgid "Open Directory" +msgstr "Фасцикла|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-05-19 13:24:07+0200 | o +#~ msgid "&OK" +#~ msgstr "&У реду|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-05-19 13:24:07+0200 | o +#~ msgid "OK" +#~ msgstr "У реду|~" + +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#. modified: ilic | 2018-03-16 13:23:42+0100 | of +#, fuzzy +#~| msgid "(c) 2002-2011 Joachim Eibl|~" +#~ msgid "(c) 2002-2014 Joachim Eibl" +#~ msgstr "© 2002–2011, &joachimeibl-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ 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" +#~ "Ако знате како ово да поновите, контактирајте аутора програма.|~\n" +#~ "Ово никада не треба да се догоди:\n" +#~ "\n" +#~ "~!|mergeResultSaved: m_pMFI=0|\n" +#~ "\n" +#~ "Ако знате како ово да поновите, обратите се аутору програма.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Program Error" +#~ msgstr "" +#~ "Програмска грешка|~\n" +#~ "Грешка у програму|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Error." +#~ msgstr "Грешка.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Done." +#~ msgstr "Готово.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Show Space && Tabulator Characters for Differences" +#~ msgstr "Прикажи знакове размака и табулатора за разлике|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "KDiff3Part" +#~ msgstr "" +#~ "KDiff3Part|~\n" +#~ "&Kdiff3-n; део|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Select Font" +#~ msgstr "" +#~ "Изаберите фонт|~\n" +#~ "Изабери фонт|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ 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" +#~ "\n" +#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" +#~ "ширине, можете искусити проблеме у току уређивања.\n" +#~ "\n" +#~ "Желите ли да наставите или ћете изабрати други фонт?|~\n" +#~ "Изабрали сте фонт променљиве ширине.\n" +#~ "\n" +#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" +#~ "ширине, можете искусити проблеме у току уређивања.\n" +#~ "\n" +#~ "Желите ли да наставите или да изаберете други фонт?|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Stephan Binner" +#~ msgstr "" +#~ "Штефан Бинер (Stephan Binner)|~\n" +#~ "&stephanbinner-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "David Faure" +#~ msgstr "" +#~ "Давид Фор (David Faure)|~\n" +#~ "&davidfaure-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Bernd Gehrmann" +#~ msgstr "" +#~ "Бернд Герман (Bernd Gehrmann)|~\n" +#~ "&berndgehrmann-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "KDE4 porting" +#~ msgstr "" +#~ "Пребацивање на КДЕ4|~\n" +#~ "Преношење на &kde4-a;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Albert Astals Cid" +#~ msgstr "" +#~ "Алберт Асталс Сид (~!/Albert Astals Cid/)|~\n" +#~ "&albertastalscid-n;|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" +#~ msgstr "" +#~ "+ Много хвала онима који су пријављивали грешке и допринели својим идејама!|~\n" +#~ "+ Пуно хвала свима који су пријављивали грешке и прилагали идеје!|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Don't solve conflicts automatically. (For compatibility...)" +#~ msgstr "" +#~ "Не решавај сукобе аутоматски. (За компатибилност...)|~\n" +#~ "Не решавај сукобе аутоматски. За сагласност...|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Italic font for deltas" +#~ msgstr "Курзивни фонт за делте|~" + +# |~x +# rewrite-msgid: /italic characters/italics/|~ +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ 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" +#~ "Ако фонт не подржава курзивне знакове, онда ово не ради ништа.|~\n" +#~ "Бира курзивну верзију фонта за разлике.\n" +#~ "Ако фонт не подржава курзив, онда ово не ради ништа.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Incompatible Font" +#~ msgstr "" +#~ "Некомпатибилан фонт|~\n" +#~ "Несагласан фонт|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Continue at Own Risk" +#~ msgstr "" +#~ "Наставите на сопствени ризик|~\n" +#~ "Настави на моју одговорност|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Select Another Font" +#~ msgstr "" +#~ "Изаберите други фонт|~\n" +#~ "Изабери други фонт|~" + +# |~x +# >> @title:window|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Incompatible font." +#~ msgstr "" +#~ "Некомпатибилан фонт|~\n" +#~ "Несагласан фонт|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Continue at my own risk" +#~ msgstr "" +#~ "Наставите на сопствени ризик|~\n" +#~ "Настави на моју одговорност|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Select another font" +#~ msgstr "" +#~ "Изаберите други фонт|~\n" +#~ "Изабери други фонт|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~| msgid "" +#~| "From Clipboard|~\n" +#~| "|~x" +#~ msgid "Clipboard-patch" +#~ msgstr "" +#~ "Из клипборда|~\n" +#~ "Закрпа за клипборд|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "KIO-Help" +#~ msgstr "" +#~ "Помоћ|~\n" +#~ "Помоћ за &ioslave-ak;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. reviewed: ilic | 2012-06-24 18:06:44+0200 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~| msgid "" +#~| "Directory Comparison Status|~\n" +#~| "|~x" +#~ msgid "Directory Equality-Coloring patch" +#~ msgstr "" +#~ "Статус поређења директоријума|~\n" +#~ "Закрпа за бојење једнакости фасцикли|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Sergey Zorin" +#~ msgstr "" +#~ "Грешка стапања|~\n" +#~ "&sergeyzorin-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "(c) 2002-2011 Joachim Eibl" +#~ msgstr "© 2002–2011, &joachimeibl-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Eike Sauer" +#~ msgstr "&eikesauer-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Bugfixes, Debian package maintainer" +#~ msgstr "Исправке грешака, одржавалац &debian-gmp; пакета|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Sebastien Fricker" +#~ msgstr "&sebastienfricker-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Windows installer" +#~ msgstr "Инсталатер за &windowsos-a;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "i18n-help" +#~ msgstr "Помоћ у интернационализацији|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Stefan Partheymueller" +#~ msgstr "&stefanpartheymueller-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Class CvsIgnoreList from Cervisia" +#~ msgstr "Класа ~!/CvsIgnoreList/ из &cervisia-g;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Andre Woebbeking" +#~ msgstr "&andrewoebbeking-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Class StringMatcher" +#~ msgstr "Класа ~!/StringMatcher/|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Michael Denio" +#~ msgstr "&michaeldenio-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Manfred Koehler" +#~ msgstr "&manfredkoehler-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Fix for slow startup on Windows" +#~ msgstr "Поправка за споро покретање под &windowsos-i;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Diff Ext for Windows" +#~ msgstr "Проширење за разликовање под &windowsos-i;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" +#~ msgstr "&pauleggert-n;, &mikehaertel-n;, &davidhayes-n;, &richardmstallman-n;, &leonardhtower-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "GNU-Diffutils" +#~ msgstr "&Gnu-nzkp; алатке за разликовање|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Tino Boellsterling, Timothy Mee" +#~ msgstr "&tinoboellsterling-n;, &timothymee-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Intensive test, use and feedback" +#~ msgstr "Интензивно испробавање, употреба и реаговања|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Michael Schmidt" +#~ msgstr "&michaelschmidt-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Mac support" +#~ msgstr "Подршка за &maccomp-a;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Valentin Rusu" +#~ msgstr "&valentinrusu-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "Silvan Scherrer" +#~ msgstr "&silvanscherrer-n;|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "OS2 port" +#~ msgstr "Преношење на &os2-a;|~" + +#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f +#. modified: ilic | 2011-05-06 17:32:07+0200 +#. modified: ilic | 2011-05-22 10:36:53+0200 | f +#. modified: ilic | 2011-09-04 09:42:36+0200 | of +#, fuzzy +#~ msgid "Dos/Windows" +#~ msgstr "Про&зор|~" + +#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f +#. modified: ilic | 2011-05-06 17:32:07+0200 +#. modified: ilic | 2011-05-22 10:36:53+0200 | f +#. modified: ilic | 2011-09-04 09:42:36+0200 | of +#, fuzzy +#~ msgid "Autodetect" +#~ msgstr "Аутоматски избор|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2010-12-16 14:52:29+0100 | of +#, fuzzy +#~ msgid "Pastes the clipboard contents to actual position" +#~ msgstr "Преноси садржај клипборда на текућу позицију|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1 +#. modified: ilic | 2010-03-16 15:29:51+0100 | o +#~ msgid "" +#~ "Data loss error:\n" +#~ "If it is reproducable please contact the author.\n" +#~ msgstr "" +#~ "Грешка, губитак података:\n" +#~ "Ако је можете поновити, контактирајте аутора.\n" +#~ "|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-05-02 13:13:50+0200 | of +#, fuzzy +#~ msgid "" +#~ "On: Pressing tab generates the appropriate number of spaces.\n" +#~ "Off: A Tab-character will be inserted." +#~ msgstr "" +#~ "Укључено: Притиском на таб генерише се одговарајући број размака.\n" +#~ "Искључено: Знак табулатора ће бити убачен.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-05-02 13:13:50+0200 | of +#, fuzzy +#~ msgid "" +#~ "Extends the antipattern to anything that would be ignored by CVS.\n" +#~ "Via local \".cvsignore\"-files this can be directory specific." +#~ msgstr "" +#~ "Проширује антиоблик на све што би CVS игнорисао.\n" +#~ "Преко локалних фајлова „.cvsignore“ ово може бити посебно по директоријуму.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-05-02 13:13:50+0200 | of +#, fuzzy +#~ 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 "" +#~ "Када треба снимити фајл преко старог фајла, стари фајл ће бити\n" +#~ "преименован са наставком „.orig“ уместо да буде обрисан.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-05-02 13:13:50+0200 | of +#, fuzzy +#~ msgid "" +#~ "Choose the language of the GUI-strings or \"Auto\".\n" +#~ "For a change of language to take place, quit and restart KDiff3." +#~ msgstr "" +#~ "Изаберите језик за исписе у програму или „Auto“.\n" +#~ "Да би измена језика била примењена, затворите и поново покрените KDiff3.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-03-21 13:26:32+0100 | of +#, fuzzy +#~ msgid "Show &Statusbar" +#~ msgstr "Приказуј &статусну линију|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-03-21 13:26:32+0100 | of +#, fuzzy +#~ msgid "Trust the size and date, but use binary comparison if date doesn't match (unsafe)" +#~ msgstr "Веруј величини и датуму, али користи бинарно упоређивање ако се датум не поклапа (није безбедно)|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-03-21 13:26:32+0100 | of +#, fuzzy +#~ msgid "" +#~ "Assume that files are equal if the modification date and file length are equal.\n" +#~ "If the date isn't equal but the sizes are, use binary comparison.\n" +#~ "Useful for big directories or slow networks." +#~ msgstr "" +#~ "Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" +#~ "Ако датуми нису исти али величина јесте, користи бинарно упоређивање.\n" +#~ "Корисно за велике директоријуме или споре мреже.|~" + +#. modified: simic | 2009-01-14 14:49:28+0100 | 1f +#. modified: ilic | 2009-01-23 19:36:45+0100 | of +#, fuzzy +#~ msgid "Directory Merge" +#~ msgstr "Стапање директоријума|~" Index: trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3fileitemactionplugin.po (nonexistent) +++ trunk/l10n-support/sr/summit-ascript/messages/kdereview/kdiff3fileitemactionplugin.po (revision 1522187) @@ -0,0 +1,120 @@ +# Ascription shadow for kdiff3fileitemactionplugin.po +# Copyright same as for the original catalog. +# License same as for the original catalog. +# Ascriber +# ===== DO NOT EDIT MANUALLY ===== +msgid "" +msgstr "" +"Project-Id-Version: kdiff3fileitemactionplugin\n" +"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" +"POT-Creation-Date: 2012-06-24 18:03+0200\n" +"PO-Revision-Date: 2018-02-16 11:13+0100\n" +"Last-Translator: Ascriber \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "KDiff3 ..." +msgstr "&Kdiff3-n;...|~" + +# >> %1 file path|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Compare with %1" +msgstr "Упореди са %1|~" + +# >> %1 file path|~ +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Merge with %1" +msgstr "Стопи са %1|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Save '%1' for later" +msgstr "Сачувај „%1“ за касније|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "3-way merge with base" +msgstr "Тространо стопи са базом|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Compare with ..." +msgstr "Упореди са...|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Clear list" +msgstr "Очисти списак|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "Compare" +msgstr "Упореди|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "3 way comparison" +msgstr "Тространо упореди|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "About KDiff3 menu plugin ..." +msgstr "О прикључку менија за &kdiff3-a;...|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "" +"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +"KDiff3 homepage: http://kdiff3.sourceforge.net\n" +"\n" +msgstr "" +"Прикључак за радње над фајловима &kdiff3-g;: © 2011, &joachimeibl-n;\n" +"Домаћа страница &kdiff3-g;: http://kdiff3.sourceforge.net\n" +"\n" +"|~" + +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +msgid "About KDiff3 File Item Action Plugin" +msgstr "О прикључку за радње над фајловима &kdiff3-g;|~" + +# >! Wtf: ...then the branch to merge...|~ +#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f +#, fuzzy +#| msgid "" +#| "Using the contextmenu extension:\n" +#| "For simple comparison of two selected files choose \"Compare\".\n" +#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#| "Same also applies to directory comparison and merge.|~" +msgid "" +"Using the contextmenu extension:\n" +"For simple comparison of two selected files choose \"Compare\".\n" +"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n" +"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +"Same also applies to directory comparison and merge." +msgstr "" +"Коришћење проширења контекстног менија:\n" +"За једноставно поређење, изаберите „~%/Compare/“.\n" +"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" +"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" +"Исто важи за поређење и стапање фасцикли.|~" + +# >! Wtf: ...then the branch to merge...|~ +# |~e0 +#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 +#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 +#. modified: ilic | 2018-02-16 11:13:31+0100 | o +#~ msgid "" +#~ "Using the contextmenu extension:\n" +#~ "For simple comparison of two selected files choose \"Compare\".\n" +#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" +#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" +#~ "Same also applies to directory comparison and merge." +#~ msgstr "" +#~ "Коришћење проширења контекстног менија:\n" +#~ "За једноставно поређење, изаберите Compare.\n" +#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију Compare with .... Затим употребите Compare with ... над другим фајлом.\n" +#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па 3-way merge with base на другој грани која ће бити одредиште.\n" +#~ "Исто важи за поређење и стапање фасцикли.|~\n" +#~ "Коришћење проширења контекстног менија:\n" +#~ "За једноставно поређење, изаберите „~%/Compare/“.\n" +#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" +#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" +#~ "Исто важи за поређење и стапање фасцикли.|~" Index: trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3fileitemactionplugin.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3fileitemactionplugin.po (revision 1522186) +++ trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3fileitemactionplugin.po (nonexistent) @@ -1,120 +0,0 @@ -# Ascription shadow for kdiff3fileitemactionplugin.po -# Copyright same as for the original catalog. -# License same as for the original catalog. -# Ascriber -# ===== DO NOT EDIT MANUALLY ===== -msgid "" -msgstr "" -"Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" -"POT-Creation-Date: 2012-06-24 18:03+0200\n" -"PO-Revision-Date: 2018-02-16 11:13+0100\n" -"Last-Translator: Ascriber \n" -"Language-Team: Serbian \n" -"Language: sr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "KDiff3 ..." -msgstr "&Kdiff3-n;...|~" - -# >> %1 file path|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Compare with %1" -msgstr "Упореди са %1|~" - -# >> %1 file path|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Merge with %1" -msgstr "Стопи са %1|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Save '%1' for later" -msgstr "Сачувај „%1“ за касније|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "3-way merge with base" -msgstr "Тространо стопи са базом|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Compare with ..." -msgstr "Упореди са...|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Clear list" -msgstr "Очисти списак|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Compare" -msgstr "Упореди|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "3 way comparison" -msgstr "Тространо упореди|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "About KDiff3 menu plugin ..." -msgstr "О прикључку менија за &kdiff3-a;...|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 homepage: http://kdiff3.sourceforge.net\n" -"\n" -msgstr "" -"Прикључак за радње над фајловима &kdiff3-g;: © 2011, &joachimeibl-n;\n" -"Домаћа страница &kdiff3-g;: http://kdiff3.sourceforge.net\n" -"\n" -"|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "About KDiff3 File Item Action Plugin" -msgstr "О прикључку за радње над фајловима &kdiff3-g;|~" - -# >! Wtf: ...then the branch to merge...|~ -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#| "Same also applies to directory comparison and merge.|~" -msgid "" -"Using the contextmenu extension:\n" -"For simple comparison of two selected files choose \"Compare\".\n" -"If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on the second file.\n" -"For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -"Same also applies to directory comparison and merge." -msgstr "" -"Коришћење проширења контекстног менија:\n" -"За једноставно поређење, изаберите „~%/Compare/“.\n" -"Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" -"За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" -"Исто важи за поређење и стапање фасцикли.|~" - -# >! Wtf: ...then the branch to merge...|~ -# |~e0 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "" -#~ "Using the contextmenu extension:\n" -#~ "For simple comparison of two selected files choose \"Compare\".\n" -#~ "If the other file is somewhere else \"Save\" the first file for later. It will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second file.\n" -#~ "For a 3-way merge first \"Save\" the base file, then the branch to merge and choose \"3-way merge with base\" on the other branch which will be used as destination.\n" -#~ "Same also applies to directory comparison and merge." -#~ msgstr "" -#~ "Коришћење проширења контекстног менија:\n" -#~ "За једноставно поређење, изаберите Compare.\n" -#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију Compare with .... Затим употребите Compare with ... над другим фајлом.\n" -#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па 3-way merge with base на другој грани која ће бити одредиште.\n" -#~ "Исто важи за поређење и стапање фасцикли.|~\n" -#~ "Коришћење проширења контекстног менија:\n" -#~ "За једноставно поређење, изаберите „~%/Compare/“.\n" -#~ "Ако је други фајл негде другде, прво сачувајте први фајл. Појавиће се у подменију „~%/Compare with .../“. Затим употребите „~%/Compare with .../“ над другим фајлом.\n" -#~ "За тространо стапање, прво сачувајте базни фајл, затим на грану за стапање, па „~%/3-way merge with base/“ на другој грани која ће бити одредиште.\n" -#~ "Исто важи за поређење и стапање фасцикли.|~" Index: trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3._desktop_.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3._desktop_.po (revision 1522186) +++ trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3._desktop_.po (nonexistent) @@ -1,101 +0,0 @@ -# Ascription shadow for desktop_extragear-utils_kdiff3.po -# Copyright same as for the original catalog. -# License same as for the original catalog. -# Ascriber -# ===== DO NOT EDIT MANUALLY ===== -msgid "" -msgstr "" -"Project-Id-Version: desktop_extragear-utils_kdiff3\n" -"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" -"POT-Creation-Date: 2009-01-02 15:39+0100\n" -"PO-Revision-Date: 2018-02-23 09:26+0100\n" -"Last-Translator: Ascriber \n" -"Language-Team: Serbian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 -#. modified: simic | 2009-01-21 14:09:09+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgctxt "Name" -msgid "KDiff3" -msgstr "" -"KDiff3|~\n" -"&kdiff3-n;|~" - -#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 -#. modified: simic | 2009-01-21 14:09:09+0100 | 1 -#. modified: simic | 2010-03-13 02:27:53+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgctxt "GenericName" -msgid "Diff/Patch Frontend" -msgstr "" -"Интерфејс за diff и patch|~\n" -"Интерфејс за diff и patch|~\n" -"Сучеље за diff и patch|~\n" -"Прочеље за diff и patch|~\n" -"Прочеље за ~!/diff/ и ~!/patch/|~" - -#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgctxt "Comment" -msgid "A File And Directory Comparison And Merge Tool" -msgstr "" -"Алат за поређење и стапање фајлова и директоријума|~\n" -"Алатка за поређење и стапање фајлова и фасцикли|~" - -#. modified: uhero | 2008-06-25 02:03:00+0200 | 1 -#. modified: simic | 2009-01-21 14:09:09+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgctxt "Name" -msgid "KDiff3Part" -msgstr "" -"KDiff3Part|~\n" -"&kdiff3part-n;|~\n" -"&Kdiff3-n; део|~" - -#. modified: simic | 2009-01-21 14:09:09+0100 | 1 -#. modified: simic | 2010-03-13 02:27:53+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-23 09:26:46+0100 | o -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories with KDiff3" -#~ msgstr "" -#~ "Упореди/стопи Фајлове/директоријуме &kdiff3-i;|~\n" -#~ "Упореди/стопи фајлове/директоријуме &kdiff3-i;|~\n" -#~ "Поређење и стапање фајлова и фасцикли &kdiff3-i;|~" - -#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-23 09:26:46+0100 | o -#~| msgctxt "" -#~| "Name|~\n" -#~| "|~x" -#~| msgid "" -#~| "KDiff3|~\n" -#~| "|~x" -#~ msgctxt "X-KDE-Submenu" -#~ msgid "KDiff3" -#~ msgstr "" -#~ "&kdiff3-n;|~\n" -#~ "|~e0" - -#. modified: simic | 2009-01-21 14:09:09+0100 | 1 -#. modified: simic | 2010-03-13 02:27:53+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgctxt "Name" -#~ msgid "Compare/Merge Files/Directories" -#~ msgstr "" -#~ "Упореди/стопи Фајлове/директоријуме|~\n" -#~ "Упореди/стопи фајлове/директоријуме|~\n" -#~ "Поређење и стапање фајлова и фасцикли|~" Index: trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3.po =================================================================== --- trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3.po (revision 1522186) +++ trunk/l10n-support/sr/summit-ascript/messages/playground-devtools/kdiff3.po (nonexistent) @@ -1,5123 +0,0 @@ -# Ascription shadow for kdiff3.po -# Copyright same as for the original catalog. -# License same as for the original catalog. -# Ascriber -# ===== DO NOT EDIT MANUALLY ===== -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: kde-i18n-sr@kde.org\n" -"POT-Creation-Date: 2009-01-14 14:50+0100\n" -"PO-Revision-Date: 2018-05-19 13:24+0200\n" -"Last-Translator: Ascriber \n" -"Language-Team: Serbian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "" -"Слободан Симић|~\n" -"Слободан Симић,Часлав Илић|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2010-01-31 22:23:21+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "" -"simicsl@verat.net|~\n" -"slsimic@gmail.com|~\n" -"slsimic@gmail.com,caslav.ilic@gmx.net|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Writing clipboard data to temp file failed." -msgstr "Уписивање података из клипборда у привремени фајл није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "From Clipboard" -msgstr "Из клипборда|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" -"Предобрада је вероватно неуспешна. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Наредба предобраде ће сада бити искључена.|~\n" -"Изгледа да је предобрада пропала. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Наредба предобраде ће сада бити деактивирана.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" -"Предобрада поклапања линија је неуспешна. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Предобрада поклапања линија ће сада бити искључена.|~\n" -"Изгледа да је предобрада поклапања редова пропала. Проверите ову наредбу:\n" -"\n" -" %1\n" -"\n" -"Предобрада поклапања редова сада ће бити деактивирана.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Severe Internal Error" -msgstr "Озбиљна унутрашња грешка|~" - -# |~x -# >! Merge whole string. -# >> @item:intext|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File" -msgstr "" -"Фајл|~\n" -"фајл|~" - -# |~x -# >> @item:intext|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Line" -msgstr "" -"Линија|~\n" -"ред|~" - -# |~x -# >! Merge whole string.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Top line" -msgstr "" -"Највиша линија|~\n" -"Први ред|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "End" -msgstr "Крај|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Mix of links and normal files." -msgstr "Мешавина веза и нормалних фајлова.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Link: " -msgstr "Веза: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Size. " -msgstr "Величина: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Date & Size: " -msgstr "Датум и величина: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Creating temp copy of %1 failed." -msgstr "Прављење привремене копије фајла %1 није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Opening %1 failed." -msgstr "Отварање фајла %1 није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Comparing file..." -msgstr "Упоређујем фајл...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error reading from %1" -msgstr "Грешка при читању из %1|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Name" -msgstr "" -"Име|~\n" -"име|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Operation" -msgstr "" -"Операција|~\n" -"поступак|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Status" -msgstr "" -"Статус|~\n" -"стање|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unsolved" -msgstr "" -"Нерешен|~\n" -"нерешено|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Solved" -msgstr "" -"Решен|~\n" -"решено|~" - -# |~x -# >> non-whitespace -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Nonwhite" -msgstr "" -"Не-бело|~\n" -"непразно|~" - -# |~x -# >> whitespace -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "White" -msgstr "" -"Бела|~\n" -"празно|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?" -msgstr "" -"Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и поново скенирате директоријум?|~\n" -"Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново скенирате фасциклу?|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Warning" -msgstr "Упозорење|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Rescan" -msgstr "Поново скенирај|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Continue Merging" -msgstr "Настави стапање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Opening of directories failed:" -msgstr "" -"Отварање директоријума није успело:|~\n" -"Отварање фасцикли није успело:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. А „%1“ не постоји или није директоријум.\n" -"|~\n" -"Фасцикла А „%1“ не постоји или није фасцикла.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. Б „%1“ не постоји или није директоријум.\n" -"|~\n" -"Фасцикла Б „%1“ не постоји или није фасцикла.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. Ц „%1“ не постоји или није директоријум.\n" -"|~\n" -"Фасцикла Ц „%1“ не постоји или није фасцикла.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Directory Open Error" -msgstr "" -"Грешка при отварању директоријума|~\n" -"Грешка при отварању фасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"The destination directory must not be the same as A or B when three directories are merged.\n" -"Check again before continuing." -msgstr "" -"Одредишни директоријум не сме бити исти као А или Б када се стапају три директоријума.\n" -"Проверите поново пре него наставите.|~\n" -"Одредишна фасцикла не сме бити иста као А или Б када се стапају три фасцикле.\n" -"Проверите поново пре него што наставите.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Parameter Warning" -msgstr "Упозорење о параметрима|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Scanning directories..." -msgstr "" -"Прегледам директоријуме...|~\n" -"Скенирам фасцикле...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reading Directory A" -msgstr "" -"Читам директоријум А|~\n" -"Читам фасциклу А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reading Directory B" -msgstr "" -"Читам директоријум Б|~\n" -"Читам фасциклу Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reading Directory C" -msgstr "" -"Читам директоријум Ц|~\n" -"Читам фасциклу Ц|~" - -# |~x -# >! Merge sentence.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Some subdirectories were not readable in" -msgstr "" -"Неки поддиректоријуми нису били читљиви у|~\n" -"Неке потфасцикле нису биле читљиве у|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Check the permissions of the subdirectories." -msgstr "" -"Проверите дозволе поддиректоријума.|~\n" -"Проверите дозволе потфасцикли.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Ready." -msgstr "Спреман.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Directory Comparison Status" -msgstr "" -"Статус поређења директоријума|~\n" -"Стање поређења фасцикли|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Number of subdirectories:" -msgstr "" -"Број поддиректоријума:|~\n" -"Број потфасцикли:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Number of equal files:" -msgstr "Број једнаких фајлова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Number of different files:" -msgstr "Број различитих фајлова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Number of manual merges:" -msgstr "Број ручних стапања:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "This affects all merge operations." -msgstr "" -"Ово утиче на све операције стапања.|~\n" -"Ово утиче на све поступке стапања.|~" - -# |~x -# >> @title:window|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Changing All Merge Operations" -msgstr "" -"Мењам све операције стапања|~\n" -"Мењање свих поступака стапања|~" - -# |~x -# >! Merge sentence.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Processing " -msgstr "" -"Обрађујем |~\n" -"|~e0" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "To do." -msgstr "Урадити.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copy A to B" -msgstr "Копирај А у Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copy B to A" -msgstr "Копирај Б у А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Delete A" -msgstr "Обриши А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Delete B" -msgstr "Обриши Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Delete A & B" -msgstr "Обриши А и Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge to A" -msgstr "Стопи у А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge to B" -msgstr "Стопи у Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge to A & B" -msgstr "" -"Стопи А и Б|~\n" -"Стопи у А и Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Delete (if exists)" -msgstr "Обриши (ако постоји)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge" -msgstr "Стопи|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge (manual)" -msgstr "Стопи (ручно)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: Conflicting File Types" -msgstr "" -"Грешка: Сукобљени типови фајлова|~\n" -"Грешка: сукобљени типови фајлова.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: Dates are equal but files are not." -msgstr "" -"Грешка: Датуми су једнаки али фајлови нису.|~\n" -"Грешка: датуми су једнаки али фајлови нису.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "This operation is currently not possible." -msgstr "" -"Ова операција тренутно није могућа.|~\n" -"Овај поступак тренутно није могућ.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Operation Not Possible" -msgstr "" -"Операција није могућа|~\n" -"Поступак није могућ|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "An error occurred while copying.\n" -msgstr "" -"Дошло је до грешке у току копирања.\n" -"|~\n" -"Грешка у току копирања.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error" -msgstr "Грешка|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge Error" -msgstr "Грешка стапања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Not saved." -msgstr "" -"Није снимљено.|~\n" -"Није сачувано.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unknown merge operation. (This must never happen!)" -msgstr "" -"Непозната операција стапања. (Ово никад не сме да се деси!)|~\n" -"Непознат поступак стапања. (Ово никада не сме да се догоди!)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unknown merge operation." -msgstr "" -"Непозната операција стапања.|~\n" -"Непозната поступак стапања.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -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" -"Пазите да програм још увек има бета статус и нема НИКАКВИХ ГАРАНЦИЈА уопште! Направите резерву својих најважнијих података!|~\n" -"Стапање ће управо почети.\n" -"\n" -"Изаберите Do It ако сте прочитали инструкције и знате шта радите.\n" -"Изаберите Simulate It ако бисте прво да видите шта би се догодило.\n" -"\n" -"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!|~\n" -"Стапање ће управо почети.\n" -"\n" -"Изаберите „~%/Do It/“ ако сте прочитали инструкције и знате шта радите.\n" -"Изаберите „~%/Simulate It/“ ако бисте прво да видите шта би се догодило.\n" -"\n" -"Пазите да је програм још увек у стању бете и нема апсолутно НИКАКВИХ ГАРАНЦИЈА! Направите резерве важних података!|~" - -# |~x -# >> @title:window|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Starting Merge" -msgstr "" -"Почињем стапање|~\n" -"Почетак стапања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Do It" -msgstr "Уради|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Simulate It" -msgstr "Симулирај|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "The highlighted item has a different type in the different directories. Select what to do." -msgstr "" -"Истакнута ставка има различит тип у различитим директоријумима. Изаберите шта је чинити.|~\n" -"Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта урадити.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "The modification dates of the file are equal but the files are not. Select what to do." -msgstr "" -"Датуми измене фајла су једнаки али фајлови нису. Изаберите шта је чинити.|~\n" -"Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "This operation is currently not possible because directory merge is currently running." -msgstr "" -"Ова операција тренутно није могућа зато што је стапање директоријума у току.|~\n" -"Овај поступак тренутно није могућ зато што је у току стапање фасцикли.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -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" -"Желите ли да наставите са ставком која је изазвала грешку или желите да је прескочите?|~\n" -"Грешка у последњем кораку.\n" -"Желите ли да наставите са ставком која је изазвала грешку или да је прескочите?|~" - -# |~x -# >> @title:window|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Continue merge after an error" -msgstr "" -"Настави стапање после грешке|~\n" -"Настављање стапања после грешке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Continue With Last Item" -msgstr "Настави са последњом ставком|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Skip Item" -msgstr "Прескочи ставку|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Skipped." -msgstr "Прескочено.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "In progress..." -msgstr "У току...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge operation complete." -msgstr "" -"Операција стапања је завршена.|~\n" -"Поступак стапања је завршен.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge Complete" -msgstr "" -"Стапање је завршено|~\n" -"Стапање завршено|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" -"Симулирано стапање је завршено: Проверите да ли се слажете са предложеним операцијама.|~\n" -"Симулирано стапање је завршено: проверите да ли вам одговарају предложени поступци.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Дошло је до грешке. Притисните „У реду“ да бисте видели детаљне информације.\n" -"|~\n" -"Дошло је до грешке. Кликните на OK да добијете детаљне информације.\n" -"|~\n" -"Дошло је до грешке. Кликните на „~%/OK/“ да добијете детаљне информације.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: While deleting %1: Creating backup failed." -msgstr "" -"Грешка: У току брисања %1: Прављење резерве није успело.|~\n" -"Грешка: у току брисања %1, прављење резерве није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "delete directory recursively( %1 )" -msgstr "" -"обриши директоријум рекурзивно( %1 )|~\n" -"рекурзивно брисање фасцикле (%1)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "delete( %1 )" -msgstr "" -"обриши( %1 )|~\n" -"брисање (%1)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" -"Грешка: Операција брисања директоријума није успела у току покушаја да се директоријум прочита.|~\n" -"Грешка: поступак брисања фасцикле није успео на месту читања фасцикле.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: rmdir( %1 ) operation failed." -msgstr "" -"Грешка: Операција rmdir( %1 ) није успела.|~\n" -"Грешка: поступак уклањања фасцикле (%1) није успео.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: delete operation failed." -msgstr "" -"Грешка: Операција брисања није успела.|~\n" -"Грешка: поступак брисања није успео.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" -"ручно стапање( %1, %2, %3 -> %4)|~\n" -"ручно стапање (%1, %2, %3 → %4)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid " Note: After a manual merge the user should continue by pressing F7." -msgstr "" -" Напомена: После ручног стапања корисник би требало да настави помоћу F7.|~\n" -" Напомена: после ручног стапања корисник треба да настави притиском на &f7-a;.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"Грешка: Копирање( %1 -> %2 ) није успело. Брисање постојећег одредишта није успело.|~\n" -"Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "copyLink( %1 -> %2 )" -msgstr "" -"копирање везе( %1 -> %2 )|~\n" -"копирање везе (%1 → %2 )|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" -"Грешка: Копирање везе није успело: Удаљене везе још увек нису подржане.|~\n" -"Грешка: копирање везе није успело, удаљене везе још нису подржане.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: copyLink failed." -msgstr "" -"Грешка: Копирање везе није успело.|~\n" -"Грешка: копирање везе није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "copy( %1 -> %2 )" -msgstr "" -"копирај( %1 -> %2 )|~\n" -"копирање (%1 → %2)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" -"Грешка у току преименовања( %1 -> %2 ): Не могу да обришем постојеће одредиште.|~\n" -"Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се обрише.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "rename( %1 -> %2 )" -msgstr "" -"преименуј( %1 -> %2 )|~\n" -"преименовање (%1 → %2)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error: Rename failed." -msgstr "" -"Грешка: Преименовање није успело.|~\n" -"Грешка: преименовање није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" -"Грешка у току прављења директоријума %1. Не могу да обришем постојећи фајл.|~\n" -"Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "makeDir( %1 )" -msgstr "" -"направи директоријум( %1 )|~\n" -"прављење фасцикле (%1)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error while creating directory." -msgstr "" -"Грешка у току прављења директоријума.|~\n" -"Грешка у току прављења фасцикле.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dest" -msgstr "" -"Одр.|~\n" -"Одредиште|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir" -msgstr "" -"Дир.|~\n" -"фасцикла|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Type" -msgstr "" -"Врста|~\n" -"тип|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Size" -msgstr "" -"Величина|~\n" -"величина|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Attr" -msgstr "" -"Атр.|~\n" -"атрибути|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Last Modification" -msgstr "" -"Последња измена|~\n" -"последња измена|~" - -# |~x -# >> @title:column|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Link-Destination" -msgstr "" -"Веза-одредиште|~\n" -"одредиште везе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "not available" -msgstr "" -"није доступно|~\n" -"недоступно|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A (Dest): " -msgstr "" -"А (одр.): |~\n" -"А (одредиште): |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A (Base): " -msgstr "А (база): |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "B (Dest): " -msgstr "" -"Б (одр.): |~\n" -"Б (одредиште): |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "C (Dest): " -msgstr "" -"Ц (одр.): |~\n" -"Ц (одредиште): |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dest: " -msgstr "" -"Одр.: |~\n" -"Одредиште: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Start/Continue Directory Merge" -msgstr "" -"Покрени/настави стапање директоријума|~\n" -"Покрени/настави стапање фасцикли|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Run Operation for Current Item" -msgstr "" -"Покрени операцију за текућу ставку|~\n" -"Изврши поступак за текућу ставку|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Compare Selected File" -msgstr "Упореди изабрани фајл|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge Current File" -msgstr "Стопи текући фајл|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Fold All Subdirs" -msgstr "" -"Сажми све поддиректоријуме|~\n" -"Сажми све потфасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unfold All Subdirs" -msgstr "" -"Рашири све поддиректоријуме|~\n" -"Рашири све потфасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose A for All Items" -msgstr "Изабери А за све ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose B for All Items" -msgstr "Изабери Б за све ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose C for All Items" -msgstr "Изабери Ц за све ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto-Choose Operation for All Items" -msgstr "" -"Аутоматски изабери операцију за све ставке|~\n" -"Аутоматски изабери поступак за све ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "No Operation for All Items" -msgstr "" -"Нема операције за све ставке|~\n" -"Нема поступка за све ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Identical Files" -msgstr "" -"Прикажи идентичне фајлове|~\n" -"Прикажи истоветне фајлове|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Different Files" -msgstr "Прикажи различите фајлове|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Do Nothing" -msgstr "Не ради ништа|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A" -msgstr "" -"A|~\n" -"А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "B" -msgstr "" -"B|~\n" -"Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "C" -msgstr "" -"C|~\n" -"Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Delete A && B" -msgstr "Обриши А и Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge to A && B" -msgstr "Стопи у А и Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"While trying to make a backup, deleting an older backup failed. \n" -"Filename: " -msgstr "" -"У току покушаја да се направи резерва, брисање старије резерве није успело.\n" -"Име фајла: |~\n" -"При покушају прављења резерве, брисање старије резерве није успело.\n" -"Име фајла: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"While trying to make a backup, renaming failed. \n" -"Filenames: " -msgstr "" -"У току покушаја да се направи резерва, преименовање није успело.\n" -"Имена фајлова: |~\n" -"При покушају прављења резерве, преименовање није успело.\n" -"Имена фајлова: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Getting file status: %1" -msgstr "" -"Добављам статус фајла: %1|~\n" -"Добављам стање фајла: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reading file: %1" -msgstr "Читам фајл: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Writing file: %1" -msgstr "Пишем фајл: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Out of memory" -msgstr "" -"Нема меморије|~\n" -"Нема више меморије|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Making directory: %1" -msgstr "" -"Правим директоријум: %1|~\n" -"Правим фасциклу: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Removing directory: %1" -msgstr "" -"Уклањам директоријум: %1|~\n" -"Уклањам фасциклу: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Removing file: %1" -msgstr "Уклањам фајл: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Creating symbolic link: %1 -> %2" -msgstr "" -"Правим симболичку везу: %1 -> %2|~\n" -"Правим симболичку везу: %1 → %2|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Renaming file: %1 -> %2" -msgstr "" -"Уклањам фајл: %1 -> %2|~\n" -"Преименујем фајл: %1 → %2|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copying file: %1 -> %2" -msgstr "" -"Копирам фајл: %1 -> %2|~\n" -"Копирам фајл: %1 → %2|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during file copy operation: Opening file for reading failed. Filename: %1" -msgstr "" -"Грешка током операције копирања фајлова: Отварање фајла за читање није успело. Име фајла: %1|~\n" -"Грешка током поступка копирања фајлова: отварање фајла ради читања није успело. Име фајла: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "" -"Грешка током операције копирања фајлова: Отварање фајла за писање није успело. Име фајла: %1|~\n" -"Грешка током поступка копирања фајлова: отварање фајла ради писања није успело. Име фајла: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" -"Грешка током операције копирања фајлова: Читање није успело. Име фајла: %1|~\n" -"Грешка током поступка копирања фајлова: читање није успело. Име фајла: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" -"Грешка током операције копирања фајлова: Писање није успело. Име фајла: %1|~\n" -"Грешка током поступка копирања фајлова: писање није успело. Име фајла: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reading directory: " -msgstr "" -"Читам директоријум: |~\n" -"Читам фасциклу: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Listing directory: %1" -msgstr "" -"Листам директоријум: %1|~\n" -"Листам фасциклу: %1|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Cancel" -msgstr "" -"&Откажи|~\n" -"&Одустани|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Current Configuration:" -msgstr "" -"Тренутно подешавање:|~\n" -"Тренутна постава:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Config Option Error:" -msgstr "" -"Грешка опције подешавања:|~\n" -"Грешка поставне опције:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Option --auto used, but no output file specified." -msgstr "Опција --auto је употребљена, али није наведен излазни фајл.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Option --auto ignored for directory comparison." -msgstr "" -"Опција --auto се игнорише за поређење директоријума.|~\n" -"Опција --auto се игнорише за поређење фасцикли.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saving failed." -msgstr "" -"Снимање није успело.|~\n" -"Уписивање није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Opening of these files failed:" -msgstr "Отварање ових фајлова није успело:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Open Error" -msgstr "Грешка при отварању фајла|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Opens documents for comparison..." -msgstr "" -"Отвара документе за поређење...|~\n" -"Отвара документе за поређење.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Reload" -msgstr "Учитај поново|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" -"Снима резултат стапања. Сви сукоби морају бити разрешени!|~\n" -"Уписује резултат стапања. Сви сукоби морају бити разрешени.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saves the current document as..." -msgstr "" -"Снима текуће документе као...|~\n" -"Уписује текуће документе под именом.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Print the differences" -msgstr "" -"Штампај разлике|~\n" -"Штампа разлике.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Quits the application" -msgstr "" -"Излази из програма|~\n" -"Напушта програм.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "" -"Исеца изабрану секцију и ставља је у клипборд|~\n" -"Исеца изабрани одељак и ставља га у клипборд.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copies the selected section to the clipboard" -msgstr "" -"Копира тренутни избор у клипборд|~\n" -"Копира изабрани одељак у клипборд.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Select everything in current window" -msgstr "" -"Изабери све у текућем прозору|~\n" -"Изабира све у текућем прозору.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search for a string" -msgstr "" -"Потражи знаковни низ|~\n" -"Тражи ниску.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search again for the string" -msgstr "" -"Поново потражи знаковни низ|~\n" -"Поново тражи ниску.|~" - -# |~x -# >> @info:tooltip|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Enables/disables the statusbar" -msgstr "" -"Укључује/искључује статусну траку|~\n" -"Укључује/искључује траку стања.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Configure KDiff3..." -msgstr "" -"Подеси KDiff3...|~\n" -"Подеси &kdiff3-a;...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Current Delta" -msgstr "Иди на текућу делту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to First Delta" -msgstr "Иди на прву делту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Last Delta" -msgstr "Иди на последњу делту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" -"(прескаче разлике у белим размацима када је „Прикажи беле размаке“ искључено.)|~\n" -"(Прескаче разлике у празнинама ако је Show White Space искључено.)|~\n" -"(Прескаче разлике у празнинама ако је „~%/Show White Space/“ искључено.)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)" -msgstr "" -"(не прескаче разлике у белим размацима чак и када је „Прикажи беле размаке“ искључено.)|~\n" -"(Не прескаче разлике празнинама ни када је Show White Space искључено.)|~\n" -"(Не прескаче разлике празнинама ни када је „~%/Show White Space/“ искључено.)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Previous Delta" -msgstr "Иди на претходну делту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Next Delta" -msgstr "Иди на следећу делту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Previous Conflict" -msgstr "Иди на претходни сукоб|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Next Conflict" -msgstr "Иди на следећи сукоб|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Previous Unsolved Conflict" -msgstr "Иди на претходни нерешени сукоб|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Go to Next Unsolved Conflict" -msgstr "Иди на следећи нерешени сукоб|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Select Line(s) From A" -msgstr "" -"Изаберите линије из А|~\n" -"Изаберите редове из А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Select Line(s) From B" -msgstr "" -"Изаберите линије из Б|~\n" -"Изаберите редове из Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Select Line(s) From C" -msgstr "" -"Изаберите линије из Ц|~\n" -"Изаберите редове из Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show White Space" -msgstr "" -"Прикажи беле размаке|~\n" -"Прикажи празнине|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Line Numbers" -msgstr "" -"Прикажи бројеве линија|~\n" -"Прикажи бројеве редова|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose A Everywhere" -msgstr "Свуда изабери А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose B Everywhere" -msgstr "Свуда изабери Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose C Everywhere" -msgstr "Свуда изабери Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose A for All Unsolved Conflicts" -msgstr "Изабери А за све нерешене сукобе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose B for All Unsolved Conflicts" -msgstr "Изабери Б за све нерешене сукобе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose C for All Unsolved Conflicts" -msgstr "Изабери Ц за све нерешене сукобе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "" -"Изабери А за све нерешене сукобе белих размака|~\n" -"Изабери А за све нерешене сукобе празнина|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "" -"Изабери Б за све нерешене сукобе белих размака|~\n" -"Изабери Б за све нерешене сукобе празнина|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "" -"Изабери Ц за све нерешене сукобе белих размака|~\n" -"Изабери Ц за све нерешене сукобе празнина|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Automatically Solve Simple Conflicts" -msgstr "Аутоматски реши једноставне сукобе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Set Deltas to Conflicts" -msgstr "Постави делте на сукобе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Automatically Solve History Conflicts" -msgstr "" -"Аутоматски реши сукобе историје|~\n" -"Аутоматски реши сукобе историјата|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Window A" -msgstr "Прикажи прозор А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Window B" -msgstr "Прикажи прозор Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Window C" -msgstr "Прикажи прозор Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Focus Next Window" -msgstr "Фокусирај следећи прозор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Normal Overview" -msgstr "Нормалан преглед|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A vs. B Overview" -msgstr "Преглед А према Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A vs. C Overview" -msgstr "Преглед А према Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "B vs. C Overview" -msgstr "Преглед Б према Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Word Wrap Diff Windows" -msgstr "" -"Diff прозори прелома речи|~\n" -"Прелом речи у прозорима разлика|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Add Manual Diff Alignment" -msgstr "" -"Додај ручно Diff поравнање|~\n" -"Додај ручно поравнање разлика|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Clear All Manual Diff Alignments" -msgstr "" -"Очисти сва ручна Diff поравнања|~\n" -"Очисти сва ручна поравнања разлика|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Focus Prev Window" -msgstr "Фокусирај претходни прозор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Toggle Split Orientation" -msgstr "" -"Промени оријентацију раздвајања|~\n" -"Пребаци оријентацију поделе|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir && Text Split Screen View" -msgstr "" -"Подељени приказ екрана за дир. и текст|~\n" -"Подељени приказ екрана на фасциклу и текст|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Toggle Between Dir && Text View" -msgstr "" -"Промени између дир. и текст. приказа|~\n" -"Пребаци приказ фасцикле и текста|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "The merge result hasn't been saved." -msgstr "" -"Резултат стапања није снимљен.|~\n" -"Резултат стапања није сачуван.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Save && Quit" -msgstr "" -"Сними и изађи|~\n" -"Сачувај и напусти|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Quit Without Saving" -msgstr "" -"Изађи без снимања|~\n" -"Напусти без уписивања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saving the merge result failed." -msgstr "" -"Снимање резултата стапања није успело.|~\n" -"Уписивање резултата стапања није успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "" -"Тренутно стапате директоријуме. Желите ли заиста да прекинете?|~\n" -"Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saving file..." -msgstr "" -"Снимам фајл...|~\n" -"Уписујем фајл...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Saving file with a new filename..." -msgstr "" -"Снимам фајл под новим именом...|~\n" -"Уписујем фајл под новим именом...|~" - -# |~x -# >> @title:window|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Save As..." -msgstr "" -"Сними као...|~\n" -"Уписивање као|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Printing..." -msgstr "Штампам...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Selection" -msgstr "Избор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Printing completed." -msgstr "" -"Штампање је завршено.|~\n" -"Штампање завршено.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Printing aborted." -msgstr "" -"Штампање је обустављено.|~\n" -"Штампање обустављено.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Exiting..." -msgstr "" -"Излазим...|~\n" -"Напуштам...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Toggling toolbar..." -msgstr "" -"Укључујем/искључујем траку са алатима...|~\n" -"Пребацујем траку алатки...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Toggle the statusbar..." -msgstr "" -"Укључи/искључи статусну траку...|~\n" -"Пребацујем траку стања...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Couldn't find files for comparison." -msgstr "" -"Нисам могао да нађем фајлове за поређење.|~\n" -"Не могу да нађем фајлове за поређење.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&KDiff3" -msgstr "" -"&KDiff3|~\n" -"&&Kdiff3-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Configure KDiff3" -msgstr "" -"Подеси KDiff3|~\n" -"Подеси &kdiff3-a;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "KDiff3" -msgstr "" -"KDiff3|~\n" -"&&Kdiff3-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&File" -msgstr "&Фајл|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Directory" -msgstr "" -"&Директоријум|~\n" -"Ф&асцикла|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Current Item Merge Operation" -msgstr "" -"Операција стапања текуће ставке|~\n" -"Поступак стапања текуће ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Current Item Sync Operation" -msgstr "" -"Операција синх. текуће ставке|~\n" -"Поступак синхронизовања текуће ставке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Movement" -msgstr "&Кретање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "D&iffview" -msgstr "" -"D&iff приказ|~\n" -"Приказ &разлике|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Merge" -msgstr "" -"&Стопи|~\n" -"&Стапање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Window" -msgstr "Про&зор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Main Toolbar" -msgstr "Главна трака|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Cancel" -msgstr "Одустани|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Help" -msgstr "Помоћ|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Defaults" -msgstr "" -"Уобичајене вредности|~\n" -"Подразумевано|~" - -# |~x -# >> @title:menu|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Edit" -msgstr "" -"&Уређивање|~\n" -"|~e0" - -# |~x -# >> @title:menu|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Settings" -msgstr "" -"&Подешавања|~\n" -"&Подешавање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Help" -msgstr "П&омоћ|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&About" -msgstr "&О пројекту|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A&uthor" -msgstr "&Аутор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Thanks To" -msgstr "&Захвалнице|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Open" -msgstr "Отвори|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Save" -msgstr "Сачувај|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Print..." -msgstr "Штампај...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Quit" -msgstr "Напусти|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Cut" -msgstr "Исеци|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copy" -msgstr "Копирај|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Paste" -msgstr "Налепи|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Select All" -msgstr "Изабери све|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Show Toolbar" -msgstr "" -"Прикажи траку са алатима|~\n" -"Прикажи траку алатки|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Configure %1..." -msgstr "" -"&Подеси %1...|~\n" -"&Подеси %1..." -"|/|" -"&Подеси $[аку %1]...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "About" -msgstr "О програму|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Find" -msgstr "Нађи|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Find Next" -msgstr "Нађи следеће|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Ignore" -msgstr "Игнориши|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Exit" -msgstr "" -"Изађи|~\n" -"Напусти|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Continue" -msgstr "Настави|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" -"Алат за упоређивање и стапање фајлова и директоријума|~\n" -"Алатка за поређење и стапање фајлова и фасцикли|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge the input." -msgstr "Стопи улаз.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Explicit base file. For compatibility with certain tools." -msgstr "" -"Експлицитан базни фајл. За компатибилност са одређеним алатима.|~\n" -"Изричит базни фајл. За сагласност са појединим алаткама.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" -"Излазни фајл. Имплицира -m. Нпр.: -o newfile.txt|~\n" -"Излазни фајл. Имплицира ~!/-m/. Нпр: ~!/-o novifajl.txt/|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "" -"Излазни фајл, поново. (За компатибилност са одређеним алатима.)|~\n" -"Излазни фајл, поново. За сагласност са појединим алаткама.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" -"Без GUI-ја ако су сви сукоби аутоматски решиви. (Захтева -o file)|~\n" -"Без &gui-g; ако су сви сукоби решиви аутоматски. Захтева ~!/-o fajl/.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Visible name replacement for input file 1 (base)." -msgstr "" -"Видљива замена имена за улазни фајл 1 (базни).|~\n" -"Замена видљивог имена за улазни фајл 1 (базни).|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Visible name replacement for input file 2." -msgstr "" -"Видљива замена имена за улазни фајл 2.|~\n" -"Замена видљивог имена за улазни фајл 2.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Visible name replacement for input file 3." -msgstr "" -"Видљива замена имена за улазни фајл 3.|~\n" -"Замена видљивог имена за улазни фајл 3.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" -"Алтернатива видљивој замени имена. Задајте ово једном за сваки улаз.|~\n" -"Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Use a different config file." -msgstr "" -"Користи други фајл подешавања.|~\n" -"Употреби други поставни фајл.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "file1 to open (base, if not specified via --base)" -msgstr "" -"фајл1 за отварање (базни, ако није наведен преко --base)|~\n" -"Фајл 1 за отварање (базни, ако није наведен преко --base).|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "file2 to open" -msgstr "" -"фајл2 за отворање|~\n" -"Фајл 2 за отварање.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "file3 to open" -msgstr "" -"фајл3 за отворање|~\n" -"Фајл 3 за отварање.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" -"Број преосталих нерешених сукоба: %1 (од којих су %2 бели размаци)|~\n" -"Број преосталих нерешених сукоба: %1 (од чега %2 празнине).|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" -"Излаз је измењен.\n" -"Ако наставите, ваше измене ће бити изгубљене.|~\n" -"Излаз је измењен.\n" -"Ако наставите измене ће бити изгубљене.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "All input files are binary equal." -msgstr "" -"Сви улазни фајлови су бинарно једнаки.|~\n" -"Сви улазни фајлови бинарно су једнаки.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "All input files contain the same text." -msgstr "Сви улазни фајлови садрже исти текст.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Files %1 and %2 are binary equal.\n" -msgstr "" -"Фајлови %1 и %2 су бинарно једнаки.\n" -"|~\n" -"Фајлови %1 и %2 бинарно су једнаки.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Files %1 and %2 have equal text.\n" -msgstr "" -"Фајлови %1и %2имају једнак текст.\n" -"|~\n" -"Фајлови %1 и %2 садрже исти текст.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Total number of conflicts: " -msgstr "Укупан број сукоба: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"\n" -"Nr of automatically solved conflicts: " -msgstr "" -"\n" -"Број аутоматски решених сукоба: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"\n" -"Nr of unsolved conflicts: " -msgstr "" -"\n" -"Број нерешених сукоба: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Conflicts" -msgstr "Сукоби|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:06:20+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "" -msgstr "" -"<Нема изв. линије>|~\n" -"<нема изворног реда>|~\n" -"<нема изворног реда>|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "" -msgstr "" -"<Сукоб у стапању (само бели размаци)>|~\n" -"<сукоб стапања (само празнине)>|~\n" -"<сукоб стапања (само празнине)>|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "" -msgstr "" -"<Сукоб у стапању>|~\n" -"<сукоб стапања>|~\n" -"<сукоб стапања>|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved.\n" -msgstr "" -"Још увек нису решени сви сукоби.\n" -"Фајл није снимљен.\n" -"|~\n" -"Још нису решени сви сукоби.\n" -"Фајл није сачуван.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Conflicts Left" -msgstr "Преостали сукоби|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" -"\n" -"\n" -"Прављење резерве није успело. Фајл није снимљен.|~\n" -"\n" -"\n" -"Прављење резерве није успело. Фајл није сачуван.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Save Error" -msgstr "" -"Грешка у снимању фајла|~\n" -"Грешка уписивања фајла|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Error while writing." -msgstr "" -"Грешка приликом писања.|~\n" -"Грешка при писању.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Output" -msgstr "Излаз|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "[Modified]" -msgstr "" -"[Измењен]|~\n" -"[измењен]|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Encoding for saving" -msgstr "" -"Кодирање за снимање|~\n" -"Кодирање за уписивање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Line end style:" -msgstr "" -"Стил завршетка линије:|~\n" -"Стил краја редова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 -msgid "DOS" -msgstr "" -"DOS|~\n" -"&dos-n;|~\n" -"&dosos-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Conflict" -msgstr "Сукоб|~" - -# |~x -# >! Merge sentence.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Codec from" -msgstr "" -"Кодирање из|~\n" -"|~e0" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unicode, 8 bit" -msgstr "" -"Unicode, 8-битно|~\n" -"&unicode-n;, 8-битни|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Unicode" -msgstr "" -"Unicode|~\n" -"&unicode-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Latin1" -msgstr "" -"Latin1|~\n" -"&latin1-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" -"Измените ово ако се знакови који нису ASCII не приказују исправно.|~\n" -"Измените ово ако су не-&ascii-; знакови погрешно приказани.|~" - -# |~x -# >> @title:window|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Configure" -msgstr "" -"Подеси|~\n" -"Подешавање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Font" -msgstr "Фонт|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Editor & Diff Output Font" -msgstr "" -"Фонт уређивача и раз. излаза|~\n" -"Фонт уређивача и излаза разлике|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Color" -msgstr "Боја|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Colors Settings" -msgstr "" -"Подешавања боја|~\n" -"Поставке боја|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Editor and Diff Views:" -msgstr "" -"Уређивач и Diff прикази:|~\n" -"Уређивач и прикази разлика:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Foreground color:" -msgstr "" -"Боја исписа:|~\n" -"Боја текста:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Background color:" -msgstr "Боја позадине:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff background color:" -msgstr "Боја позадине разлика:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Color A:" -msgstr "Боја А:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Color B:" -msgstr "Боја Б:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Color C:" -msgstr "Боја Ц:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Conflict color:" -msgstr "Боја сукоба:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Current range background color:" -msgstr "Позадинска боја текућег опсега:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Current range diff background color:" -msgstr "Позадинска боја текућег опсега разлика:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Directory Comparison View:" -msgstr "" -"Приказ поређења директоријума:|~\n" -"Приказ поређења фасцикли:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Newest file color:" -msgstr "Боја најновијег фајла:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Changing this color will only be effective when starting the next directory comparison." -msgstr "" -"Измена ове боје ће утицати само када покренете поређење следећег директоријума.|~\n" -"Измена ове боје ступиће на снагу од првог наредног поређења фасцикли.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Oldest file color:" -msgstr "Боја најстаријег фајла:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Middle age file color:" -msgstr "Боја фајла средње старости:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Color for missing files:" -msgstr "Боја за недостајуће фајлове:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Editor" -msgstr "Уређивач|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Editor Behavior" -msgstr "Понашање уређивача|~" - -# |~x -# skip-rule: t-tab|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Tab inserts spaces" -msgstr "" -"Таб убацује размаке|~\n" -"&Tab-n; умеће размаке|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Tab size:" -msgstr "" -"Величина таба:|~\n" -"Величина табулатора:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto indentation" -msgstr "Аутоматско увлачење|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Укључено: Увлачење претходне линије користи се за нову линију.\n" -"|~\n" -"Укључено: увлачење претходног реда узима се за нови ред.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto copy selection" -msgstr "Аутоматско копирање избора|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitely copy e.g. via Ctrl-C." -msgstr "" -"Укључено: Сваки избор се одмах уписује у клипборд.\n" -"Искључено: Морате експлицитно копирати, нрп. помоћу Ctrl+C.|~\n" -"Укључено: сваки избор се одмах уписује у клипборд.\n" -"Искључено: морате изричито копирати, нпр. помоћу ~!/&ctrl-n;+C/.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" -"Поставља завршетке линија када се измењени фајл снима.\n" -"DOS/Windows: CR+LF; Unix: LF; са CR=0D, LF=0A|~\n" -"Поставља завршетке редова када се измењени фајл сачува.\n" -"&Dos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/.|~\n" -"Поставља завршетке редова када се измењени фајл сачува.\n" -"&dosos-n;/&windowsos-n; ~!/CR+LF/, &unix-n; ~!/LF/, где је ~!/CR=0D, LF=0A/.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff" -msgstr "" -"Diff|~\n" -"Разликовање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff Settings" -msgstr "" -"Подешавања разликовања|~\n" -"Поставке разликовања|~" - -# |~x -# >! Merge sentence.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Treat as white space." -msgstr "" -"Третирај као размаке.|~\n" -"Третирај као празнине.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Ignore numbers" -msgstr "Игнориши бројеве|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white space.)\n" -"Might help to compare files with numeric data." -msgstr "" -"Игнориши бројевне знакове током фазе поклапања линија. (Слично игнорисању белих размака.)\n" -"Може вам помоћи при упоређивању фајлова са нумеричким подацима.|~\n" -"Игнориши цифарске знакове у фази поклапања редова (слично игнорисању празнина).\n" -"Може бити корисно при поређењу фајлова са нумеричким подацима.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Ignore C/C++ comments" -msgstr "" -"Игнориши C/C++ коментаре|~\n" -"Игнориши &clang-;/&cpp-; коментаре|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Treat C/C++ comments like white space." -msgstr "" -"Третирај C/C++ коментаре као беле размаке.|~\n" -"Третирај &clang-;/&cpp-; коментаре као празнине.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Ignore case" -msgstr "" -"Игнориши велика/мала слова|~\n" -"Игнориши величину слова|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" -"Третира разлику у величини као промене белог простора. („a“<=>„A“)|~\n" -"Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’).|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Preprocessor command:" -msgstr "Предобрадна наредба:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" -"Кориснички дефинисана предобрада. (Погледајте документацију за детаље.)|~\n" -"Кориснички дефинисана предобрада. Погледајте документацију за детаље.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Line-matching preprocessor command:" -msgstr "" -"Предобрадна наредба за поклапање линија:|~\n" -"Предобрадна наредба за поклапање редова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" -"Предобрада се користи само током поклапања линија.\n" -"(Погледајте документацију за детаље.)|~\n" -"Предобрада се користи само током поклапања редова.\n" -"Погледајте документацију за детаље.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Try hard (slower)" -msgstr "Потруди се (спорије)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" -"Укључује опцију --minimal за спољашње разликовање.\n" -"Анализа великих фајлова ће бити много спорија.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Merge Settings" -msgstr "Поставке стапања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto advance delay (ms):" -msgstr "" -"Застој аутоматског напредовања (ms):|~\n" -"Застој аутоматског напредовања (~!/ms/):|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -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 "" -"У режиму аутоматског напредовања резултат текућег избора приказује се \n" -"наведено време, пре скока на следећи сукоб. Опсег: 0-2000 ms|~\n" -"У режиму аутоматског напредовања резултат текућег избора приказује се \n" -"задато време пре скока на следећи сукоб. Опсег: 0–2000 ~!/ms/.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "White space 2-file merge default:" -msgstr "" -"Подразумевано стапање белих размака два фајла:|~\n" -"Подразумевано стапање празнина два фајла:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Manual Choice" -msgstr "Ручни избор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Allow the merge algorithm to automatically select an input for white-space-only changes." -msgstr "" -"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у белим размацима.|~\n" -"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у празнинама.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "White space 3-file merge default:" -msgstr "" -"Подразумевано стапање белих размака три фајла:|~\n" -"Подразумевано стапање празнина три фајла:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto save and quit on merge without conflicts" -msgstr "" -"Аутоматски сачувај и изађи при стапању без конфликата|~\n" -"Аутоматски сачувај и напусти при стапању без сукоба|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Recursive directories" -msgstr "" -"Рекурзивни директоријуми|~\n" -"Рекурзивно кроз фасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Whether to analyze subdirectories or not." -msgstr "" -"Да ли да се анализирају поддиректоријуми.|~\n" -"Да ли анализирати потфасцикле.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File pattern(s):" -msgstr "" -"Облици фајлова:|~\n" -"Обрасци фајлова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:06:20+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Облици фајлова које треба анализирати.\n" -"Џокери: „*“ и „?“\n" -"Више облика можете навести користећи раздвајач: „;“|~\n" -"Обрасци за фајлове које треба анализирати.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File-anti-pattern(s):" -msgstr "" -"Антиоблици фајлова:|~\n" -"Противобрасци фајлова:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Облици фајлова које треба искључити из анализе.\n" -"Џокери: „*“ и „?“\n" -"Више облика можете навести користећи раздвајач: „;“|~\n" -"Обрасци за фајлове које треба искључити из анализе.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir-anti-pattern(s):" -msgstr "" -"Антиоблици директоријума:|~\n" -"Противобрасци фасцикли:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" -"Облици директоријума које треба искључити из анализе.\n" -"Џокери: „*“ и „?“\n" -"Више облика можете навести користећи раздвајач: „;“|~\n" -"Обрасци за фасцикле које треба искључити из анализе.\n" -"Џокери: ‘*’ и ‘?’\n" -"Више образаца наводите са тачка-запетом као раздвајачем.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Use .cvsignore" -msgstr "" -"Користи фајл .cvsignore|~\n" -"Користи ~!/.cvsignore/|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Find hidden files and directories" -msgstr "" -"Пронађи скривене фајлове и директоријуме|~\n" -"Пронађи скривене фајлове и фасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Finds files and directories with the hidden attribute." -msgstr "" -"Налази фајлове и директоријуме са атрибутом скривених.|~\n" -"Налази фајлове и фасцикле са атрибутом скривености.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Finds files and directories starting with '.'." -msgstr "" -"Налази фајлове и директоријуме који почињу са „.“|~\n" -"Налази фајлове и фасцикле које почињу са ‘.’.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Follow file links" -msgstr "Прати везе фајлова|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" -"Укључено: Пореди фајлове на које показују везе.\n" -"Искључено: Пореди везе.|~\n" -"Укључено: пореди фајлове на које показују везе.\n" -"Искључено: пореди везе.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2015-10-14 18:13:08+0200 | 1 -msgid "Follow directory links" -msgstr "" -"Прати везе директоријума|~\n" -"Прати везе фасцили|~\n" -"Прати везе фасцикли|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" -"Укључено: Пореди директоријуме на које показују везе.\n" -"Искључено: Пореди везе.|~\n" -"Укључено: пореди фасцикле на које показују везе.\n" -"Искључено: пореди везе.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Comparison Mode" -msgstr "Режим поређења фајлова|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Binary comparison" -msgstr "Бинарно поређење|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Binary comparison of each file. (Default)" -msgstr "" -"Бинарно поређење за сваки фајл. (Подразумевано)|~\n" -"Бинарно поређење за сваки фајл (подразумевано).|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Full analysis" -msgstr "Пуна анализа|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" -"Ради пуну анализу и приказује статистичке податке у додатним колонама.\n" -"(Спорије него бинарно поређење, много спорије за бинарне фајлове.)|~\n" -"Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" -"Спорије него бинарно поређење, много спорије за бинарне фајлове.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Trust the size and modification date (unsafe)" -msgstr "" -"Веруј величини и датуму измене (није безбедно)|~\n" -"Веруј величини и датуму измене (несигурно)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"Files with equal contents but different modification dates will appear as different.\n" -"Useful for big directories or slow networks." -msgstr "" -"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" -"Фајлови са истим садржајем али различитим датумом измене ће се појавити као различити.\n" -"Корисно за велике директоријуме или споре мреже.|~\n" -"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" -"Фајлови са истим садржајем али различитим датумом измене сматраће се различитим.\n" -"Корисно за велике фасцикле или споре мреже.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Trust the size (unsafe)" -msgstr "" -"Веруј величини (није безбедно)|~\n" -"Веруј величини (несигурно)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during download." -msgstr "" -"Претпостави да су фајлови једнаки ако су њихове дужине једнаке.\n" -"Корисно за велике директоријуме или споре мреже када се датум измене у току преузимања.|~\n" -"Претпоставља да су фајлови једнаки ако им једнаке величине.\n" -"Корисно за велике фасцикле или споре мреже када се датум измени током преузимања.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Synchronize directories" -msgstr "" -"Синхронизуј директоријуме|~\n" -"Синхронизуј фасцикле|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" -"Нуди да складишти фајлове у оба директоријума тако\n" -"да су оба директоријума после тога иста.\n" -"Ради само када се пореде два директоријума без навођења одредишта.|~\n" -"Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" -"Ради само када се пореде две фасцикле без задавања одредишта.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "White space differences considered equal" -msgstr "" -"Разлике у белим размацима сматрају се једнаким|~\n" -"Разлике у празнинама сматрају се једнаким|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" -"Ако се фајлови разликују само у белим размацима, сматрају се једнаким.\n" -"Ово је активно само када се изабере пуна анализа.|~\n" -"Ако се фајлови разликују само у празнинама, сматрају се једнаким.\n" -"Ово је активно само када се изабере пуна анализа.|~" - -# |~x -# >> copy newer file|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copy newer instead of merging (unsafe)" -msgstr "" -"Копирај новији уместо стапања (није безбедно)|~\n" -"Копирај новији уместо стапања (несигурно)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -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 "" -"Не гледај унутра, само узми новији фајл.\n" -"(Користите ово само ако знате шта радите!)\n" -"Има ефекта само када се пореде два директоријума.|~\n" -"Не гледа садржај, само узима новији фајл.\n" -"Користите ово само ако знате шта радите!\n" -"Има ефекта само при поређењу две фасцикле.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Backup files (.orig)" -msgstr "" -"Резервиши фајлове (.orig)|~\n" -"Прави резерве фајлова (~!/.orig/)|~" - -# |~x -# rewrite-msgid: /Regional/Locale/|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Regional Settings" -msgstr "" -"Регионална подешавања|~\n" -"Поставке локалитета|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Language (restart required)" -msgstr "Језик (потребно поновно покретање)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Use the same encoding for everything:" -msgstr "" -"Користи исто кодирање за све:|~\n" -"Исто кодирање за све:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" -"Укључивањем овог можете променити сва кодирања променом само првог.\n" -"Искључите ово ако су потребна различита поједина подешавања.|~\n" -"Укључивањем овог можете променити сва кодирања променом само првог.\n" -"Искључите ово ако поједине поставке треба да буду различите.|~" - -# |~x -# >! Merge sentence.|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Note: Local Encoding is " -msgstr "" -"Напомна: Локално кодирање је |~\n" -"Напомена: локално кодирање је |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Encoding for A:" -msgstr "Кодирање фајла за А:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto Detect Unicode" -msgstr "" -"Аутоматски детектуј Unicode|~\n" -"Аутоматски откриј &unicode-a;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Encoding for B:" -msgstr "Кодирање фајла за Б:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Encoding for C:" -msgstr "Кодирање фајла за Ц:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Encoding for Merge Output and Saving:" -msgstr "" -"Кодирање фајла за стопљени излаз и снимање:|~\n" -"Кодирање фајла за стопљени излаз и уписивање:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Auto Select" -msgstr "" -"Аутоматски избор|~\n" -"Аутоматски изабери|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File Encoding for Preprocessor Files:" -msgstr "" -"Кодирање фајла за препроцесорке фајлове:|~\n" -"Кодирање фајла за предобрадне фајлове:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Right To Left Language" -msgstr "" -"Језици с десна у лево|~\n" -"Језици здесна улево|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" -"Неки језици се читају с десна у лево.\n" -"Ово подешавање ће прилагодити томе приказивач и уређивач.|~\n" -"Неки језици се читају здесна улево.\n" -"Ова поставка прилагођава томе приказивач и уређивач.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Integration" -msgstr "" -"Интеграција|~\n" -"Уклапање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Integration Settings" -msgstr "" -"Подешавања интеграције|~\n" -"Поставке уклапања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Command line options to ignore:" -msgstr "" -"Опције командне линије које се занемарују:|~\n" -"Занемари опције командне линије:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Remove ClearCase Integration" -msgstr "" -"Уклони ClearCase интеграцију|~\n" -"Уклони уклапање са &clearcase-i;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "This resets all options. Not only those of the current topic." -msgstr "" -"Ово ресетује све опције. Не само оне у текућој теми.|~\n" -"Ово ресетује све опције, и то не само оне у текућој теми.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "PreprocessorCmd: " -msgstr "" -"Препроцесорка наредба: |~\n" -"Наредба предобраде: |~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "The following option(s) you selected might change data:\n" -msgstr "" -"Следеће опције које сте изабрали могу изменити податке:\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" -"\n" -"Врло је вероватно да ово не желите приликом стапања.\n" -"Желите ли да искључите ова подешавања или да наставите даље са њима?|~\n" -"\n" -"Врло вероватно не желите ово приликом стапања.\n" -"Желите ли да искључите ове поставке или да наставите даље са њима?|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Option Unsafe for Merging" -msgstr "" -"Опција није сигурна за стапање|~\n" -"Опција несигурна за стапање|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Use These Options During Merge" -msgstr "Користи ове опције при стапању|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Disable Unsafe Options" -msgstr "Искључи несигурне опције|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Loading A" -msgstr "" -"Учитавам А|~\n" -"|~e0" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Loading B" -msgstr "" -"Учитавам Б|~\n" -"|~e0" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff: A <-> B" -msgstr "" -"Раз.: А <-> Б|~\n" -"Разликујем А и Б|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Linediff: A <-> B" -msgstr "" -"Раз.лин.: А <-> Б|~\n" -"Разликујем редове А и Б|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Loading C" -msgstr "" -"Учитавам Ц|~\n" -"|~e0" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff: B <-> C" -msgstr "" -"Раз.: Б <-> Ц|~\n" -"Разликујем Б и Ц|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Diff: A <-> C" -msgstr "" -"Раз.: А <-> Ц|~\n" -"Разликујем А и Ц|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Linediff: B <-> C" -msgstr "" -"Раз.лин.: Б <-> Ц|~\n" -"Разликујем редове Б и Ц|~" - -# |~x -# >> @info:progress|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Linediff: A <-> C" -msgstr "" -"Раз.лин.: А <-> Ц|~\n" -"Разликујем редове А и Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "All input files contain the same text, but are not binary equal." -msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Фајлови %1 и %2 имају исти текст али нису бинарно једнаки. \n" -"|~\n" -"Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" -"|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -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 "" -"Изгледа да неки улазни фајлови нису чисто текстуални.\n" -"Имајте на уму да KDiff3 стапање није намењено бинарним подацима.\n" -"Наставите на сопствени ризик.|~\n" -"Изгледа да неки улазни фајлови нису чисто текстуални.\n" -"Имајте на уму да стапање у &kdiff3-l; није намењено бинарним подацима.\n" -"Наставите на сопствену одговорност.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Abort" -msgstr "" -"Прекини|~\n" -"Обустави|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Opening files..." -msgstr "Отварам фајлове...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File open error" -msgstr "Грешка при отварању фајла|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Cutting selection..." -msgstr "Исецам изабрано...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copying selection to clipboard..." -msgstr "Копирам избор у клипборд...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Inserting clipboard contents..." -msgstr "Умећем садржај клипборда...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Save && Continue" -msgstr "" -"Сними и настави|~\n" -"Сачувај и настави|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Continue Without Saving" -msgstr "" -"Настави без снимања|~\n" -"Настави без уписивања|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search complete." -msgstr "" -"Претрага је завршена.|~\n" -"Претрага је готова.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search Complete" -msgstr "" -"Претрага је готова|~\n" -"Претрага завршена|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "A (Base):" -msgstr "А (база):|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "File..." -msgstr "Фајл...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Dir..." -msgstr "" -"Дир...|~\n" -"Фасцикла...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "C (Optional):" -msgstr "Ц (опционо):|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Swap/Copy Names ..." -msgstr "" -"Замени/Копирај имена ...|~\n" -"Размени/копирај имена...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Swap %1<->%2" -msgstr "" -"Замени %1<->%2|~\n" -"Размени %1 и %2|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Copy %1->Output" -msgstr "" -"Копирај %1->Излаз|~\n" -"Копирај %1 у излаз|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Swap %1<->Output" -msgstr "" -"Замени %1<->Излаз|~\n" -"Размени %1 и излаз|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Output (optional):" -msgstr "Излаз (опционо):|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Configure..." -msgstr "Подеси...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search text:" -msgstr "" -"Текст за претрагу:|~\n" -"Тражени текст:|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Case sensitive" -msgstr "" -"Разликуј мала и велика слова|~\n" -"Разликуј величину слова|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search A" -msgstr "Претражи А|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search B" -msgstr "Претражи Б|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search C" -msgstr "Претражи Ц|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Search output" -msgstr "Излаз претраге|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "&Search" -msgstr "&Тражи|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Match success." -msgstr "" -"Поклапање успешно.|~\n" -"Поклапање је успело.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -msgid "Match failed." -msgstr "Поклапање није успело.|~" - -#. modified: ilic | 2009-01-23 19:36:45+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Directory" -msgstr "" -"&Директоријум|~\n" -"Фасцикла|~" - -#. modified: ilic | 2009-03-06 11:49:07+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Encoding:" -msgstr "" -"Кодирање фајла за А:|~\n" -"Кодирање:|~" - -#. modified: ilic | 2009-03-06 11:49:07+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do." -msgstr "" -"Истакнута ставка има различит тип у различитим директоријумима. Изаберите шта је чинити.|~\n" -"Истакнута ставка је измењена у једној фасцикли а обрисана у другој. Изаберите шта урадити.|~" - -#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show &Status Bar" -msgstr "" -"Приказуј &статусну линију|~\n" -"Прикажи траку &стања|~" - -#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Trust the size and date, but use binary comparison if date does not match (unsafe)" -msgstr "" -"Веруј величини и датуму, али користи бинарно упоређивање ако се датум не поклапа (није безбедно)|~\n" -"Веруј величини и датуму, али бинарно упореди ако се датум не поклапа (несигурно)|~" - -#. modified: ilic | 2009-03-21 13:26:32+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Assume that files are equal if the modification date and file length are equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" -"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" -"Ако датуми нису исти али величина јесте, користи бинарно упоређивање.\n" -"Корисно за велике директоријуме или споре мреже.|~\n" -"Претпоставља да су фајлови једнаки ако су им једнаки датуми измене и величине.\n" -"Ако датуми нису исти али величина јесте, бинарно упоређује.\n" -"Корисно за велике фасцикле или споре мреже.|~" - -# |~x -# rewrite-msgid: /generate/insert/|~ -#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" -"Укључено: Притиском на таб генерише се одговарајући број размака.\n" -"Искључено: Знак табулатора ће бити убачен.|~\n" -"Укључено: притиском &tab-g; умеће се одговарајући број размака.\n" -"Искључено: умеће се знак табулатора.|~" - -#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" -"Проширује антиоблик на све што би CVS игнорисао.\n" -"Преко локалних фајлова „.cvsignore“ ово може бити посебно по директоријуму.|~\n" -"Проширује противобрасце на све што би игнорисао &cvs-n;.\n" -"Преко локалних фајлова ~!/.cvsignore/ ово може бити посебно по фасцикли.|~" - -#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"If a file would be saved over an old file, then the old file\n" -"will be renamed with a '.orig' extension instead of being deleted." -msgstr "" -"Када треба снимити фајл преко старог фајла, стари фајл ће бити\n" -"преименован са наставком „.orig“ уместо да буде обрисан.|~\n" -"Када фајл треба да буде сачуван преко старог фајла, стари фајл бива преименован са наставком ~!/.orig/ уместо да буде обрисан.|~" - -#. modified: ilic | 2009-05-02 13:13:50+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Choose the language of the GUI strings or \"Auto\".\n" -"For a change of language to take place, quit and restart KDiff3." -msgstr "" -"Изаберите језик за исписе у програму или „Auto“.\n" -"Да би измена језика била примењена, затворите и поново покрените KDiff3.|~\n" -"Изаберите језик ниски у сучељу, или „аутоматски“.\n" -"Напустите па покрените &kdiff3-a; да би промена језика ступила на снагу.|~" - -#. modified: ilic | 2010-03-16 15:29:51+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#| msgid "" -#| "Data loss error:\n" -#| "If it is reproducable please contact the author.\n" -#| "|~\n" -#| "|~x" -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" -"Грешка, губитак података:\n" -"Ако је можете поновити, контактирајте аутора.\n" -"|~\n" -"|~e0" - -# |~x -# >> @info:tooltip|~ -#. modified: ilic | 2010-12-16 14:52:29+0100 | 1f -#. modified: ilic | 2010-12-16 14:52:29+0100 -#. modified: ilic | 2010-12-26 10:53:36+0100 | f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Pastes the clipboard contents to current position" -msgstr "" -"Преноси садржај клипборда на текућу позицију|~\n" -"Налепљује садржај клипборда на тренутном положају.|~" - -#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f -#. modified: ilic | 2011-05-06 17:32:07+0200 -#. modified: ilic | 2011-05-22 10:36:53+0200 | f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Printing not implemented." -msgstr "" -"Штампање је завршено.|~\n" -"Штампање није изведено.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Line not available" -msgstr "" -"није доступно|~\n" -"ред недоступан|~" - -# |~x -# >> @title:window|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Save Directory Merge State As..." -msgstr "" -"Стапање директоријума|~\n" -"Уписивање стања стапања фасцикли као...|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#| msgid "" -#| "Merge|~\n" -#| "|~x" -msgid "" -"Merge\n" -"File" -msgstr "" -"Стопи|~\n" -"Стопи\n" -"фајл|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Identical\n" -"Files" -msgstr "" -"Прикажи идентичне фајлове|~\n" -"Истоветни\n" -"фајлови|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Compare Explicitly Selected Files" -msgstr "" -"Упореди изабрани фајл|~\n" -"Упореди изричито изабране фајлове|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Merge Explicitly Selected Files" -msgstr "" -"Упореди изабрани фајл|~\n" -"Стопи изричито изабране фајлове|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Current\n" -"Delta" -msgstr "" -"Иди на текућу делту|~\n" -"Текућа\n" -"делта|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"First\n" -"Delta" -msgstr "" -"Иди на прву делту|~\n" -"Прва\n" -"делта|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Last\n" -"Delta" -msgstr "" -"Иди на последњу делту|~\n" -"Последња\n" -"делта|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Prev\n" -"Delta" -msgstr "" -"Иди на претходну делту|~\n" -"Претходна\n" -"делта|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Next\n" -"Delta" -msgstr "" -"Иди на следећу делту|~\n" -"Следећа\n" -"делта|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Prev\n" -"Conflict" -msgstr "" -"Сукоб|~\n" -"Претходни\n" -"сукоб|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Next\n" -"Conflict" -msgstr "" -"Сукоб|~\n" -"Следећи\n" -"сукоб|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#| msgid "" -#| "Unsolved|~\n" -#| "|~x" -msgid "" -"Prev\n" -"Unsolved" -msgstr "" -"Нерешен|~\n" -"Претходни\n" -"нерешени|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#| msgid "" -#| "Unsolved|~\n" -#| "|~x" -msgid "" -"Next\n" -"Unsolved" -msgstr "" -"Нерешен|~\n" -"Следећи\n" -"нерешени|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Auto\n" -"Next" -msgstr "" -"Аутоматски избор|~\n" -"Аутоматски\n" -"следећи|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Line\n" -"Numbers" -msgstr "" -"Прикажи бројеве линија|~\n" -"Бројеви\n" -"редова|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Join Selected Diffs" -msgstr "" -"Упореди изабрани фајл|~\n" -"Споји изабране разлике|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "KDiff3-Usage" -msgstr "" -"KDiff3|~\n" -"Употреба &kdiff3-g;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "kdiff3" -msgstr "" -"KDiff3|~\n" -"&kdiff3-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show info dialogs" -msgstr "" -"Прикажи прозор А|~\n" -"Приказуј информативне дијалоге|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#| msgid "" -#| "Number of subdirectories:|~\n" -#| "|~x" -msgid "Max number of history entries:" -msgstr "" -"Број поддиректоријума:|~\n" -"Највећи број уноса историјата:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Error while adding manual diff range" -msgstr "" -"Грешка у току прављења директоријума.|~\n" -"Грешка при додавању ручног опсега разлике|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Expecting space after closing apostroph." -msgstr "Очекиван размак после затвореног апострофа.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Not matching apostrophs." -msgstr "Апострофи се не поклапају.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Unexpected apostroph within argument." -msgstr "Неочекиван апостроф унутар аргумента.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "No program specified." -msgstr "Наредба није задата.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Unix" -msgstr "&unix-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Error: Changed and Deleted" -msgstr "Грешка: измењено и обрисано.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show Files only in A" -msgstr "Прикажи фајлове само у А|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Files\n" -"only in A" -msgstr "" -"Фајлови\n" -"само у А|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show Files only in B" -msgstr "Прикажи фајлове само у Б|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Files\n" -"only in B" -msgstr "" -"Фајлови\n" -"само у Б|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show Files only in C" -msgstr "Прикажи фајлове само у Ц|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Files\n" -"only in C" -msgstr "" -"Фајлови\n" -"само у Ц|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Choose\n" -"A" -msgstr "" -"Изаберите\n" -"А|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Choose\n" -"B" -msgstr "" -"Изаберите\n" -"Б|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Choose\n" -"C" -msgstr "" -"Изаберите\n" -"Ц|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"White\n" -"Characters" -msgstr "" -"Знакови\n" -"празнина|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"White\n" -"Deltas" -msgstr "" -"Делте\n" -"празнина|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Run Regular Expression Auto Merge" -msgstr "Аутоматски стопи по регуларним изразима|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Split Diff At Selection" -msgstr "Подели разлику на избору|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Joachim Eibl" -msgstr "&joachimeibl-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-file in the source package for details." -msgstr "" -"Не могу да припремим &kdiff3-a; део.\n" -"Ово је обично проблем у инсталацији. Прочитајте фајл README из изворног пакета за више детаља.|~\n" -"Не могу да припремим &kdiff3-a; део.\n" -"Ово је обично проблем у инсталацији. Прочитајте фајл ~!|‘README’| из изворног пакета за више детаља.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2017-09-28 17:56:11+0200 | 1 -msgid "For more documentation, see the help-menu or the subdirectory doc." -msgstr "" -"За више документације, погледајте мени помоћи или потфасциклу doc.|~\n" -"За више документације, погледајте мени помоћи или потфасциклу ~!|‘doc’|.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Ignored. (User defined.)" -msgstr "Игнорисано (кориснички дефинисано).|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"" -msgstr "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: ~!|--cs \"AutoAdvance=1\"||~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show list of config settings and current values." -msgstr "Наброји поставке и тренутне вредности из поставе.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"There is a line end style conflict. Please choose the line end style manually.\n" -"File not saved.\n" -msgstr "" -"Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" -"Фајл није сачуван.\n" -"|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Color for manually aligned difference ranges:" -msgstr "Боја ручно поравнатих опсега разлика:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Align B and C for 3 input files" -msgstr "Поравнај Б и Ц за три улазна фајла|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" -"Покушава да поравна Б и Ц при поређењу или стапању тре улазна фајла.\n" -"Није препоручљиво за стапање зато што га може учинити сложенијим.\n" -"Подразумевано је искључено.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Show a dialog with information about the number of conflicts." -msgstr "Приказује дијалог са информацијом о броју сукоба.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Automatic Merge Regular Expression" -msgstr "Регуларни израз за аутоматско стапање|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Auto merge regular expression:" -msgstr "Регуларни израз за аутоматско стапање:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "Регуларни израз за редове где &kdiff3-n; треба да аутоматски изабере један од извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, иначе Б.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Run regular expression auto merge on merge start" -msgstr "Аутоматски стопи по регуларном изразу на почетку стапања|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" -"Спроводи стапање регуларним изразом чим стапање почне.\n" -"|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Version Control History Merging" -msgstr "Стапање историјата управљања верзијама|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "History start regular expression:" -msgstr "Регуларни израз за почетак историјата:|~" - -# literal-segment: Log|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" -"Регуларни израз за почетак уноса у историјату управљања верзијама.\n" -"Овај ред обично садржи кључну реч ~!/„$Log$“/.\n" -"Подразумевана вредност је ~!/„.*\\$Log.*\\$.*“/.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "History entry start regular expression:" -msgstr "Регуларни израз за почетак уноса историјата:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" -"See the documentation for details." -msgstr "" -"Унос у историјату управљања верзијама чини неколико редова.\n" -"Задајте регуларни израз за откривање првог реда (без водећег коментара).\n" -"Користите заграде да групишете кључеве по којима ће се ређати.\n" -"Ако се остави празно, &kdiff3-n; узима да су уноси историјата раздвојени празним редовима.\n" -"Детаље потражите у документацији.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "History merge sorting" -msgstr "Ређање у стапању историјата|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Sort version control history by a key." -msgstr "Ређа историјат управљања верзијама по кључу.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "History entry start sort key order:" -msgstr "Редослед ређања за кључеве уноса историјата:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Each pair of parentheses used in the regular expression for the history start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" -"Сваки пар заграда употребљен у регуларном изразу за почетак уноса историјата групише кључ који може послужити за ређање.\n" -"Задајте списак кључева (нумерисаних по реду појављивања почев од 1) са запетом као раздвајачем (нпр. „4,5,6,1,2,3,7“).\n" -"Ако се остави празно, ређање се не спроводи.\n" -"Детаље потражите у документацији.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Merge version control history on merge start" -msgstr "Стопи историјат управљања верзијама на почетку стапања|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Run version control history automerge on merge start." -msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања.|~" - -# skip-rule: t-cut|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса.|~" - -# >> @action:button|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Test your regular expressions" -msgstr "Испробај регуларне изразе|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Irrelevant merge command:" -msgstr "Наредба при безначајном стапању:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" -"Ако се зада, ова скрипта се позива кад после аутоматског стапања нема никаквих преосталих измена.\n" -"Позива се са аргументима: име-фајла-1 име-фајла-2 име-фајла-3|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" -"Ако се &kdiff3-n; покрене из командне линије ради стапања фајлова, и сви сукоби су разрешиви без интервенисања корисника, тада се аутоматски резултати уписују и програм напушта.\n" -"Слично опцији командне линије --auto.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file is not Unicode then the selected encoding will be used as fallback.\n" -"(Unicode detection depends on the first bytes of a file.)" -msgstr "" -"Ако је укључено, биће откривана &unicode-azk; (&utf16-; или &utf8-;) кодирања.\n" -"Ако фајл није &unicode-nm; изабрано кодирање ће бити употребљено као одступно.\n" -"Откривање &unicode-g; зависи од првих бајтова у фајлу.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for saving." -msgstr "" -"Ако је укључено, узима се кодирање према улазним фајловима.\n" -"У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за уписивање.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"List of command line options that should be ignored when KDiff3 is used by other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" -"Списак опција командне линије које треба занемарити када се &kdiff3-n; позива кроз друге алатке.\n" -"Више вредности можете задати раздвојене тачка-запетом.\n" -"Овим се сузбија грешка „непозната опција“.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Quit also via Escape key" -msgstr "Напуштање и преко тастера &esc-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" -"Брз начин напуштања.\n" -"За оне навикнуте на тастер &esc-n; у ову сврху.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Integrate with ClearCase" -msgstr "Уклопи са &clearcase-i;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Integrate with Rational ClearCase from IBM.\n" -"Modifies the \"map\" file in ClearCase subdir \"lib/mgrs\"\n" -"(Only enabled when ClearCase \"bin\" directory is in the path.)" -msgstr "" -"Уклапање са &ibm-imp; &clearcase_rm-i;.\n" -"Уноси измене у фајл ~!/map/ у &clearcase-lzp; потфасцикли ~!|lib/mgrs|.\n" -"Активно само ако је &clearcase-nzp; фасцикла ~!/bin/ у путањи.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Restore the old \"map\" file from before doing the ClearCase integration." -msgstr "Враћа стари фајл ~!/map/, какав је био пре уклапања са &clearcase-i;.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Don't save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" -"Неке улазни знакови не могу да се претворе у &unicode-a;.\n" -"Можда сте изабрали погрешно кодирање (нпр. &utf8-n; за не-&utf8-; фајлове).\n" -"Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" -"Погођени улазни фајлови налазе се у %1.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Nothing is selected in either diff input window." -msgstr "Ништа није изабрано ни у једном прозору улаза разлике.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Regular Expression Tester" -msgstr "Проба регуларних израза|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Example auto merge line:" -msgstr "Пример реда за аутоматско стапање:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "To test auto merge, copy a line as used in your files." -msgstr "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Match result:" -msgstr "Резултат поклапања:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Example history start line (with leading comment):" -msgstr "Пример почетног реда историјата (са водећим коментаром):|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и водећи коментар.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "History sort key order:" -msgstr "Редослед ређања кључева историјата:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Example history entry start line (without leading comment):" -msgstr "Пример почетног реда ставке историјата (без водећег коментара):|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "Копирајте почетни ред ставке историјата какав се налази у фајловима, али изостављајући водећи коментар.|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Sort key result:" -msgstr "Резултат ређања кључева:|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу.|~" - -#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 -msgid "Case sensitive filename comparison" -msgstr "Поређење имена фајлова разликује величину слова|~" - -#. modified: ilic | 2012-06-24 18:06:20+0200 | 1 -msgid "" -"The directory comparison will compare files or directories when their names match.\n" -"Set this option if the case of the names must match. (Default for Windows is off, otherwise on.)" -msgstr "Поређење фасцикли упоређује фајлове и фасцикле чија се имена поклапају. Задајте ову опцију имена треба да се поклапају и по величини слова. Подразумевано је искључено под &windowsos-i;, иначе је укључено.|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Opening files...|~" -msgid "Open File" -msgstr "Отварам фајлове...|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Done.|~" -msgid "Done" -msgstr "Готово.|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Show Space && Tabulator Characters for Differences|~" -msgid "Show Space && Tabulator Characters" -msgstr "Прикажи знакове размака и табулатора за разлике|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "KDiff3Part|~" -msgid "KDiff3 Part" -msgstr "&Kdiff3-n; део|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2012-09-21 21:00:16+0200 | o -#. modified: ilic | 2018-02-16 11:13:31+0100 -msgid "Ok" -msgstr "У реду|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Don't solve conflicts automatically. (For compatibility...)|~" -msgid "Don't solve conflicts automatically." -msgstr "Не решавај сукобе аутоматски. За сагласност...|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "File Save Error|~" -msgid "File view font" -msgstr "Грешка уписивања фајла|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Unfold All Subdirs|~" -msgid "Unfold all subdirectories on load" -msgstr "Рашири све потфасцикле|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#, fuzzy -#| msgid "Directory|~" -msgid "Open Directory" -msgstr "Фасцикла|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-05-19 13:24:07+0200 | o -#~ msgid "&OK" -#~ msgstr "&У реду|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-05-19 13:24:07+0200 | o -#~ msgid "OK" -#~ msgstr "У реду|~" - -#. modified: ilic | 2018-02-16 11:13:31+0100 | 1f -#. modified: ilic | 2018-03-16 13:23:42+0100 | of -#, fuzzy -#~| msgid "(c) 2002-2011 Joachim Eibl|~" -#~ msgid "(c) 2002-2014 Joachim Eibl" -#~ msgstr "© 2002–2011, &joachimeibl-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ 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" -#~ "Ако знате како ово да поновите, контактирајте аутора програма.|~\n" -#~ "Ово никада не треба да се догоди:\n" -#~ "\n" -#~ "~!|mergeResultSaved: m_pMFI=0|\n" -#~ "\n" -#~ "Ако знате како ово да поновите, обратите се аутору програма.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Program Error" -#~ msgstr "" -#~ "Програмска грешка|~\n" -#~ "Грешка у програму|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Error." -#~ msgstr "Грешка.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Done." -#~ msgstr "Готово.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Show Space && Tabulator Characters for Differences" -#~ msgstr "Прикажи знакове размака и табулатора за разлике|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "KDiff3Part" -#~ msgstr "" -#~ "KDiff3Part|~\n" -#~ "&Kdiff3-n; део|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Select Font" -#~ msgstr "" -#~ "Изаберите фонт|~\n" -#~ "Изабери фонт|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ 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" -#~ "\n" -#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" -#~ "ширине, можете искусити проблеме у току уређивања.\n" -#~ "\n" -#~ "Желите ли да наставите или ћете изабрати други фонт?|~\n" -#~ "Изабрали сте фонт променљиве ширине.\n" -#~ "\n" -#~ "Пошто што овај програм не рукује исправно фонтовима променљиве\n" -#~ "ширине, можете искусити проблеме у току уређивања.\n" -#~ "\n" -#~ "Желите ли да наставите или да изаберете други фонт?|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Stephan Binner" -#~ msgstr "" -#~ "Штефан Бинер (Stephan Binner)|~\n" -#~ "&stephanbinner-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "David Faure" -#~ msgstr "" -#~ "Давид Фор (David Faure)|~\n" -#~ "&davidfaure-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Bernd Gehrmann" -#~ msgstr "" -#~ "Бернд Герман (Bernd Gehrmann)|~\n" -#~ "&berndgehrmann-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "KDE4 porting" -#~ msgstr "" -#~ "Пребацивање на КДЕ4|~\n" -#~ "Преношење на &kde4-a;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Albert Astals Cid" -#~ msgstr "" -#~ "Алберт Асталс Сид (~!/Albert Astals Cid/)|~\n" -#~ "&albertastalscid-n;|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "+ Many thanks to those who reported bugs and contributed ideas!" -#~ msgstr "" -#~ "+ Много хвала онима који су пријављивали грешке и допринели својим идејама!|~\n" -#~ "+ Пуно хвала свима који су пријављивали грешке и прилагали идеје!|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Don't solve conflicts automatically. (For compatibility...)" -#~ msgstr "" -#~ "Не решавај сукобе аутоматски. (За компатибилност...)|~\n" -#~ "Не решавај сукобе аутоматски. За сагласност...|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Italic font for deltas" -#~ msgstr "Курзивни фонт за делте|~" - -# |~x -# rewrite-msgid: /italic characters/italics/|~ -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ 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" -#~ "Ако фонт не подржава курзивне знакове, онда ово не ради ништа.|~\n" -#~ "Бира курзивну верзију фонта за разлике.\n" -#~ "Ако фонт не подржава курзив, онда ово не ради ништа.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Incompatible Font" -#~ msgstr "" -#~ "Некомпатибилан фонт|~\n" -#~ "Несагласан фонт|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Continue at Own Risk" -#~ msgstr "" -#~ "Наставите на сопствени ризик|~\n" -#~ "Настави на моју одговорност|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Select Another Font" -#~ msgstr "" -#~ "Изаберите други фонт|~\n" -#~ "Изабери други фонт|~" - -# |~x -# >> @title:window|~ -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Incompatible font." -#~ msgstr "" -#~ "Некомпатибилан фонт|~\n" -#~ "Несагласан фонт|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Continue at my own risk" -#~ msgstr "" -#~ "Наставите на сопствени ризик|~\n" -#~ "Настави на моју одговорност|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Select another font" -#~ msgstr "" -#~ "Изаберите други фонт|~\n" -#~ "Изабери други фонт|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~| msgid "" -#~| "From Clipboard|~\n" -#~| "|~x" -#~ msgid "Clipboard-patch" -#~ msgstr "" -#~ "Из клипборда|~\n" -#~ "Закрпа за клипборд|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "KIO-Help" -#~ msgstr "" -#~ "Помоћ|~\n" -#~ "Помоћ за &ioslave-ak;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. reviewed: ilic | 2012-06-24 18:06:44+0200 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~| msgid "" -#~| "Directory Comparison Status|~\n" -#~| "|~x" -#~ msgid "Directory Equality-Coloring patch" -#~ msgstr "" -#~ "Статус поређења директоријума|~\n" -#~ "Закрпа за бојење једнакости фасцикли|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1f -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Sergey Zorin" -#~ msgstr "" -#~ "Грешка стапања|~\n" -#~ "&sergeyzorin-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "(c) 2002-2011 Joachim Eibl" -#~ msgstr "© 2002–2011, &joachimeibl-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Eike Sauer" -#~ msgstr "&eikesauer-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Bugfixes, Debian package maintainer" -#~ msgstr "Исправке грешака, одржавалац &debian-gmp; пакета|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Sebastien Fricker" -#~ msgstr "&sebastienfricker-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Windows installer" -#~ msgstr "Инсталатер за &windowsos-a;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "i18n-help" -#~ msgstr "Помоћ у интернационализацији|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Stefan Partheymueller" -#~ msgstr "&stefanpartheymueller-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Class CvsIgnoreList from Cervisia" -#~ msgstr "Класа ~!/CvsIgnoreList/ из &cervisia-g;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Andre Woebbeking" -#~ msgstr "&andrewoebbeking-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Class StringMatcher" -#~ msgstr "Класа ~!/StringMatcher/|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Michael Denio" -#~ msgstr "&michaeldenio-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Manfred Koehler" -#~ msgstr "&manfredkoehler-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Fix for slow startup on Windows" -#~ msgstr "Поправка за споро покретање под &windowsos-i;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Diff Ext for Windows" -#~ msgstr "Проширење за разликовање под &windowsos-i;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -#~ msgstr "&pauleggert-n;, &mikehaertel-n;, &davidhayes-n;, &richardmstallman-n;, &leonardhtower-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "GNU-Diffutils" -#~ msgstr "&Gnu-nzkp; алатке за разликовање|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Tino Boellsterling, Timothy Mee" -#~ msgstr "&tinoboellsterling-n;, &timothymee-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Intensive test, use and feedback" -#~ msgstr "Интензивно испробавање, употреба и реаговања|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Michael Schmidt" -#~ msgstr "&michaelschmidt-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Mac support" -#~ msgstr "Подршка за &maccomp-a;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Valentin Rusu" -#~ msgstr "&valentinrusu-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "Silvan Scherrer" -#~ msgstr "&silvanscherrer-n;|~" - -#. modified: ilic | 2012-06-24 18:03:04+0200 | 1 -#. modified: ilic | 2018-02-16 11:13:31+0100 | o -#~ msgid "OS2 port" -#~ msgstr "Преношење на &os2-a;|~" - -#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f -#. modified: ilic | 2011-05-06 17:32:07+0200 -#. modified: ilic | 2011-05-22 10:36:53+0200 | f -#. modified: ilic | 2011-09-04 09:42:36+0200 | of -#, fuzzy -#~ msgid "Dos/Windows" -#~ msgstr "Про&зор|~" - -#. modified: ilic | 2011-05-06 17:32:07+0200 | 1f -#. modified: ilic | 2011-05-06 17:32:07+0200 -#. modified: ilic | 2011-05-22 10:36:53+0200 | f -#. modified: ilic | 2011-09-04 09:42:36+0200 | of -#, fuzzy -#~ msgid "Autodetect" -#~ msgstr "Аутоматски избор|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2010-12-16 14:52:29+0100 | of -#, fuzzy -#~ msgid "Pastes the clipboard contents to actual position" -#~ msgstr "Преноси садржај клипборда на текућу позицију|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1 -#. modified: ilic | 2010-03-16 15:29:51+0100 | o -#~ msgid "" -#~ "Data loss error:\n" -#~ "If it is reproducable please contact the author.\n" -#~ msgstr "" -#~ "Грешка, губитак података:\n" -#~ "Ако је можете поновити, контактирајте аутора.\n" -#~ "|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-05-02 13:13:50+0200 | of -#, fuzzy -#~ msgid "" -#~ "On: Pressing tab generates the appropriate number of spaces.\n" -#~ "Off: A Tab-character will be inserted." -#~ msgstr "" -#~ "Укључено: Притиском на таб генерише се одговарајући број размака.\n" -#~ "Искључено: Знак табулатора ће бити убачен.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-05-02 13:13:50+0200 | of -#, fuzzy -#~ msgid "" -#~ "Extends the antipattern to anything that would be ignored by CVS.\n" -#~ "Via local \".cvsignore\"-files this can be directory specific." -#~ msgstr "" -#~ "Проширује антиоблик на све што би CVS игнорисао.\n" -#~ "Преко локалних фајлова „.cvsignore“ ово може бити посебно по директоријуму.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-05-02 13:13:50+0200 | of -#, fuzzy -#~ 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 "" -#~ "Када треба снимити фајл преко старог фајла, стари фајл ће бити\n" -#~ "преименован са наставком „.orig“ уместо да буде обрисан.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-05-02 13:13:50+0200 | of -#, fuzzy -#~ msgid "" -#~ "Choose the language of the GUI-strings or \"Auto\".\n" -#~ "For a change of language to take place, quit and restart KDiff3." -#~ msgstr "" -#~ "Изаберите језик за исписе у програму или „Auto“.\n" -#~ "Да би измена језика била примењена, затворите и поново покрените KDiff3.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-03-21 13:26:32+0100 | of -#, fuzzy -#~ msgid "Show &Statusbar" -#~ msgstr "Приказуј &статусну линију|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-03-21 13:26:32+0100 | of -#, fuzzy -#~ msgid "Trust the size and date, but use binary comparison if date doesn't match (unsafe)" -#~ msgstr "Веруј величини и датуму, али користи бинарно упоређивање ако се датум не поклапа (није безбедно)|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-03-21 13:26:32+0100 | of -#, fuzzy -#~ msgid "" -#~ "Assume that files are equal if the modification date and file length are equal.\n" -#~ "If the date isn't equal but the sizes are, use binary comparison.\n" -#~ "Useful for big directories or slow networks." -#~ msgstr "" -#~ "Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" -#~ "Ако датуми нису исти али величина јесте, користи бинарно упоређивање.\n" -#~ "Корисно за велике директоријуме или споре мреже.|~" - -#. modified: simic | 2009-01-14 14:49:28+0100 | 1f -#. modified: ilic | 2009-01-23 19:36:45+0100 | of -#, fuzzy -#~ msgid "Directory Merge" -#~ msgstr "Стапање директоријума|~"