diff options
Diffstat (limited to 'tde-i18n-cy/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-cy/messages/tdesdk/kompare.po | 841 |
1 files changed, 434 insertions, 407 deletions
diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po index ea1c0865cd5..b3b7263c0bc 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 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <[email protected]>\n" "Language-Team: cy <[email protected]>\n" @@ -10,308 +10,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"<qt>No models or no differences, this file: <b>%1</b>" -", is not a valid diff file.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>" -".</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:350 -msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"<qt>Could not create destination directory <b>%1</b>.\n" -"The file has not been saved.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"<qt>Could not upload the temporary file to the destination location <b>%1</b>" -". The temporary file is still available under: <b>%2</b>" -". You can manually copy it to the right place.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "" - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Llinell orchymyn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Fformat" - -#. 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 "" - -#. 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 "" - -#. 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 "Arferol" - -#. 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 "" - -#. 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 "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -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." -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. " -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 "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Awdur" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -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 "" - -#: main.cpp:189 -msgid "Compare these files or folder" -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 "" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "KD wrth KGyfieithu" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -409,17 +114,40 @@ 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. " +"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" @@ -503,19 +231,208 @@ msgstr "Anhysbys" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Cadw &Popeth" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "" + +#: 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 "" + +#: 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:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "" + +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, no-c-format +msgid "RCS" +msgstr "" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Arferol" + +#: 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 "" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Hoffterau" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Golwg Testun" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Gweld Gosodiadau" + #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Ffeiliau" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" #: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Golwg" + +#: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -540,15 +457,20 @@ msgstr "" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -666,14 +588,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -687,14 +609,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -761,145 +683,250 @@ msgstr "Wynebfath:" msgid "Size:" msgstr "Maint:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Hoffterau" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Wynebfath:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Gweld Gosodiadau" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Cadw &Popeth" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Dangos Ystadegau" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " +"file.</qt>" msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" +"qt>" msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." +"</qt>" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Ffeil yn Bodoli" +#: libdiff2/komparemodellist.cpp:350 +msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Trosysgrifo" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"<qt>Could not create destination directory <b>%1</b>.\n" +"The file has not been saved.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Peidio â Throsysgrifo" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"<qt>Could not upload the temporary file to the destination location <b>%1</" +"b>. The temporary file is still available under: <b>%2</b>. You can manually " +"copy it to the right place.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: 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:558 -msgid "Blending diff output from %1 into file %2" +#: 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:563 -msgid "Blending diff output from %1 into folder %2" +#: 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:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Cadw Newidiadau?" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Awdur" + +#: main.cpp:57 +msgid "Kompare icon artist" 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" +#: main.cpp:58 +msgid "A lot of good advice" 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" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Ffeiliau" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Gweld Gosodiadau" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Llinell orchymyn" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "De&wisiadau" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Fformat" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" |