diff options
author | Automated System <kb9vqf@pearsoncomputing.net> | 2014-09-29 12:26:02 -0500 |
---|---|---|
committer | Automated System <kb9vqf@pearsoncomputing.net> | 2014-09-29 12:26:02 -0500 |
commit | ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c (patch) | |
tree | bf4fc5ad5f5d27517ae17ce5d396e492aafde6eb /tde-i18n-cy/messages/tdesdk/kompare.po | |
parent | dde6a6f118e2358c2aace236dd18d5bca405381c (diff) | |
download | tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.tar.gz tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.zip |
Automated l10n update (.po files)
Diffstat (limited to 'tde-i18n-cy/messages/tdesdk/kompare.po')
-rw-r--r-- | tde-i18n-cy/messages/tdesdk/kompare.po | 810 |
1 files changed, 405 insertions, 405 deletions
diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po index e20b5d58626..ea1c0865cd5 100644 --- a/tde-i18n-cy/messages/tdesdk/kompare.po +++ b/tde-i18n-cy/messages/tdesdk/kompare.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Language-Team: cy <LL@li.org>\n" @@ -10,97 +10,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "KD wrth KGyfieithu" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "kyfieithu@dotmon.com" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Ffeil Tarddiad" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" - -#: 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 "" - -#: 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 "" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Anhysbys" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "" @@ -183,152 +92,6 @@ msgstr "" msgid "Could not write to the temporary file." msgstr "" -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "" - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "" - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "" - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "" - -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "" - -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "" - -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "" - -#: kompare_shell.cpp:246 -msgid "Show T&ext View" -msgstr "" - -#: kompare_shell.cpp:248 -msgid "Hide T&ext View" -msgstr "" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr "" - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr "" - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" - -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" - -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" - -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" - -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "" - -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "" - -#: kompare_shell.cpp:371 -msgid "Diff Output" -msgstr "" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "" - -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" -msgstr "" - -#: 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 "" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Tarddiad" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cyrchfan" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "" - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "" - -#: 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 "" - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Golwg Testun" - -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "" - -#: 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 "" - -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "" - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -455,208 +218,306 @@ msgstr "" msgid "Number of context lines:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Hoffterau" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Gweld Gosodiadau" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "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 "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Cadw &Popeth" +#: 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 "" -#: komparepart/kompare_part.cpp:168 -msgid "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 "" -#: komparepart/kompare_part.cpp:171 -msgid "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 "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Dangos Ystadegau" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Awdur" + +#: main.cpp:57 +msgid "Kompare icon artist" msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: main.cpp:58 +msgid "A lot of good advice" msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: main.cpp:59 +msgid "Cervisia diff viewer" msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Tarddiad" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cyrchfan" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Ffeil yn Bodoli" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Trosysgrifo" +#: 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 "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Peidio â Throsysgrifo" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "KD wrth KGyfieithu" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "kyfieithu@dotmon.com" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: kompare_shell.cpp:233 +msgid "&Open Diff..." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +#: kompare_shell.cpp:246 +msgid "Show T&ext View" msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Cadw Newidiadau?" +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "" -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "" + +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr "" + +#: kompare_shell.cpp:273 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: kompare_shell.cpp:275 +#, c-format +msgid "" +"_n: %n file \n" +" %n files " msgstr "" -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:278 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: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:281 +#, 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: %n difference \n" +" %n differences " msgstr "" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "Amgodiad" +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "&Ffeiliau" +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Lliwiau" +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "" -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" +#: kompare_shell.cpp:373 +msgid "Blend" msgstr "" -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" msgstr "" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" +#: 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 "" -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" msgstr "" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Golwg Testun" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Nifel llinellau:" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Ffeil Tarddiad" + +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" msgstr "" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" msgstr "" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "&Golwg" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "Wynebfath y testun" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Wynebfath:" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Maint:" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Anhysbys" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + +#: 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 "" + +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." +msgstr "" #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" @@ -840,66 +701,205 @@ msgstr "" msgid "&Exclude" msgstr "" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "Amgodiad" + +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "&Ffeiliau" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Lliwiau" + +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" msgstr "" -#: main.cpp:39 -msgid "This will compare URL1 with URL2" +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" 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:66 +msgid "Added color:" 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:71 +msgid "Applied color:" msgstr "" -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" 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." +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Nifel llinellau:" + +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" msgstr "" -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "&Golwg" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "Wynebfath y testun" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Wynebfath:" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "Maint:" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Hoffterau" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Gweld Gosodiadau" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" msgstr "" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Awdur" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Cadw &Popeth" -#: main.cpp:57 -msgid "Kompare icon artist" +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." msgstr "" -#: main.cpp:58 -msgid "A lot of good advice" +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" msgstr "" -#: main.cpp:59 -msgid "Cervisia diff viewer" +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Dangos Ystadegau" + +#: komparepart/kompare_part.cpp:269 +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgstr "" -#: main.cpp:189 -msgid "Compare these files or folder" +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "" + +#: 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" +msgstr "Ffeil yn Bodoli" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Trosysgrifo" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Peidio â Throsysgrifo" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "" + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "" + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Cadw Newidiadau?" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." +msgstr "" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "" + +#: 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 "" + +#: 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 "" |