From ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 29 Sep 2014 12:26:02 -0500 Subject: Automated l10n update (.po files) --- tde-i18n-af/messages/tdesdk/kompare.po | 1118 ++++++++++++++++---------------- 1 file changed, 559 insertions(+), 559 deletions(-) (limited to 'tde-i18n-af/messages/tdesdk/kompare.po') diff --git a/tde-i18n-af/messages/tdesdk/kompare.po b/tde-i18n-af/messages/tdesdk/kompare.po index d7b266ce8d7..49e48c28555 100644 --- a/tde-i18n-af/messages/tdesdk/kompare.po +++ b/tde-i18n-af/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare VERSION\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2002-11-07 11:40+0200\n" "Last-Translator: WEB-Translator \n" "Language-Team: AFRIKAANS \n" @@ -14,107 +14,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "WEB-Vertaler (http://kde.af.org.za)" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "frix@expertron.co.za" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Bron Lêer" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -#, fuzzy -msgid "Destination Folder" -msgstr "Bestemming Lêer" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Bron Lêer" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "Bestemming Lêer" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "Bron Lyn" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "Bestemming Lyn" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Verskil" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, fuzzy, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" -"Het verander %n lyn\n" -"Het verander %n lyne" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" -"Het verander %n lyn\n" -"Het verander %n lyne" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Ingesit %n lyn\n" -"Ingesit %n lyne" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Uitgevee %n lyn\n" -"Uitgevee %n lyne" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Onbekende" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "Wend aan Verskil" @@ -202,123 +101,195 @@ msgstr "Die lêers word identies." msgid "Could not write to the temporary file." msgstr "Kon nie skryf na lêer." -#: kompare_shell.cpp:77 -#, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "Kon nie soek ons Deel!" +#. i18n: file komparepart/komparepartui.rc line 13 +#: rc.cpp:15 +#, no-c-format +msgid "&Difference" +msgstr "Verskil" -#: kompare_shell.cpp:106 -#, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "Kon nie soek ons Deel!" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 +#: rc.cpp:21 +#, no-c-format +msgid "Run Diff In" +msgstr "Hardloop Diff In" -#: kompare_shell.cpp:114 -#, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "Kon nie soek ons Deel!" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 +#: rc.cpp:24 +#, no-c-format +msgid "Command Line" +msgstr "Opdrag Lyn" -#: kompare_shell.cpp:138 -#, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "Kon nie soek ons Deel!" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 +#: rc.cpp:27 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd gids && diff -udHprNa -- bron bestemming" -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 +#: rc.cpp:33 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Kyk vir kleiner verander" -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "Vergelyk Lêers..." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 +#: rc.cpp:36 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimiseer vir groot lêers" -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 +#: rc.cpp:39 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignoreer verander in kas" -#: kompare_shell.cpp:246 -#, fuzzy -msgid "Show T&ext View" -msgstr "Vertoon Teks Besigtig" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 +#: rc.cpp:42 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Vergroot oortjies na spasies" -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Teks Besigtig" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 +#: rc.cpp:45 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoreer bygevoeg of verwyder leeg lyne" -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr " 0 van 0 verskille " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 +#: rc.cpp:48 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoreer verander in spasie" -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr " 0 van 0 lêers " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 +#: rc.cpp:51 +#, no-c-format +msgid "Show function names" +msgstr "Vertoon funksie name" -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -"%1 van %n lêer \n" -" %1 van %n lêers " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 +#: rc.cpp:54 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Vergelyk gidse rekursief" -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -"%n lêer \n" -" %n lêers " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 +#: rc.cpp:57 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Behandel nuwe lêers as leeg" -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -"%1 van %n verskil, %2 aangewend \n" -" %1 van %n verskille, %2 aangewend " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 +#: rc.cpp:60 +#, no-c-format +msgid "Format" +msgstr "Formaat" -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -"%n verskil \n" -" %n verskille " +#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 +#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 +#, no-c-format +msgid "Context" +msgstr "Konteks" -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 +#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 +#, no-c-format +msgid "Ed" +msgstr "Ed" -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 +#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 +#, no-c-format +msgid "Normal" +msgstr "Normale" -#: kompare_shell.cpp:371 +#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 +#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 +#, no-c-format +msgid "RCS" +msgstr "Rcs" + +#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 +#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 +#, no-c-format +msgid "Unified" +msgstr "Vereenselwig" + +#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 +#: rc.cpp:78 +#, no-c-format +msgid "Side-by-side" +msgstr "Side-by-side" + +#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 +#: libdialogpages/diffpage.cpp:251 rc.cpp:81 +#, no-c-format +msgid "Number of context lines:" +msgstr "Nommer van konteks lyne:" + +#: main.cpp:33 #, fuzzy -msgid "Diff Output" -msgstr "Diff Opsies" +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n " +"diff." -#: kompare_shell.cpp:373 -msgid "Blend" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " +"then it will read from standard input. Can be used for instance for cvs diff | " +"kompare -o -. Kompare will do a check to see if it can find the original " +"file(s) and then blend the original file(s) into the diffoutput and show that " +"in the viewer. -n disables the check." msgstr "" -#: kompare_shell.cpp:373 -#, fuzzy +#: main.cpp:41 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " +"file or folder that the diffoutput needs to be blended into. " +msgstr "" + +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" + +#: main.cpp:43 +msgid "" +"Use this to specify the encoding when calling it from the command line. It will " +"default to the local encoding if not specified." +msgstr "" + +#: main.cpp:52 +msgid "Kompare" +msgstr "K-vergelyk" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" +msgstr "K-vergelyk-deel" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "" + +#: main.cpp:59 +msgid "Cervisia diff viewer" msgstr "" -"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan " -"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking " -"van die ingevoerde lêers van gidse. " #: kompare_shell.cpp:398 main.cpp:185 #, fuzzy @@ -337,9 +308,9 @@ msgstr "Bestemming" msgid "Compare" msgstr "Vergelyk" -#: kompare_shell.cpp:402 +#: main.cpp:189 #, fuzzy -msgid "Compare these files or folders" +msgid "Compare these files or folder" msgstr "Vergelyk hierdie lêers of gidse" #: kompare_shell.cpp:402 main.cpp:189 @@ -353,383 +324,248 @@ msgstr "" "word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking " "van die ingevoerde lêers van gidse. " -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Teks Besigtig" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "WEB-Vertaler (http://kde.af.org.za)" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "frix@expertron.co.za" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" +#: kompare_shell.cpp:77 +#, fuzzy +msgid "Could not find our KompareViewPart." +msgstr "Kon nie soek ons Deel!" -#: kompareurldialog.cpp:47 -msgid "Here you can change the options for comparing the files." +#: kompare_shell.cpp:106 +#, fuzzy +msgid "Could not load our KompareViewPart." +msgstr "Kon nie soek ons Deel!" + +#: kompare_shell.cpp:114 +#, fuzzy +msgid "Could not find our KompareNavigationPart." +msgstr "Kon nie soek ons Deel!" + +#: kompare_shell.cpp:138 +#, fuzzy +msgid "Could not load our KompareNavigationPart." +msgstr "Kon nie soek ons Deel!" + +#: kompare_shell.cpp:233 +msgid "&Open Diff..." msgstr "" -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "Vergelyk Lêers..." + +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." msgstr "" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "Verskil" +#: kompare_shell.cpp:246 +#, fuzzy +msgid "Show T&ext View" +msgstr "Vertoon Teks Besigtig" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Hardloop Diff In" +#: kompare_shell.cpp:248 +#, fuzzy +msgid "Hide T&ext View" +msgstr "Teks Besigtig" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Opdrag Lyn" +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr " 0 van 0 verskille " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd gids && diff -udHprNa -- bron bestemming" +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr " 0 van 0 lêers " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Kyk vir kleiner verander" +#: kompare_shell.cpp:273 +msgid "" +"_n: %1 of %n file \n" +" %1 of %n files " +msgstr "" +"%1 van %n lêer \n" +" %1 van %n lêers " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimiseer vir groot lêers" +#: kompare_shell.cpp:275 +#, c-format +msgid "" +"_n: %n file \n" +" %n files " +msgstr "" +"%n lêer \n" +" %n lêers " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignoreer verander in kas" +#: kompare_shell.cpp:278 +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +"%1 van %n verskil, %2 aangewend \n" +" %1 van %n verskille, %2 aangewend " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Vergroot oortjies na spasies" +#: kompare_shell.cpp:281 +#, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +"%n verskil \n" +" %n verskille " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoreer bygevoeg of verwyder leeg lyne" +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoreer verander in spasie" +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Vertoon funksie name" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Vergelyk gidse rekursief" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Behandel nuwe lêers as leeg" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formaat" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, no-c-format -msgid "Context" -msgstr "Konteks" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, no-c-format -msgid "Ed" -msgstr "Ed" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, no-c-format -msgid "Normal" -msgstr "Normale" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, no-c-format -msgid "RCS" -msgstr "Rcs" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, no-c-format -msgid "Unified" -msgstr "Vereenselwig" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Side-by-side" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Nommer van konteks lyne:" - -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Voorkeure" - -#: komparepart/kompareprefdlg.cpp:39 -#, fuzzy -msgid "View Settings" -msgstr "Diff Instellings" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff Instellings" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Stoor Alle" - -#: komparepart/kompare_part.cpp:168 +#: kompare_shell.cpp:371 #, fuzzy -msgid "Save .&diff..." -msgstr "Stoor .diff" - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Uitruil Bron met Bestemming" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Vertoon Statistieke" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "" - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "" - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +msgid "Diff Output" msgstr "Diff Opsies" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "" - -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Stoor .diff" - -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: kompare_shell.cpp:373 +msgid "Blend" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "" +"If you have entered a file or folder name and a file that contains diff output " +"in the fields in this dialog then this button will be enabled and pressing it " +"will open kompare's main view where the output of the entered file or files " +"from the folder are mixed with the diff output so you can then apply the " +"difference(s) to a file or to the files. " msgstr "" +"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan " +"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking " +"van die ingevoerde lêers van gidse. " -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "K-vergelyk-deel" +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Vergelyk hierdie lêers of gidse" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Wat loop diff..." +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Teks Besigtig" -#: komparepart/kompare_part.cpp:496 +#: komparenavtreepart/komparenavtreepart.cpp:61 #, fuzzy -msgid "Parsing diff output..." -msgstr "Verwerking diff..." +msgid "Source Folder" +msgstr "Bron Lêer" -#: komparepart/kompare_part.cpp:545 +#: komparenavtreepart/komparenavtreepart.cpp:66 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Vergelyk lêers in %1 met lêers in %2" +msgid "Destination Folder" +msgstr "Bestemming Lêer" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Vergelyk lêers in %1 met lêers in %2" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Bron Lêer" -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Verwerking diff..." +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "Bestemming Lêer" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "Bron Lyn" -#: komparepart/kompare_part.cpp:563 -#, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Verwerking diff..." +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "Bestemming Lyn" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Verskil" + +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, fuzzy, c-format msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" msgstr "" -"Jy het gemaak verander na die bestemming.\n" -"Sal Jy hou van na stoor hulle?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Stoor Verander?" +"Het verander %n lyn\n" +"Het verander %n lyne" -#: komparepart/kompare_part.cpp:667 +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: Changed %n line\n" +"Changed %n lines" msgstr "" -"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word " -"beskikbaar." - -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff Statistieke" +"Het verander %n lyn\n" +"Het verander %n lyne" -#: komparepart/kompare_part.cpp:673 +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" msgstr "" -"Statistieke:\n" -"\n" -"Ou lêer: %1\n" -"Nuwe lêer: %2\n" -"\n" -"Formaat: %3\n" -"Nommer van hunks: %4\n" -"Nommer van verskille: %5" -#: komparepart/kompare_part.cpp:686 +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +"_n: Inserted %n line\n" +"Inserted %n lines" msgstr "" -"Statistieke:\n" -"\n" -"Nommer van lêers in diff lêer: %1\n" -"Formaat: %2\n" -"\n" -"Huidige ou lêer: %3\n" -"Huidige nuwe lêer: %4\n" -"\n" -"Nommer van hunks: %5\n" -"Nommer van verskille: %6" +"Ingesit %n lyn\n" +"Ingesit %n lyne" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" msgstr "" -#: libdialogpages/filespage.cpp:64 -#, fuzzy -msgid "&Files" -msgstr "Volgende Lêer" - -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Kleure" - -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "Verwyder kleur:" - -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "Het verander kleur:" - -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "Bygevoeg kleur:" - -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "Aangewend kleur:" - -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Muis Wiel" - -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Nommer van lyne:" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"Uitgevee %n lyn\n" +"Uitgevee %n lyne" -#: libdialogpages/viewpage.cpp:86 -#, fuzzy -msgid "Tabs to Spaces" -msgstr "Vergroot oortjies na spasies" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Onbekende" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" msgstr "" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "Voorkoms" - -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." msgstr "" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Diff" + +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." msgstr "" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." msgstr "" #: libdialogpages/diffpage.cpp:211 @@ -918,74 +754,238 @@ msgstr "" msgid "&Exclude" msgstr "" -#: main.cpp:33 +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "" + +#: libdialogpages/filespage.cpp:64 #, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" +msgid "&Files" +msgstr "Volgende Lêer" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Kleure" + +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "Verwyder kleur:" + +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "Het verander kleur:" + +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Bygevoeg kleur:" + +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "Aangewend kleur:" + +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Muis Wiel" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Nommer van lyne:" + +#: libdialogpages/viewpage.cpp:86 +#, fuzzy +msgid "Tabs to Spaces" +msgstr "Vergroot oortjies na spasies" + +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" msgstr "" -"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n " -"diff." -#: main.cpp:39 -msgid "This will compare URL1 with URL2" +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "Voorkoms" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" msgstr "" -#: main.cpp:40 -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" msgstr "" -#: main.cpp:41 -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" msgstr "" -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Voorkeure" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View Settings" +msgstr "Diff Instellings" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff Instellings" + +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Stoor Alle" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "Stoor .diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Uitruil Bron met Bestemming" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Vertoon Statistieke" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." msgstr "" -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." msgstr "" -#: main.cpp:52 -msgid "Kompare" -msgstr "K-vergelyk" +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff Opsies" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" msgstr "" -#: main.cpp:55 main.cpp:56 -msgid "Author" +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Stoor .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "" -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "K-vergelyk-deel" +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" -#: main.cpp:58 -msgid "A lot of good advice" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" msgstr "" -#: main.cpp:59 -msgid "Cervisia diff viewer" +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" msgstr "" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "K-vergelyk-deel" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Wat loop diff..." + +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "Compare these files or folder" -msgstr "Vergelyk hierdie lêers of gidse" +msgid "Parsing diff output..." +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:545 +#, fuzzy +msgid "Comparing file %1 with file %2" +msgstr "Vergelyk lêers in %1 met lêers in %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Vergelyk lêers in %1 met lêers in %2" + +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:563 +#, fuzzy +msgid "Blending diff output from %1 into folder %2" +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"Jy het gemaak verander na die bestemming.\n" +"Sal Jy hou van na stoor hulle?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Stoor Verander?" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." +msgstr "" +"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word " +"beskikbaar." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff Statistieke" + +#: komparepart/kompare_part.cpp:673 +msgid "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" +msgstr "" +"Statistieke:\n" +"\n" +"Ou lêer: %1\n" +"Nuwe lêer: %2\n" +"\n" +"Formaat: %3\n" +"Nommer van hunks: %4\n" +"Nommer van verskille: %5" + +#: komparepart/kompare_part.cpp:686 +msgid "" +"Statistics:\n" +"\n" +"Number of files in diff file: %1\n" +"Format: %2\n" +"\n" +"Current old file: %3\n" +"Current new file: %4\n" +"\n" +"Number of hunks: %5\n" +"Number of differences: %6" +msgstr "" +"Statistieke:\n" +"\n" +"Nommer van lêers in diff lêer: %1\n" +"Formaat: %2\n" +"\n" +"Huidige ou lêer: %3\n" +"Huidige nuwe lêer: %4\n" +"\n" +"Nommer van hunks: %5\n" +"Nommer van verskille: %6" #~ msgid "%1" #~ msgstr "%1" -- cgit v1.2.1