msgid "" msgstr "" "Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n" "POT-Creation-Date: 2007-12-20 01:16+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: cy \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: komparepart/kompareprefdlg.cpp:33 msgid "Preferences" msgstr "Hoffterau" #: 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 "" #: 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 "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" 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?" #. 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 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 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 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" #: komparenavtreepart/komparenavtreepart.cpp:531 #: komparepart/kompare_part.cpp:651 msgid "Unknown" msgstr "Anhysbys" #: 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 "" #: libdialogpages/viewpage.cpp:51 msgid "Colors" msgstr "Lliwiau" #: libdialogpages/viewpage.cpp:56 msgid "Removed color:" msgstr "" #: libdialogpages/viewpage.cpp:61 msgid "Changed color:" msgstr "" #: libdialogpages/viewpage.cpp:66 msgid "Added color:" msgstr "" #: libdialogpages/viewpage.cpp:71 msgid "Applied color:" msgstr "" #: libdialogpages/viewpage.cpp:76 msgid "Mouse Wheel" msgstr "" #: libdialogpages/viewpage.cpp:80 msgid "Number of lines:" msgstr "Nifel llinellau:" #: libdialogpages/viewpage.cpp:86 msgid "Tabs to Spaces" msgstr "" #: libdialogpages/viewpage.cpp:90 msgid "Number of spaces to convert a tab character to:" msgstr "" #: 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:" #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" msgstr "" #: libdialogpages/diffpage.cpp:216 msgid "" "You can select a different diff program here. On Solaris the standard diff " "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" #: libdialogpages/diffpage.cpp:221 msgid "&Diff" msgstr "&Diff" #: libdialogpages/diffpage.cpp:232 msgid "Output Format" 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." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" #. i18n: file komparepart/komparesaveoptionsbase.ui line 312 #: libdialogpages/diffpage.cpp:251 rc.cpp:81 #, 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 " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" #: libdialogpages/diffpage.cpp:259 msgid "&Format" msgstr "&Fformat" #: libdialogpages/diffpage.cpp:270 msgid "General" msgstr "Cyffredinol" #: libdialogpages/diffpage.cpp:274 msgid "&Look for smaller changes" msgstr "" #: libdialogpages/diffpage.cpp:275 msgid "This corresponds to the -d diff option." msgstr "" #: libdialogpages/diffpage.cpp:276 msgid "O&ptimize for large files" msgstr "" #: libdialogpages/diffpage.cpp:277 msgid "This corresponds to the -H diff option." msgstr "" #: libdialogpages/diffpage.cpp:278 msgid "&Ignore changes in case" msgstr "" #: libdialogpages/diffpage.cpp:279 msgid "This corresponds to the -i diff option." msgstr "" #: libdialogpages/diffpage.cpp:284 msgid "Ignore regexp:" msgstr "" #: libdialogpages/diffpage.cpp:285 msgid "This option corresponds to the -I diff option." msgstr "" #: libdialogpages/diffpage.cpp:288 msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" #: libdialogpages/diffpage.cpp:294 msgid "&Edit..." msgstr "&Golygu..." #: libdialogpages/diffpage.cpp:295 msgid "" "Clicking this will open a regular expression dialog where\n" "you can graphically create regular expressions." msgstr "" #: libdialogpages/diffpage.cpp:300 msgid "Whitespace" msgstr "" #: libdialogpages/diffpage.cpp:304 msgid "E&xpand tabs to spaces in output" msgstr "" #: libdialogpages/diffpage.cpp:305 msgid "This option corresponds to the -t diff option." msgstr "" #: libdialogpages/diffpage.cpp:306 msgid "I&gnore added or removed empty lines" msgstr "" #: libdialogpages/diffpage.cpp:307 msgid "This option corresponds to the -B diff option." msgstr "" #: libdialogpages/diffpage.cpp:308 msgid "Ig&nore changes in the amount of whitespace" msgstr "" #: libdialogpages/diffpage.cpp:309 msgid "This option corresponds to the -b diff option." msgstr "" #: libdialogpages/diffpage.cpp:310 msgid "Ign&ore all whitespace" msgstr "" #: libdialogpages/diffpage.cpp:311 msgid "This option corresponds to the -w diff option." msgstr "" #: libdialogpages/diffpage.cpp:312 msgid "Igno&re changes due to tab expansion" msgstr "" #: libdialogpages/diffpage.cpp:313 msgid "This option corresponds to the -E diff option." msgstr "" #: libdialogpages/diffpage.cpp:318 msgid "O&ptions" msgstr "De&wisiadau" #: libdialogpages/diffpage.cpp:328 msgid "File Pattern to Exclude" 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." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" "Here you can enter or remove a shell pattern or select one or more entries from " "the list." msgstr "" #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" msgstr "" #: libdialogpages/diffpage.cpp:340 msgid "" "If this is checked you can enter a filename in the combo box on the right." 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." 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." msgstr "" #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" msgstr "" #: libdialogpages/filespage.cpp:53 msgid "Encoding" msgstr "Amgodiad" #: libdialogpages/filespage.cpp:64 msgid "&Files" msgstr "&Ffeiliau" #: _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" #: 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:397 main.cpp:185 msgid "Compare Files or Folders" msgstr "" #: kompare_shell.cpp:398 main.cpp:186 msgid "Source" msgstr "Tarddiad" #: kompare_shell.cpp:399 main.cpp:187 msgid "Destination" msgstr "Cyrchfan" #: kompare_shell.cpp:401 main.cpp:189 msgid "Compare" msgstr "" #: main.cpp:189 msgid "Compare these files or folder" msgstr "" #: kompare_shell.cpp:401 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 "" #: 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 msgid "Here you can change the options for the view." msgstr "" #: 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:694 msgid "KompareNavTreePart" msgstr "KompareNavTreePart" #. 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 287 #: rc.cpp:78 #, no-c-format msgid "Side-by-side" 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:232 msgid "&Open Diff..." msgstr "" #: kompare_shell.cpp:233 msgid "&Compare Files..." msgstr "" #: kompare_shell.cpp:236 msgid "&Blend URL with Diff..." msgstr "" #: kompare_shell.cpp:245 msgid "Show T&ext View" msgstr "" #: kompare_shell.cpp:247 msgid "Hide T&ext View" msgstr "" #: kompare_shell.cpp:256 msgid " 0 of 0 differences " msgstr "" #: kompare_shell.cpp:257 msgid " 0 of 0 files " msgstr "" #: kompare_shell.cpp:272 msgid "" "_n: %1 of %n file \n" " %1 of %n files " msgstr "" #: kompare_shell.cpp:274 #, c-format msgid "" "_n: %n file \n" " %n files " msgstr "" #: kompare_shell.cpp:277 msgid "" "_n: %1 of %n difference, %2 applied \n" " %1 of %n differences, %2 applied " msgstr "" #: kompare_shell.cpp:280 #, c-format msgid "" "_n: %n difference \n" " %n differences " msgstr "" #: kompare_shell.cpp:368 msgid "Blend File/Folder with diff Output" msgstr "" #: kompare_shell.cpp:369 msgid "File/Folder" msgstr "" #: kompare_shell.cpp:370 msgid "Diff Output" msgstr "" #: kompare_shell.cpp:372 msgid "Blend" msgstr "" #: kompare_shell.cpp:372 msgid "Blend this file or folder with the diff output" msgstr "" #: kompare_shell.cpp:372 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:401 msgid "Compare these files or folders" msgstr "" #: kompare_shell.cpp:439 msgid "Text View" msgstr "Golwg Testun" #: 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 "" "No models or no differences, this file: %1" ", is not a valid diff file." msgstr "" #: libdiff2/komparemodellist.cpp:246 msgid "" "There were problems applying the diff %1 to the file %2." msgstr "" #: libdiff2/komparemodellist.cpp:271 msgid "" "There were problems applying the diff %1 to the folder %2" "." msgstr "" #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 msgid "Could not open a temporary file." msgstr "" #: libdiff2/komparemodellist.cpp:350 msgid "Could not write to the temporary file %1, deleting it." msgstr "" #: libdiff2/komparemodellist.cpp:368 msgid "" "Could not create destination directory %1.\n" "The file has not been saved." msgstr "" #: libdiff2/komparemodellist.cpp:383 msgid "" "Could not upload the temporary file to the destination location %1" ". The temporary file is still available under: %2" ". You can manually copy it to the right place." 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 ""