Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdesdk/kompare
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/kompare/
pull/6/head
TDE Weblate 6 years ago
parent b7f2145dc1
commit 364e0ab2be

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kompare\n" "Project-Id-Version: kompare\n"
"POT-Creation-Date: 2014-09-29 12:05-0500\n" "POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2002-07-02 08:32+200\n" "PO-Revision-Date: 2002-07-02 08:32+200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n" "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n" "Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n"
@ -14,310 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: libdiff2/komparemodellist.cpp:61 #: _translatorinfo:1
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 "Restr dia&raok"
#: libdiff2/komparemodellist.cpp:76
msgid "N&ext File"
msgstr "Restr a h&eul"
#: 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 "N'hellan ket digeriñ ur restr padennek."
#: libdiff2/komparemodellist.cpp:350
msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr ""
"<qt>Ne m'eus ket gallet skrivañ d'ar restr padennek <b>%1</b>"
", emaon o lemel anezhañ.</qt>"
#: 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 "Heñvel eo ar restroù."
#: libdiff2/komparemodellist.cpp:613
msgid "Could not write to the temporary file."
msgstr "Ne m'eus ket skrivañ d'ar restr padennek."
#. i18n: file komparepart/komparepartui.rc line 13
#: rc.cpp:15
#, no-c-format
msgid "&Difference"
msgstr "&Difereñs"
#. 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 "Linenn urzhiañ"
#. 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 "Furmadiñ"
#. 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 "Boas"
#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
#, no-c-format
msgid "RCS"
msgstr "RCS"
#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
#, no-c-format
msgid "Unified"
msgstr ""
#. 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 "(c) 2001-2004, John Firebaugh hag Otto Bruggeman"
#: main.cpp:55 main.cpp:56
msgid "Author"
msgstr "Oberour"
#: 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 "Tarzh"
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr "Dehaezadur"
#: 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
msgid "" msgid ""
"_: NAME OF TRANSLATORS\n" "_: NAME OF TRANSLATORS\n"
"Your names" "Your names"
msgstr "Thierry Vignaud, Jañ-Mai Drapier" msgstr "Thierry Vignaud, Jañ-Mai Drapier"
#: _translatorinfo.cpp:3 #: _translatorinfo:2
msgid "" msgid ""
"_: EMAIL OF TRANSLATORS\n" "_: EMAIL OF TRANSLATORS\n"
"Your emails" "Your emails"
@ -415,17 +118,40 @@ msgstr ""
#: kompare_shell.cpp:373 #: kompare_shell.cpp:373
msgid "" msgid ""
"If you have entered a file or folder name and a file that contains diff output " "If you have entered a file or folder name and a file that contains diff "
"in the fields in this dialog then this button will be enabled and pressing it " "output in the fields in this dialog then this button will be enabled and "
"will open kompare's main view where the output of the entered file or files " "pressing it will open kompare's main view where the output of the entered "
"from the folder are mixed with the diff output so you can then apply the " "file or files from the folder are mixed with the diff output so you can then "
"difference(s) to a file or to the files. " "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 "Tarzh"
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr "Dehaezadur"
#: kompare_shell.cpp:402 main.cpp:189
msgid "Compare"
msgstr "" msgstr ""
#: kompare_shell.cpp:402 #: kompare_shell.cpp:402
msgid "Compare these files or folders" msgid "Compare these files or folders"
msgstr "" 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 #: kompare_shell.cpp:439
msgid "Text View" msgid "Text View"
msgstr "Gwel ar skrid" msgstr "Gwel ar skrid"
@ -509,18 +235,207 @@ msgstr "Dianav"
msgid "KompareNavTreePart" msgid "KompareNavTreePart"
msgstr "KompareNavTreePart" msgstr "KompareNavTreePart"
#: kompareurldialog.cpp:41 #: komparepart/kompare_part.cpp:165
msgid "Here you can enter the files you want to compare." msgid "Save &All"
msgstr "Enrol&lañ an holl re"
#: 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 "Diskouez ar stadegoù"
#: komparepart/kompare_part.cpp:269
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
msgstr "<qt>N'em eus ket enkargañ an URL <b>%1</b>.</qt>"
#: komparepart/kompare_part.cpp:281
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
msgstr "<qt>N'eo ket endeo an URL <b>%1</b> e-barzh ho reizhiad.</qt>"
#: komparepart/kompare_part.cpp:425
msgid "Diff Options"
msgstr "Dibaboù diff"
#: komparepart/kompare_part.cpp:443
msgid "*.diff *.dif *.patch|Patch Files"
msgstr "*.diff *.dif *.patch|Restroù Patch"
#: komparepart/kompare_part.cpp:443
msgid "Save .diff"
msgstr "Enrollañ .diff"
#: komparepart/kompare_part.cpp:446
msgid "The file exists or is write-protected; do you want to overwrite it?"
msgstr ""
#: komparepart/kompare_part.cpp:446
msgid "File Exists"
msgstr "Ar restr a zo endeo"
#: komparepart/kompare_part.cpp:446
msgid "Overwrite"
msgstr "Rasklañ"
#: komparepart/kompare_part.cpp:446
msgid "Do Not Overwrite"
msgstr "Ne rasklit ket"
#: komparepart/kompare_part.cpp:481
msgid "KomparePart"
msgstr "KomparePart"
#: komparepart/kompare_part.cpp:493
msgid "Running diff..."
msgstr "Emaon o seveniñ diff ..."
#: komparepart/kompare_part.cpp:496
msgid "Parsing diff output..."
msgstr ""
#: komparepart/kompare_part.cpp:545
msgid "Comparing file %1 with file %2"
msgstr "" 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 "Enrollañ ar c'hemmoù ?"
#: 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 "RCS"
#: 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 "Boas"
#: 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 "Dibaboù"
#: komparepart/kompareprefdlg.cpp:39
#, fuzzy
msgid "View"
msgstr "Gwel ar skrid"
#: komparepart/kompareprefdlg.cpp:39
msgid "View Settings"
msgstr "Sell ouzh an dibarzhoù"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff" msgid "Diff"
msgstr "Diff" msgstr "Diff"
#: komparepart/kompareprefdlg.cpp:43
msgid "Diff Settings"
msgstr ""
#: kompareurldialog.cpp:41
#, fuzzy
msgid "Files"
msgstr "&Restroù"
#: kompareurldialog.cpp:41
msgid "Here you can enter the files you want to compare."
msgstr ""
#: kompareurldialog.cpp:47 #: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files." msgid "Here you can change the options for comparing the files."
msgstr "" msgstr ""
#: kompareurldialog.cpp:53
#, fuzzy
msgid "Appearance"
msgstr "&Neuziadur"
#: kompareurldialog.cpp:53 #: kompareurldialog.cpp:53
msgid "Here you can change the options for the view." msgid "Here you can change the options for the view."
msgstr "Amañ e c'hellit kemmañ dibarzhoù ar gwell." msgstr "Amañ e c'hellit kemmañ dibarzhoù ar gwell."
@ -546,15 +461,20 @@ msgstr "Furmad ezkas"
#: libdialogpages/diffpage.cpp:233 #: libdialogpages/diffpage.cpp:233
msgid "" msgid ""
"Select the format of the output generated by diff. Unified is the one that is " "Select the format of the output generated by diff. Unified is the one that "
"used most frequently because it is very readable. The TDE developers like this " "is used most frequently because it is very readable. The TDE developers like "
"format the best so use it for sending patches." "this format the best so use it for sending patches."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:247 #: libdialogpages/diffpage.cpp:247
msgid "Lines of Context" msgid "Lines of Context"
msgstr "" msgstr ""
#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
#, no-c-format
msgid "Number of context lines:"
msgstr ""
#: libdialogpages/diffpage.cpp:253 #: libdialogpages/diffpage.cpp:253
msgid "" msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable " "The number of context lines is normally 2 or 3. This makes the diff readable "
@ -672,14 +592,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:330 #: libdialogpages/diffpage.cpp:330
msgid "" msgid ""
"If this is checked you can enter a shell pattern in the text box on the right " "If this is checked you can enter a shell pattern in the text box on the "
"or select entries from the list." "right or select entries from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:332 #: libdialogpages/diffpage.cpp:332
msgid "" msgid ""
"Here you can enter or remove a shell pattern or select one or more entries from " "Here you can enter or remove a shell pattern or select one or more entries "
"the list." "from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:338 #: libdialogpages/diffpage.cpp:338
@ -693,14 +613,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:342 #: libdialogpages/diffpage.cpp:342
msgid "" msgid ""
"Here you can enter the URL of a file with shell patterns to ignore during the " "Here you can enter the URL of a file with shell patterns to ignore during "
"comparison of the folders." "the comparison of the folders."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:344 #: libdialogpages/diffpage.cpp:344
msgid "" msgid ""
"Any file you select in the dialog that pops up when you click it will be put in " "Any file you select in the dialog that pops up when you click it will be put "
"the dialog to the left of this button." "in the dialog to the left of this button."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:352 #: libdialogpages/diffpage.cpp:352
@ -767,145 +687,252 @@ msgstr "Nodrezh :"
msgid "Size:" msgid "Size:"
msgstr "Ment :" msgstr "Ment :"
#: komparepart/kompareprefdlg.cpp:33 #: libdialogpages/viewpage.cpp:119
msgid "Preferences" #, fuzzy
msgstr "Dibaboù" msgid "&Fonts"
msgstr "Nodrezh :"
#: komparepart/kompareprefdlg.cpp:39 #: libdiff2/komparemodellist.cpp:61
msgid "View Settings" msgid "&Apply Difference"
msgstr "Sell ouzh an dibarzhoù" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 #: libdiff2/komparemodellist.cpp:64
msgid "Diff Settings" msgid "Un&apply Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:165 #: libdiff2/komparemodellist.cpp:67
msgid "Save &All" msgid "App&ly All"
msgstr "Enrol&lañ an holl re" msgstr ""
#: komparepart/kompare_part.cpp:168 #: libdiff2/komparemodellist.cpp:70
msgid "Save .&diff..." msgid "&Unapply All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:171 #: libdiff2/komparemodellist.cpp:73
msgid "Swap Source with Destination" msgid "P&revious File"
msgstr "Restr dia&raok"
#: libdiff2/komparemodellist.cpp:76
msgid "N&ext File"
msgstr "Restr a h&eul"
#: libdiff2/komparemodellist.cpp:79
msgid "&Previous Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:174 #: libdiff2/komparemodellist.cpp:82
msgid "Show Statistics" msgid "&Next Difference"
msgstr "Diskouez ar stadegoù" msgstr ""
#: komparepart/kompare_part.cpp:269 #: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgid ""
msgstr "<qt>N'em eus ket enkargañ an URL <b>%1</b>.</qt>" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
"file.</qt>"
msgstr ""
#: komparepart/kompare_part.cpp:281 #: libdiff2/komparemodellist.cpp:246
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgid ""
msgstr "<qt>N'eo ket endeo an URL <b>%1</b> e-barzh ho reizhiad.</qt>" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
"qt>"
msgstr ""
#: komparepart/kompare_part.cpp:425 #: libdiff2/komparemodellist.cpp:271
msgid "Diff Options" msgid ""
msgstr "Dibaboù diff" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
"</qt>"
msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
msgid "*.diff *.dif *.patch|Patch Files" msgid "Could not open a temporary file."
msgstr "*.diff *.dif *.patch|Restroù Patch" msgstr "N'hellan ket digeriñ ur restr padennek."
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:350
msgid "Save .diff" msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr "Enrollañ .diff" msgstr ""
"<qt>Ne m'eus ket gallet skrivañ d'ar restr padennek <b>%1</b>, emaon o lemel "
"anezhañ.</qt>"
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:368
msgid "The file exists or is write-protected; do you want to overwrite it?" msgid ""
"<qt>Could not create destination directory <b>%1</b>.\n"
"The file has not been saved.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:383
msgid "File Exists" msgid ""
msgstr "Ar restr a zo endeo" "<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:446 #: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
msgid "Overwrite" msgid "Could not parse diff output."
msgstr "Rasklañ" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:451
msgid "Do Not Overwrite" msgid "The files are identical."
msgstr "Ne rasklit ket" msgstr "Heñvel eo ar restroù."
#: komparepart/kompare_part.cpp:481 #: libdiff2/komparemodellist.cpp:613
msgid "KomparePart" msgid "Could not write to the temporary file."
msgstr "KomparePart" msgstr "Ne m'eus ket skrivañ d'ar restr padennek."
#: komparepart/kompare_part.cpp:493 #: main.cpp:33
msgid "Running diff..." msgid ""
msgstr "Emaon o seveniñ diff ..." "A program to view the differences between files and optionally generate a "
"diff"
msgstr ""
#: komparepart/kompare_part.cpp:496 #: main.cpp:39
msgid "Parsing diff output..." msgid "This will compare URL1 with URL2"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:545 #: main.cpp:40
msgid "Comparing file %1 with file %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:550 #: main.cpp:41
msgid "Comparing files in %1 with files in %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:555 #: main.cpp:42
#, c-format msgid ""
msgid "Viewing diff output from %1" "Disables the check for automatically finding the original file(s) when using "
"'-' as URL with the -o option."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:558 #: main.cpp:43
msgid "Blending diff output from %1 into file %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:563 #: main.cpp:52
msgid "Blending diff output from %1 into folder %2" msgid "Kompare"
msgstr "Kompare"
#: main.cpp:54
msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr "(c) 2001-2004, John Firebaugh hag Otto Bruggeman"
#: main.cpp:55 main.cpp:56
msgid "Author"
msgstr "Oberour"
#: main.cpp:57
msgid "Kompare icon artist"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #: main.cpp:58
msgid "" msgid "A lot of good advice"
"You have made changes to the destination file(s).\n"
"Would you like to save them?"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #: main.cpp:59
msgid "Save Changes?" msgid "Cervisia diff viewer"
msgstr "Enrollañ ar c'hemmoù ?" msgstr ""
#: komparepart/kompare_part.cpp:667 #: main.cpp:189
msgid "" msgid "Compare these files or folder"
"No diff file, or no 2 files have been diffed. Therefore no stats are available."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 #: komparepart/komparepartui.rc:4 kompareui.rc:4
#: komparepart/kompare_part.cpp:698 #, fuzzy, no-c-format
msgid "Diff Statistics" msgid "&File"
msgstr "&Restroù"
#: komparepart/komparepartui.rc:13
#, no-c-format
msgid "&Difference"
msgstr "&Difereñs"
#: komparepart/komparepartui.rc:25 kompareui.rc:14
#, fuzzy, no-c-format
msgid "&Settings"
msgstr "Sell ouzh an dibarzhoù"
#: komparepart/komparesaveoptionsbase.ui:41
#, no-c-format
msgid "Run Diff In"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:673 #: komparepart/komparesaveoptionsbase.ui:84
msgid "" #, no-c-format
"Statistics:\n" msgid "Command Line"
"\n" msgstr "Linenn urzhiañ"
"Old file: %1\n"
"New file: %2\n" #: komparepart/komparesaveoptionsbase.ui:108
"\n" #, no-c-format
"Format: %3\n" msgid "cd dir && diff -udHprNa -- source destination"
"Number of hunks: %4\n"
"Number of differences: %5"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:686 #: komparepart/komparesaveoptionsbase.ui:118
msgid "" #, fuzzy, no-c-format
"Statistics:\n" msgid "Options"
"\n" msgstr "&Dibaboù"
"Number of files in diff file: %1\n"
"Format: %2\n" #: komparepart/komparesaveoptionsbase.ui:135
"\n" #, no-c-format
"Current old file: %3\n" msgid "Look for smaller changes"
"Current new file: %4\n" msgstr ""
"\n"
"Number of hunks: %5\n" #: komparepart/komparesaveoptionsbase.ui:146
"Number of differences: %6" #, 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 "Furmadiñ"
#: komparepart/komparesaveoptionsbase.ui:287
#, no-c-format
msgid "Side-by-side"
msgstr ""
#: kompareui.rc:27
#, no-c-format
msgid "Main Toolbar"
msgstr "" msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,7 +1,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n" "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" "PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: cy <LL@li.org>\n" "Language-Team: cy <LL@li.org>\n"
@ -10,308 +10,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: libdiff2/komparemodellist.cpp:61 #: _translatorinfo:1
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
msgid "" msgid ""
"_: NAME OF TRANSLATORS\n" "_: NAME OF TRANSLATORS\n"
"Your names" "Your names"
msgstr "KD wrth KGyfieithu" msgstr "KD wrth KGyfieithu"
#: _translatorinfo.cpp:3 #: _translatorinfo:2
msgid "" msgid ""
"_: EMAIL OF TRANSLATORS\n" "_: EMAIL OF TRANSLATORS\n"
"Your emails" "Your emails"
@ -409,17 +114,40 @@ msgstr ""
#: kompare_shell.cpp:373 #: kompare_shell.cpp:373
msgid "" msgid ""
"If you have entered a file or folder name and a file that contains diff output " "If you have entered a file or folder name and a file that contains diff "
"in the fields in this dialog then this button will be enabled and pressing it " "output in the fields in this dialog then this button will be enabled and "
"will open kompare's main view where the output of the entered file or files " "pressing it will open kompare's main view where the output of the entered "
"from the folder are mixed with the diff output so you can then apply the " "file or files from the folder are mixed with the diff output so you can then "
"difference(s) to a file or to the files. " "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 "" msgstr ""
#: kompare_shell.cpp:402 #: kompare_shell.cpp:402
msgid "Compare these files or folders" msgid "Compare these files or folders"
msgstr "" 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 #: kompare_shell.cpp:439
msgid "Text View" msgid "Text View"
msgstr "Golwg Testun" msgstr "Golwg Testun"
@ -499,22 +227,211 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "Anhysbys" msgstr "Anhysbys"
#: komparenavtreepart/komparenavtreepart.cpp:694 #: komparenavtreepart/komparenavtreepart.cpp:694
msgid "KompareNavTreePart" msgid "KompareNavTreePart"
msgstr "KompareNavTreePart" msgstr "KompareNavTreePart"
#: 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 #: kompareurldialog.cpp:41
msgid "Here you can enter the files you want to compare." msgid "Here you can enter the files you want to compare."
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
#: kompareurldialog.cpp:47 #: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files." msgid "Here you can change the options for comparing the files."
msgstr "" msgstr ""
#: kompareurldialog.cpp:53
#, fuzzy
msgid "Appearance"
msgstr "&Golwg"
#: kompareurldialog.cpp:53 #: kompareurldialog.cpp:53
msgid "Here you can change the options for the view." msgid "Here you can change the options for the view."
msgstr "" msgstr ""
@ -540,15 +457,20 @@ msgstr ""
#: libdialogpages/diffpage.cpp:233 #: libdialogpages/diffpage.cpp:233
msgid "" msgid ""
"Select the format of the output generated by diff. Unified is the one that is " "Select the format of the output generated by diff. Unified is the one that "
"used most frequently because it is very readable. The TDE developers like this " "is used most frequently because it is very readable. The TDE developers like "
"format the best so use it for sending patches." "this format the best so use it for sending patches."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:247 #: libdialogpages/diffpage.cpp:247
msgid "Lines of Context" msgid "Lines of Context"
msgstr "" msgstr ""
#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
#, no-c-format
msgid "Number of context lines:"
msgstr ""
#: libdialogpages/diffpage.cpp:253 #: libdialogpages/diffpage.cpp:253
msgid "" msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable " "The number of context lines is normally 2 or 3. This makes the diff readable "
@ -666,14 +588,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:330 #: libdialogpages/diffpage.cpp:330
msgid "" msgid ""
"If this is checked you can enter a shell pattern in the text box on the right " "If this is checked you can enter a shell pattern in the text box on the "
"or select entries from the list." "right or select entries from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:332 #: libdialogpages/diffpage.cpp:332
msgid "" msgid ""
"Here you can enter or remove a shell pattern or select one or more entries from " "Here you can enter or remove a shell pattern or select one or more entries "
"the list." "from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:338 #: libdialogpages/diffpage.cpp:338
@ -687,14 +609,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:342 #: libdialogpages/diffpage.cpp:342
msgid "" msgid ""
"Here you can enter the URL of a file with shell patterns to ignore during the " "Here you can enter the URL of a file with shell patterns to ignore during "
"comparison of the folders." "the comparison of the folders."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:344 #: libdialogpages/diffpage.cpp:344
msgid "" msgid ""
"Any file you select in the dialog that pops up when you click it will be put in " "Any file you select in the dialog that pops up when you click it will be put "
"the dialog to the left of this button." "in the dialog to the left of this button."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:352 #: libdialogpages/diffpage.cpp:352
@ -761,145 +683,250 @@ msgstr "Wynebfath:"
msgid "Size:" msgid "Size:"
msgstr "Maint:" msgstr "Maint:"
#: komparepart/kompareprefdlg.cpp:33 #: libdialogpages/viewpage.cpp:119
msgid "Preferences" #, fuzzy
msgstr "Hoffterau" msgid "&Fonts"
msgstr "Wynebfath:"
#: komparepart/kompareprefdlg.cpp:39 #: libdiff2/komparemodellist.cpp:61
msgid "View Settings" msgid "&Apply Difference"
msgstr "Gweld Gosodiadau" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 #: libdiff2/komparemodellist.cpp:64
msgid "Diff Settings" msgid "Un&apply Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:165 #: libdiff2/komparemodellist.cpp:67
msgid "Save &All" msgid "App&ly All"
msgstr "Cadw &Popeth" msgstr ""
#: komparepart/kompare_part.cpp:168 #: libdiff2/komparemodellist.cpp:70
msgid "Save .&diff..." msgid "&Unapply All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:171 #: libdiff2/komparemodellist.cpp:73
msgid "Swap Source with Destination" msgid "P&revious File"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:174 #: libdiff2/komparemodellist.cpp:76
msgid "Show Statistics" msgid "N&ext File"
msgstr "Dangos Ystadegau" msgstr ""
#: komparepart/kompare_part.cpp:269 #: libdiff2/komparemodellist.cpp:79
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgid "&Previous Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:281 #: libdiff2/komparemodellist.cpp:82
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgid "&Next Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:425 #: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
msgid "Diff Options" msgid ""
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
"file.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:246
msgid "*.diff *.dif *.patch|Patch Files" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
"qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:271
msgid "Save .diff" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
"</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
msgid "The file exists or is write-protected; do you want to overwrite it?" msgid "Could not open a temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:350
msgid "File Exists" msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr "Ffeil yn Bodoli" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:368
msgid "Overwrite" msgid ""
msgstr "Trosysgrifo" "<qt>Could not create destination directory <b>%1</b>.\n"
"The file has not been saved.</qt>"
msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:383
msgid "Do Not Overwrite" msgid ""
msgstr "Peidio â Throsysgrifo" "<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 #: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
msgid "KomparePart" msgid "Could not parse diff output."
msgstr "KomparePart" msgstr ""
#: komparepart/kompare_part.cpp:493 #: libdiff2/komparemodellist.cpp:451
msgid "Running diff..." msgid "The files are identical."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:496 #: libdiff2/komparemodellist.cpp:613
msgid "Parsing diff output..." msgid "Could not write to the temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:545 #: main.cpp:33
msgid "Comparing file %1 with file %2" msgid ""
"A program to view the differences between files and optionally generate a "
"diff"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:550 #: main.cpp:39
msgid "Comparing files in %1 with files in %2" msgid "This will compare URL1 with URL2"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:555 #: main.cpp:40
#, c-format msgid ""
msgid "Viewing diff output from %1" "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 "" msgstr ""
#: komparepart/kompare_part.cpp:558 #: main.cpp:41
msgid "Blending diff output from %1 into file %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:563 #: main.cpp:42
msgid "Blending diff output from %1 into folder %2" msgid ""
"Disables the check for automatically finding the original file(s) when using "
"'-' as URL with the -o option."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #: main.cpp:43
msgid "" msgid ""
"You have made changes to the destination file(s).\n" "Use this to specify the encoding when calling it from the command line. It "
"Would you like to save them?" "will default to the local encoding if not specified."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #: main.cpp:52
msgid "Save Changes?" msgid "Kompare"
msgstr "Cadw Newidiadau?" msgstr "Kompare"
#: komparepart/kompare_part.cpp:667 #: main.cpp:54
msgid "" msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
"No diff file, or no 2 files have been diffed. Therefore no stats are available."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 #: main.cpp:55 main.cpp:56
#: komparepart/kompare_part.cpp:698 msgid "Author"
msgid "Diff Statistics" msgstr "Awdur"
#: main.cpp:57
msgid "Kompare icon artist"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:673 #: main.cpp:58
msgid "" msgid "A lot of good advice"
"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 "" msgstr ""
#: komparepart/kompare_part.cpp:686 #: main.cpp:59
msgid "" msgid "Cervisia diff viewer"
"Statistics:\n" msgstr ""
"\n"
"Number of files in diff file: %1\n" #: main.cpp:189
"Format: %2\n" msgid "Compare these files or folder"
"\n" msgstr ""
"Current old file: %3\n"
"Current new file: %4\n" #: komparepart/komparepartui.rc:4 kompareui.rc:4
"\n" #, fuzzy, no-c-format
"Number of hunks: %5\n" msgid "&File"
"Number of differences: %6" 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 "" msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-09-29 12:05-0500\n" "POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2002-03-23 20:48EEST\n" "PO-Revision-Date: 2002-03-23 20:48EEST\n"
"Last-Translator: Andris Maziks <andzha@latnet.lv>\n" "Last-Translator: Andris Maziks <andzha@latnet.lv>\n"
"Language-Team: Latvian\n" "Language-Team: Latvian\n"
@ -15,308 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n" "X-Generator: KBabel 0.9.5\n"
#: libdiff2/komparemodellist.cpp:61 #: _translatorinfo:1
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 "Nāk&ošais Fails"
#: 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 ""
#. 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 "Formāts"
#. 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 "Konteksts"
#. 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 "Normāls"
#. 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 ""
#: main.cpp:54
msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr ""
#: main.cpp:55 main.cpp:56
msgid "Author"
msgstr ""
#: main.cpp:57
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 "Avots"
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr "Mērķis"
#: 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
msgid "" msgid ""
"_: NAME OF TRANSLATORS\n" "_: NAME OF TRANSLATORS\n"
"Your names" "Your names"
msgstr "Andris Maziks" msgstr "Andris Maziks"
#: _translatorinfo.cpp:3 #: _translatorinfo:2
msgid "" msgid ""
"_: EMAIL OF TRANSLATORS\n" "_: EMAIL OF TRANSLATORS\n"
"Your emails" "Your emails"
@ -416,17 +121,40 @@ msgstr ""
#: kompare_shell.cpp:373 #: kompare_shell.cpp:373
msgid "" msgid ""
"If you have entered a file or folder name and a file that contains diff output " "If you have entered a file or folder name and a file that contains diff "
"in the fields in this dialog then this button will be enabled and pressing it " "output in the fields in this dialog then this button will be enabled and "
"will open kompare's main view where the output of the entered file or files " "pressing it will open kompare's main view where the output of the entered "
"from the folder are mixed with the diff output so you can then apply the " "file or files from the folder are mixed with the diff output so you can then "
"difference(s) to a file or to the files. " "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 "Avots"
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr "Mērķis"
#: kompare_shell.cpp:402 main.cpp:189
msgid "Compare"
msgstr "" msgstr ""
#: kompare_shell.cpp:402 #: kompare_shell.cpp:402
msgid "Compare these files or folders" msgid "Compare these files or folders"
msgstr "" 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 #: kompare_shell.cpp:439
msgid "Text View" msgid "Text View"
msgstr "Teksta Skatījums" msgstr "Teksta Skatījums"
@ -503,27 +231,217 @@ msgid ""
"Deleted %n lines" "Deleted %n lines"
msgstr "" msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:531 #: komparenavtreepart/komparenavtreepart.cpp:531
#: komparepart/kompare_part.cpp:651 #: komparepart/kompare_part.cpp:651
msgid "Unknown" msgid "Unknown"
msgstr "Nezināms" msgstr "Nezināms"
#: komparenavtreepart/komparenavtreepart.cpp:694
msgid "KompareNavTreePart"
msgstr ""
#: komparepart/kompare_part.cpp:165
msgid "Save &All"
msgstr ""
#: 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 ""
#: 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 ""
#: komparepart/kompare_part.cpp:446
msgid "Overwrite"
msgstr ""
#: komparepart/kompare_part.cpp:446
msgid "Do Not Overwrite"
msgstr ""
#: komparepart/kompare_part.cpp:481
msgid "KomparePart"
msgstr ""
#: 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 ""
#: 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 "Konteksts"
#: 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 "Normāls"
#: 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 "Uzstādījumi"
#: komparepart/kompareprefdlg.cpp:39
#, fuzzy
msgid "View"
msgstr "Teksta Skatījums"
#: komparepart/kompareprefdlg.cpp:39
#, fuzzy
msgid "View Settings"
msgstr "Vispārējs"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
#: komparenavtreepart/komparenavtreepart.cpp:694 #: komparepart/kompareprefdlg.cpp:43
msgid "KompareNavTreePart" msgid "Diff Settings"
msgstr "" msgstr ""
#: kompareurldialog.cpp:41
#, fuzzy
msgid "Files"
msgstr "Nāk&ošais Fails"
#: kompareurldialog.cpp:41 #: kompareurldialog.cpp:41
msgid "Here you can enter the files you want to compare." msgid "Here you can enter the files you want to compare."
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
#: kompareurldialog.cpp:47 #: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files." msgid "Here you can change the options for comparing the files."
msgstr "" msgstr ""
#: kompareurldialog.cpp:53
#, fuzzy
msgid "Appearance"
msgstr "&Izskats"
#: kompareurldialog.cpp:53 #: kompareurldialog.cpp:53
msgid "Here you can change the options for the view." msgid "Here you can change the options for the view."
msgstr "" msgstr ""
@ -551,9 +469,9 @@ msgstr "Izvades formāts"
#: libdialogpages/diffpage.cpp:233 #: libdialogpages/diffpage.cpp:233
msgid "" msgid ""
"Select the format of the output generated by diff. Unified is the one that is " "Select the format of the output generated by diff. Unified is the one that "
"used most frequently because it is very readable. The TDE developers like this " "is used most frequently because it is very readable. The TDE developers like "
"format the best so use it for sending patches." "this format the best so use it for sending patches."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:247 #: libdialogpages/diffpage.cpp:247
@ -561,6 +479,11 @@ msgstr ""
msgid "Lines of Context" msgid "Lines of Context"
msgstr "Konteksts" msgstr "Konteksts"
#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
#, no-c-format
msgid "Number of context lines:"
msgstr ""
#: libdialogpages/diffpage.cpp:253 #: libdialogpages/diffpage.cpp:253
msgid "" msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable " "The number of context lines is normally 2 or 3. This makes the diff readable "
@ -678,14 +601,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:330 #: libdialogpages/diffpage.cpp:330
msgid "" msgid ""
"If this is checked you can enter a shell pattern in the text box on the right " "If this is checked you can enter a shell pattern in the text box on the "
"or select entries from the list." "right or select entries from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:332 #: libdialogpages/diffpage.cpp:332
msgid "" msgid ""
"Here you can enter or remove a shell pattern or select one or more entries from " "Here you can enter or remove a shell pattern or select one or more entries "
"the list." "from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:338 #: libdialogpages/diffpage.cpp:338
@ -699,14 +622,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:342 #: libdialogpages/diffpage.cpp:342
msgid "" msgid ""
"Here you can enter the URL of a file with shell patterns to ignore during the " "Here you can enter the URL of a file with shell patterns to ignore during "
"comparison of the folders." "the comparison of the folders."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:344 #: libdialogpages/diffpage.cpp:344
msgid "" msgid ""
"Any file you select in the dialog that pops up when you click it will be put in " "Any file you select in the dialog that pops up when you click it will be put "
"the dialog to the left of this button." "in the dialog to the left of this button."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:352 #: libdialogpages/diffpage.cpp:352
@ -775,148 +698,251 @@ msgstr ""
msgid "Size:" msgid "Size:"
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:33 #: libdialogpages/viewpage.cpp:119
msgid "Preferences" msgid "&Fonts"
msgstr "Uzstādījumi" msgstr ""
#: komparepart/kompareprefdlg.cpp:39
#, fuzzy
msgid "View Settings"
msgstr "Vispārējs"
#: komparepart/kompareprefdlg.cpp:43 #: libdiff2/komparemodellist.cpp:61
msgid "Diff Settings" msgid "&Apply Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:165 #: libdiff2/komparemodellist.cpp:64
msgid "Save &All" msgid "Un&apply Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:168 #: libdiff2/komparemodellist.cpp:67
msgid "Save .&diff..." msgid "App&ly All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:171 #: libdiff2/komparemodellist.cpp:70
msgid "Swap Source with Destination" msgid "&Unapply All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:174 #: libdiff2/komparemodellist.cpp:73
msgid "Show Statistics" msgid "P&revious File"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:269 #: libdiff2/komparemodellist.cpp:76
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgid "N&ext File"
msgstr "Nāk&ošais Fails"
#: libdiff2/komparemodellist.cpp:79
msgid "&Previous Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:281 #: libdiff2/komparemodellist.cpp:82
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgid "&Next Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:425 #: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
msgid "Diff Options" msgid ""
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
"file.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:246
msgid "*.diff *.dif *.patch|Patch Files" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
"qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:271
msgid "Save .diff" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
"</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
msgid "The file exists or is write-protected; do you want to overwrite it?" msgid "Could not open a temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:350
msgid "File Exists" msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:368
msgid "Overwrite" msgid ""
"<qt>Could not create destination directory <b>%1</b>.\n"
"The file has not been saved.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:383
msgid "Do Not Overwrite" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:481 #: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
msgid "KomparePart" msgid "Could not parse diff output."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:493 #: libdiff2/komparemodellist.cpp:451
msgid "Running diff..." msgid "The files are identical."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:496 #: libdiff2/komparemodellist.cpp:613
msgid "Parsing diff output..." msgid "Could not write to the temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:545 #: main.cpp:33
msgid "Comparing file %1 with file %2" msgid ""
"A program to view the differences between files and optionally generate a "
"diff"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:550 #: main.cpp:39
msgid "Comparing files in %1 with files in %2" msgid "This will compare URL1 with URL2"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:555 #: main.cpp:40
#, c-format msgid ""
msgid "Viewing diff output from %1" "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 "" msgstr ""
#: komparepart/kompare_part.cpp:558 #: main.cpp:41
msgid "Blending diff output from %1 into file %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:563 #: main.cpp:42
msgid "Blending diff output from %1 into folder %2" msgid ""
"Disables the check for automatically finding the original file(s) when using "
"'-' as URL with the -o option."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #: main.cpp:43
msgid "" msgid ""
"You have made changes to the destination file(s).\n" "Use this to specify the encoding when calling it from the command line. It "
"Would you like to save them?" "will default to the local encoding if not specified."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #: main.cpp:52
msgid "Save Changes?" msgid "Kompare"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:667 #: main.cpp:54
msgid "" msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
"No diff file, or no 2 files have been diffed. Therefore no stats are available."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 #: main.cpp:55 main.cpp:56
#: komparepart/kompare_part.cpp:698 msgid "Author"
msgid "Diff Statistics"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:673 #: main.cpp:57
msgid "" msgid "Kompare icon artist"
"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 "" msgstr ""
#: komparepart/kompare_part.cpp:686 #: main.cpp:58
msgid "" msgid "A lot of good advice"
"Statistics:\n" msgstr ""
"\n"
"Number of files in diff file: %1\n" #: main.cpp:59
"Format: %2\n" msgid "Cervisia diff viewer"
"\n" msgstr ""
"Current old file: %3\n"
"Current new file: %4\n" #: main.cpp:189
"\n" msgid "Compare these files or folder"
"Number of hunks: %5\n" msgstr ""
"Number of differences: %6"
#: komparepart/komparepartui.rc:4 kompareui.rc:4
#, fuzzy, no-c-format
msgid "&File"
msgstr "Nāk&ošais Fails"
#: komparepart/komparepartui.rc:13
#, no-c-format
msgid "&Difference"
msgstr ""
#: komparepart/komparepartui.rc:25 kompareui.rc:14
#, fuzzy, no-c-format
msgid "&Settings"
msgstr "Vispārējs"
#: komparepart/komparesaveoptionsbase.ui:41
#, no-c-format
msgid "Run Diff In"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:84
#, no-c-format
msgid "Command Line"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:108
#, no-c-format
msgid "cd dir && diff -udHprNa -- source destination"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:118
#, no-c-format
msgid "Options"
msgstr ""
#: 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 "Formāts"
#: komparepart/komparesaveoptionsbase.ui:287
#, no-c-format
msgid "Side-by-side"
msgstr ""
#: kompareui.rc:27
#, no-c-format
msgid "Main Toolbar"
msgstr "" msgstr ""
#~ msgid "%1" #~ msgid "%1"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kompare\n" "Project-Id-Version: kompare\n"
"POT-Creation-Date: 2014-09-29 12:05-0500\n" "POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2003-11-09 21:17+0200\n" "PO-Revision-Date: 2003-11-09 21:17+0200\n"
"Last-Translator: Claudiu Costin <claudiuc@kde.org>\n" "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
"Language-Team: Romanian <ro-kde@yahoogroups.com>\n" "Language-Team: Romanian <ro-kde@yahoogroups.com>\n"
@ -15,308 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n" "X-Generator: KBabel 1.3\n"
#: libdiff2/komparemodellist.cpp:61 #: _translatorinfo:1
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 ""
#. 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 ""
#. 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 ""
#. 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 ""
#: main.cpp:54
msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr ""
#: main.cpp:55 main.cpp:56
msgid "Author"
msgstr ""
#: main.cpp:57
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 ""
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr ""
#: 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
msgid "" msgid ""
"_: NAME OF TRANSLATORS\n" "_: NAME OF TRANSLATORS\n"
"Your names" "Your names"
msgstr "" msgstr ""
#: _translatorinfo.cpp:3 #: _translatorinfo:2
msgid "" msgid ""
"_: EMAIL OF TRANSLATORS\n" "_: EMAIL OF TRANSLATORS\n"
"Your emails" "Your emails"
@ -414,17 +119,40 @@ msgstr ""
#: kompare_shell.cpp:373 #: kompare_shell.cpp:373
msgid "" msgid ""
"If you have entered a file or folder name and a file that contains diff output " "If you have entered a file or folder name and a file that contains diff "
"in the fields in this dialog then this button will be enabled and pressing it " "output in the fields in this dialog then this button will be enabled and "
"will open kompare's main view where the output of the entered file or files " "pressing it will open kompare's main view where the output of the entered "
"from the folder are mixed with the diff output so you can then apply the " "file or files from the folder are mixed with the diff output so you can then "
"difference(s) to a file or to the files. " "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 ""
#: kompare_shell.cpp:400 main.cpp:187
msgid "Destination"
msgstr ""
#: kompare_shell.cpp:402 main.cpp:189
msgid "Compare"
msgstr "" msgstr ""
#: kompare_shell.cpp:402 #: kompare_shell.cpp:402
msgid "Compare these files or folders" msgid "Compare these files or folders"
msgstr "" 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 #: kompare_shell.cpp:439
msgid "Text View" msgid "Text View"
msgstr "" msgstr ""
@ -492,34 +220,220 @@ msgid ""
"Applied: Deletion of %n lines undone" "Applied: Deletion of %n lines undone"
msgstr "" msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:445 #: komparenavtreepart/komparenavtreepart.cpp:445
#, c-format #, c-format
msgid "" msgid ""
"_n: Deleted %n line\n" "_n: Deleted %n line\n"
"Deleted %n lines" "Deleted %n lines"
msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:531
#: komparepart/kompare_part.cpp:651
msgid "Unknown"
msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:694
msgid "KompareNavTreePart"
msgstr ""
#: komparepart/kompare_part.cpp:165
msgid "Save &All"
msgstr ""
#: 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 ""
#: 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 ""
#: komparepart/kompare_part.cpp:446
msgid "Overwrite"
msgstr ""
#: komparepart/kompare_part.cpp:446
msgid "Do Not Overwrite"
msgstr ""
#: komparepart/kompare_part.cpp:481
msgid "KomparePart"
msgstr ""
#: 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 ""
#: 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 ""
#: 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 "Preferinţe"
#: komparepart/kompareprefdlg.cpp:39
msgid "View"
msgstr ""
#: komparepart/kompareprefdlg.cpp:39
msgid "View Settings"
msgstr "" msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:531 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
#: komparepart/kompare_part.cpp:651 msgid "Diff"
msgid "Unknown"
msgstr "" msgstr ""
#: komparenavtreepart/komparenavtreepart.cpp:694 #: komparepart/kompareprefdlg.cpp:43
msgid "KompareNavTreePart" msgid "Diff Settings"
msgstr "" msgstr ""
#: kompareurldialog.cpp:41 #: kompareurldialog.cpp:41
msgid "Here you can enter the files you want to compare." msgid "Files"
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 #: kompareurldialog.cpp:41
msgid "Diff" msgid "Here you can enter the files you want to compare."
msgstr "" msgstr ""
#: kompareurldialog.cpp:47 #: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files." msgid "Here you can change the options for comparing the files."
msgstr "" msgstr ""
#: kompareurldialog.cpp:53
msgid "Appearance"
msgstr ""
#: kompareurldialog.cpp:53 #: kompareurldialog.cpp:53
msgid "Here you can change the options for the view." msgid "Here you can change the options for the view."
msgstr "" msgstr ""
@ -545,15 +459,20 @@ msgstr ""
#: libdialogpages/diffpage.cpp:233 #: libdialogpages/diffpage.cpp:233
msgid "" msgid ""
"Select the format of the output generated by diff. Unified is the one that is " "Select the format of the output generated by diff. Unified is the one that "
"used most frequently because it is very readable. The TDE developers like this " "is used most frequently because it is very readable. The TDE developers like "
"format the best so use it for sending patches." "this format the best so use it for sending patches."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:247 #: libdialogpages/diffpage.cpp:247
msgid "Lines of Context" msgid "Lines of Context"
msgstr "" msgstr ""
#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
#, no-c-format
msgid "Number of context lines:"
msgstr ""
#: libdialogpages/diffpage.cpp:253 #: libdialogpages/diffpage.cpp:253
msgid "" msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable " "The number of context lines is normally 2 or 3. This makes the diff readable "
@ -671,14 +590,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:330 #: libdialogpages/diffpage.cpp:330
msgid "" msgid ""
"If this is checked you can enter a shell pattern in the text box on the right " "If this is checked you can enter a shell pattern in the text box on the "
"or select entries from the list." "right or select entries from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:332 #: libdialogpages/diffpage.cpp:332
msgid "" msgid ""
"Here you can enter or remove a shell pattern or select one or more entries from " "Here you can enter or remove a shell pattern or select one or more entries "
"the list." "from the list."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:338 #: libdialogpages/diffpage.cpp:338
@ -692,14 +611,14 @@ msgstr ""
#: libdialogpages/diffpage.cpp:342 #: libdialogpages/diffpage.cpp:342
msgid "" msgid ""
"Here you can enter the URL of a file with shell patterns to ignore during the " "Here you can enter the URL of a file with shell patterns to ignore during "
"comparison of the folders." "the comparison of the folders."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:344 #: libdialogpages/diffpage.cpp:344
msgid "" msgid ""
"Any file you select in the dialog that pops up when you click it will be put in " "Any file you select in the dialog that pops up when you click it will be put "
"the dialog to the left of this button." "in the dialog to the left of this button."
msgstr "" msgstr ""
#: libdialogpages/diffpage.cpp:352 #: libdialogpages/diffpage.cpp:352
@ -766,145 +685,249 @@ msgstr ""
msgid "Size:" msgid "Size:"
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:33 #: libdialogpages/viewpage.cpp:119
msgid "Preferences" msgid "&Fonts"
msgstr "Preferinţe" msgstr ""
#: komparepart/kompareprefdlg.cpp:39 #: libdiff2/komparemodellist.cpp:61
msgid "View Settings" msgid "&Apply Difference"
msgstr "" msgstr ""
#: komparepart/kompareprefdlg.cpp:43 #: libdiff2/komparemodellist.cpp:64
msgid "Diff Settings" msgid "Un&apply Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:165 #: libdiff2/komparemodellist.cpp:67
msgid "Save &All" msgid "App&ly All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:168 #: libdiff2/komparemodellist.cpp:70
msgid "Save .&diff..." msgid "&Unapply All"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:171 #: libdiff2/komparemodellist.cpp:73
msgid "Swap Source with Destination" msgid "P&revious File"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:174 #: libdiff2/komparemodellist.cpp:76
msgid "Show Statistics" msgid "N&ext File"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:269 #: libdiff2/komparemodellist.cpp:79
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgid "&Previous Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:281 #: libdiff2/komparemodellist.cpp:82
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgid "&Next Difference"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:425 #: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
msgid "Diff Options" msgid ""
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
"file.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:246
msgid "*.diff *.dif *.patch|Patch Files" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
"qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:443 #: libdiff2/komparemodellist.cpp:271
msgid "Save .diff" msgid ""
"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
"</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
msgid "The file exists or is write-protected; do you want to overwrite it?" msgid "Could not open a temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:350
msgid "File Exists" msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:368
msgid "Overwrite" msgid ""
"<qt>Could not create destination directory <b>%1</b>.\n"
"The file has not been saved.</qt>"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:446 #: libdiff2/komparemodellist.cpp:383
msgid "Do Not Overwrite" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:481 #: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
msgid "KomparePart" msgid "Could not parse diff output."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:493 #: libdiff2/komparemodellist.cpp:451
msgid "Running diff..." msgid "The files are identical."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:496 #: libdiff2/komparemodellist.cpp:613
msgid "Parsing diff output..." msgid "Could not write to the temporary file."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:545 #: main.cpp:33
msgid "Comparing file %1 with file %2" msgid ""
"A program to view the differences between files and optionally generate a "
"diff"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:550 #: main.cpp:39
msgid "Comparing files in %1 with files in %2" msgid "This will compare URL1 with URL2"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:555 #: main.cpp:40
#, c-format msgid ""
msgid "Viewing diff output from %1" "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 "" msgstr ""
#: komparepart/kompare_part.cpp:558 #: main.cpp:41
msgid "Blending diff output from %1 into file %2" 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 "" msgstr ""
#: komparepart/kompare_part.cpp:563 #: main.cpp:42
msgid "Blending diff output from %1 into folder %2" msgid ""
"Disables the check for automatically finding the original file(s) when using "
"'-' as URL with the -o option."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #: main.cpp:43
msgid "" msgid ""
"You have made changes to the destination file(s).\n" "Use this to specify the encoding when calling it from the command line. It "
"Would you like to save them?" "will default to the local encoding if not specified."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #: main.cpp:52
msgid "Save Changes?" msgid "Kompare"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:667 #: main.cpp:54
msgid "" msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
"No diff file, or no 2 files have been diffed. Therefore no stats are available."
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 #: main.cpp:55 main.cpp:56
#: komparepart/kompare_part.cpp:698 msgid "Author"
msgid "Diff Statistics"
msgstr "" msgstr ""
#: komparepart/kompare_part.cpp:673 #: main.cpp:57
msgid "" msgid "Kompare icon artist"
"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 "" msgstr ""
#: komparepart/kompare_part.cpp:686 #: main.cpp:58
msgid "" msgid "A lot of good advice"
"Statistics:\n" msgstr ""
"\n"
"Number of files in diff file: %1\n" #: main.cpp:59
"Format: %2\n" msgid "Cervisia diff viewer"
"\n" msgstr ""
"Current old file: %3\n"
"Current new file: %4\n" #: main.cpp:189
"\n" msgid "Compare these files or folder"
"Number of hunks: %5\n" msgstr ""
"Number of differences: %6"
#: komparepart/komparepartui.rc:4 kompareui.rc:4
#, no-c-format
msgid "&File"
msgstr ""
#: komparepart/komparepartui.rc:13
#, no-c-format
msgid "&Difference"
msgstr ""
#: komparepart/komparepartui.rc:25 kompareui.rc:14
#, no-c-format
msgid "&Settings"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:41
#, no-c-format
msgid "Run Diff In"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:84
#, no-c-format
msgid "Command Line"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:108
#, no-c-format
msgid "cd dir && diff -udHprNa -- source destination"
msgstr ""
#: komparepart/komparesaveoptionsbase.ui:118
#, no-c-format
msgid "Options"
msgstr ""
#: 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 ""
#: komparepart/komparesaveoptionsbase.ui:287
#, no-c-format
msgid "Side-by-side"
msgstr ""
#: kompareui.rc:27
#, no-c-format
msgid "Main Toolbar"
msgstr "" msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save