diff options
Diffstat (limited to 'tde-i18n-en_GB/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-en_GB/messages/tdesdk/kompare.po | 1000 |
1 files changed, 500 insertions, 500 deletions
diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po index ad1bd4db145..ca75936eb70 100644 --- a/tde-i18n-en_GB/messages/tdesdk/kompare.po +++ b/tde-i18n-en_GB/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2005-11-07 01:06+0000\n" "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n" "Language-Team: British English <kde-en-gb@kde.me.uk>\n" @@ -17,109 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "John Knight" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "anarchist_tomato@herzeleid.net" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Source Folder" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "Destination Folder" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Source File" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "Destination File" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "Source Line" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "Destination Line" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Difference" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" -"Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" -"Changed %n line\n" -"Changed %n lines" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" -"Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Inserted %n line\n" -"Inserted %n lines" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" -"Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Deleted %n line\n" -"Deleted %n lines" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Unknown" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "&Apply Difference" @@ -212,168 +109,6 @@ msgstr "The files are identical." msgid "Could not write to the temporary file." msgstr "Could not write to the temporary file." -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "Could not find our KompareViewPart." - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "Could not load our KompareViewPart." - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "Could not find our KompareNavigationPart." - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "Could not load our KompareNavigationPart." - -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "&Open Diff..." - -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "&Compare Files..." - -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "&Blend URL with Diff..." - -#: kompare_shell.cpp:246 -msgid "Show T&ext View" -msgstr "Show T&ext View" - -#: kompare_shell.cpp:248 -msgid "Hide T&ext View" -msgstr "Hide T&ext View" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr " 0 of 0 differences " - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr " 0 of 0 files " - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -" %1 of %n file \n" -" %1 of %n files " - -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n file \n" -" %n files " - -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -" %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " - -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n difference \n" -" %n differences " - -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "Blend File/Folder with diff Output" - -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "File/Folder" - -#: kompare_shell.cpp:371 -msgid "Diff Output" -msgstr "Diff Output" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "Blend" - -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" -msgstr "Blend this file or folder with the diff output" - -#: kompare_shell.cpp:373 -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 "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialogue 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. " - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Compare Files or Folders" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Source" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destination" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Compare" - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Compare these files or folders" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" -"If you have entered 2 filenames or 2 folders in the fields in this dialogue " -"then this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Text View" - -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Here you can enter the files you want to compare." - -#: 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 "Here you can change the options for comparing the files." - -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "Here you can change the options for the view." - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -500,229 +235,346 @@ msgstr "Side-by-side" msgid "Number of context lines:" msgstr "Number of context lines:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferences" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"A program to view the differences between files and optionally generate a diff" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "View Settings" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "This will compare URL1 with URL2" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff Settings" +#: 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 "" +"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." -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Save &All" +#: 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. " +msgstr "" +"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. " -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Save .&diff..." +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Swap Source with Destination" +#: 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 "" +"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:174 -msgid "Show Statistics" -msgstr "Show Statistics" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Author" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff Options" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare icon artist" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch Files" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "A lot of good advice" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Save .diff" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff viewer" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "The file exists or is write-protected; do you want to overwrite it?" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Compare Files or Folders" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "File Exists" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Source" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Overwrite" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destination" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Do Not Overwrite" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Compare" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Compare these files or folder" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Running diff..." +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog then " +"this button will be enabled and pressing it will start a comparison of the " +"entered files or folders. " +msgstr "" +"If you have entered 2 filenames or 2 folders in the fields in this dialogue " +"then this button will be enabled and pressing it will start a comparison of the " +"entered files or folders. " -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Parsing diff output..." +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "John Knight" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Comparing file %1 with file %2" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "anarchist_tomato@herzeleid.net" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Comparing files in %1 with files in %2" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." +msgstr "Could not find our KompareViewPart." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Viewing diff output from %1" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." +msgstr "Could not load our KompareViewPart." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Blending diff output from %1 into file %2" +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "Could not find our KompareNavigationPart." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Blending diff output from %1 into folder %2" +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "Could not load our KompareNavigationPart." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "&Open Diff..." + +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "&Compare Files..." + +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." +msgstr "&Blend URL with Diff..." + +#: kompare_shell.cpp:246 +msgid "Show T&ext View" +msgstr "Show T&ext View" + +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "Hide T&ext View" + +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr " 0 of 0 differences " + +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr " 0 of 0 files " + +#: kompare_shell.cpp:273 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Save Changes?" +" %1 of %n file \n" +" %1 of %n files " -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:275 +#, c-format msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: %n file \n" +" %n files " msgstr "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +" %n file \n" +" %n files " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff Statistics" +#: kompare_shell.cpp:278 +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +" %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:281 +#, 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: %n difference \n" +" %n differences " msgstr "" -"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 difference \n" +" %n differences " -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "Blend File/Folder with diff Output" + +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "File/Folder" + +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "Diff Output" + +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "Blend" + +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" +msgstr "Blend this file or folder with the diff output" + +#: kompare_shell.cpp:373 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" +"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 "" -"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" +"If you have entered a file or folder name and a file that contains diff output " +"in the fields in this dialogue 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. " -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "Encoding" +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Compare these files or folders" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "&Files" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Text View" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Colours" +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Source Folder" -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "Removed colour:" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Destination Folder" -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "Changed colour:" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Source File" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "Added colour:" +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "Destination File" -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "Applied colour:" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "Source Line" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Mouse Wheel" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "Destination Line" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Number of lines:" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Difference" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" -msgstr "Tabs to Spaces" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" +"Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" -msgstr "Number of spaces to convert a tab character to:" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Changed %n line\n" +"Changed %n lines" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "A&ppearance" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" +"Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "Text Font" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"Inserted %n line\n" +"Inserted %n lines" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Font:" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr "" +"Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Size:" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"Deleted %n line\n" +"Deleted %n lines" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Unknown" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Here you can enter the files you want to compare." + +#: 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 "Here you can change the options for comparing the files." + +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." +msgstr "Here you can change the options for the view." #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" @@ -928,78 +780,226 @@ msgstr "" msgid "&Exclude" msgstr "&Exclude" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"A program to view the differences between files and optionally generate a diff" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "Encoding" -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "This will compare URL1 with URL2" +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "&Files" -#: main.cpp:40 +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Colours" + +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "Removed colour:" + +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "Changed colour:" + +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Added colour:" + +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "Applied colour:" + +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Mouse Wheel" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Number of lines:" + +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" +msgstr "Tabs to Spaces" + +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "Number of spaces to convert a tab character to:" + +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "A&ppearance" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "Text Font" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Font:" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "Size:" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferences" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "View Settings" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff Settings" + +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Save &All" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Save .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Swap Source with Destination" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Show Statistics" + +#: komparepart/kompare_part.cpp:269 +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" + +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff Options" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch Files" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Save .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "The file exists or is write-protected; do you want to overwrite it?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "File Exists" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Overwrite" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Do Not Overwrite" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Running diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Parsing diff output..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Comparing file %1 with file %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Comparing files in %1 with files in %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Viewing diff output from %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Blending diff output from %1 into file %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Blending diff output from %1 into folder %2" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 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." +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" -"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." +"You have made changes to the destination file(s).\n" +"Would you like to save them?" -#: main.cpp:41 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Save Changes?" + +#: komparepart/kompare_part.cpp:667 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. " +"No diff file, or no 2 files have been diffed. Therefore no stats are available." msgstr "" -"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. " +"No diff file, or no 2 files have been diffed. Therefore no stats are available." -#: main.cpp:42 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff Statistics" + +#: komparepart/kompare_part.cpp:673 msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +"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 "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" -#: main.cpp:43 +#: komparepart/kompare_part.cpp:686 msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +"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 "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Author" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare icon artist" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "A lot of good advice" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff viewer" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Compare these files or folder" +"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" |