diff --git a/tde-i18n-af/messages/tdesdk/kompare.po b/tde-i18n-af/messages/tdesdk/kompare.po index 49e48c28555..03667e37365 100644 --- a/tde-i18n-af/messages/tdesdk/kompare.po +++ b/tde-i18n-af/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 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-11-07 11:40+0200\n" "Last-Translator: WEB-Translator \n" "Language-Team: AFRIKAANS \n" @@ -14,323 +14,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Wend aan Verskil" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Herstel Verskil" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Wend aan Alle" - -#: libdiff2/komparemodellist.cpp:70 -#, fuzzy -msgid "&Unapply All" -msgstr "Herstel Alle" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Vorige Lêer" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Volgende Lêer" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Vorige Verskil" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Volgende Verskil" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -#, fuzzy -msgid "Could not open a temporary file." -msgstr "Kon nie open lêer." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Kon nie skryf na lêer." - -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "Kon nie skryf na lêer." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Kon nie lees diff uitset." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Die lêers word identies." - -#: libdiff2/komparemodellist.cpp:613 -#, fuzzy -msgid "Could not write to the temporary file." -msgstr "Kon nie skryf na lêer." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "Verskil" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Hardloop Diff In" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Opdrag Lyn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd gids && diff -udHprNa -- bron bestemming" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Kyk vir kleiner verander" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimiseer vir groot lêers" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignoreer verander in kas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Vergroot oortjies na spasies" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoreer bygevoeg of verwyder leeg lyne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoreer verander in spasie" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Vertoon funksie name" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Vergelyk gidse rekursief" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Behandel nuwe lêers as leeg" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formaat" - -#. 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 "Konteks" - -#. 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 "Ed" - -#. 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 "Normale" - -#. 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 "Vereenselwig" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Side-by-side" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Nommer van konteks lyne:" - -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n " -"diff." - -#: 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 "K-vergelyk" - -#: 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 -#, fuzzy -msgid "Kompare icon artist" -msgstr "K-vergelyk-deel" - -#: 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 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Vergelyk Lêers of Gidse" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Bron" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Bestemming" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Vergelyk" - -#: main.cpp:189 -#, fuzzy -msgid "Compare these files or folder" -msgstr "Vergelyk hierdie lêers of gidse" - -#: kompare_shell.cpp:402 main.cpp:189 -#, fuzzy -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 "" -"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan " -"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking " -"van die ingevoerde lêers van gidse. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "WEB-Vertaler (http://kde.af.org.za)" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -444,24 +134,52 @@ msgstr "" #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan " -"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking " -"van die ingevoerde lêers van gidse. " +"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog " +"dan word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n " +"vergelyking van die ingevoerde lêers van gidse. " -#: kompare_shell.cpp:402 +#: kompare_shell.cpp:398 main.cpp:185 #, fuzzy -msgid "Compare these files or folders" -msgstr "Vergelyk hierdie lêers of gidse" +msgid "Compare Files or Folders" +msgstr "Vergelyk Lêers of Gidse" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Teks Besigtig" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Bron" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Bestemming" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Vergelyk" + +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Vergelyk hierdie lêers of gidse" + +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog " +"dan word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n " +"vergelyking van die ingevoerde lêers van gidse. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Teks Besigtig" #: komparenavtreepart/komparenavtreepart.cpp:61 #, fuzzy @@ -552,18 +270,235 @@ msgstr "Onbekende" msgid "KompareNavTreePart" msgstr "" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Stoor Alle" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "Stoor .diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Uitruil Bron met Bestemming" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Vertoon Statistieke" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff Opsies" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Stoor .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 "" + +#: 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 "K-vergelyk-deel" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Wat loop diff..." + +#: komparepart/kompare_part.cpp:496 +#, fuzzy +msgid "Parsing diff output..." +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:545 +#, fuzzy +msgid "Comparing file %1 with file %2" +msgstr "Vergelyk lêers in %1 met lêers in %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Vergelyk lêers in %1 met lêers in %2" + +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:563 +#, fuzzy +msgid "Blending diff output from %1 into folder %2" +msgstr "Verwerking diff..." + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"Jy het gemaak verander na die bestemming.\n" +"Sal Jy hou van na stoor hulle?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Stoor Verander?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Vereenselwig" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Konteks" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normale" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word " +"beskikbaar." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff Statistieke" + +#: 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 "" +"Statistieke:\n" +"\n" +"Ou lêer: %1\n" +"Nuwe lêer: %2\n" +"\n" +"Formaat: %3\n" +"Nommer van hunks: %4\n" +"Nommer van verskille: %5" + +#: 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 "" +"Statistieke:\n" +"\n" +"Nommer van lêers in diff lêer: %1\n" +"Formaat: %2\n" +"\n" +"Huidige ou lêer: %3\n" +"Huidige nuwe lêer: %4\n" +"\n" +"Nommer van hunks: %5\n" +"Nommer van verskille: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Voorkeure" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Teks Besigtig" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View Settings" +msgstr "Diff Instellings" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff Instellings" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "Volgende Lêer" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Voorkoms" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -590,15 +525,20 @@ msgstr "Uitset Formaat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Lyne van Konteks" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Nommer van konteks lyne:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -719,14 +659,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -740,14 +680,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -816,176 +756,262 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Voorkeure" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -#, fuzzy -msgid "View Settings" -msgstr "Diff Instellings" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Wend aan Verskil" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff Instellings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Herstel Verskil" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Stoor Alle" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Wend aan Alle" -#: komparepart/kompare_part.cpp:168 +#: libdiff2/komparemodellist.cpp:70 #, fuzzy -msgid "Save .&diff..." -msgstr "Stoor .diff" - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Uitruil Bron met Bestemming" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Vertoon Statistieke" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "" - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "" +msgid "&Unapply All" +msgstr "Herstel Alle" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff Opsies" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Vorige Lêer" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Volgende Lêer" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Stoor .diff" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Vorige Verskil" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Volgende Verskil" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "K-vergelyk-deel" - -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Wat loop diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +#, fuzzy +msgid "Could not open a temporary file." +msgstr "Kon nie open lêer." -#: komparepart/kompare_part.cpp:496 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "Parsing diff output..." -msgstr "Verwerking diff..." +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Kon nie skryf na lêer." -#: komparepart/kompare_part.cpp:545 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Vergelyk lêers in %1 met lêers in %2" +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "Kon nie skryf na lêer." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Vergelyk lêers in %1 met lêers in %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Verwerking diff..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Kon nie lees diff uitset." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Die lêers word identies." -#: komparepart/kompare_part.cpp:563 +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Verwerking diff..." +msgid "Could not write to the temporary file." +msgstr "Kon nie skryf na lêer." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 #, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Jy het gemaak verander na die bestemming.\n" -"Sal Jy hou van na stoor hulle?" +"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n " +"diff." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Stoor Verander?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word " -"beskikbaar." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff Statistieke" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistieke:\n" -"\n" -"Ou lêer: %1\n" -"Nuwe lêer: %2\n" -"\n" -"Formaat: %3\n" -"Nommer van hunks: %4\n" -"Nommer van verskille: %5" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 "K-vergelyk" + +#: 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 +#, fuzzy +msgid "Kompare icon artist" +msgstr "K-vergelyk-deel" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Vergelyk hierdie lêers of gidse" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Volgende Lêer" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "Verskil" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Diff Instellings" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Hardloop Diff In" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Opdrag Lyn" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd gids && diff -udHprNa -- bron bestemming" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Opsies" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Kyk vir kleiner verander" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimiseer vir groot lêers" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignoreer verander in kas" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Vergroot oortjies na spasies" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoreer bygevoeg of verwyder leeg lyne" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoreer verander in spasie" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Vertoon funksie name" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Vergelyk gidse rekursief" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Behandel nuwe lêers as leeg" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formaat" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Side-by-side" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistieke:\n" -"\n" -"Nommer van lêers in diff lêer: %1\n" -"Formaat: %2\n" -"\n" -"Huidige ou lêer: %3\n" -"Huidige nuwe lêer: %4\n" -"\n" -"Nommer van hunks: %5\n" -"Nommer van verskille: %6" #~ msgid "%1" #~ msgstr "%1" @@ -1041,7 +1067,8 @@ msgstr "" #~ "K-vergelyk sal vergelyk hulle." #~ msgid "Too many arguments given. Kompare accepts a maximum of 2 arguments." -#~ msgstr "Te veel argumente gegewe. K-vergelyk aanvaar 'n maksimum van 2 argumente." +#~ msgstr "" +#~ "Te veel argumente gegewe. K-vergelyk aanvaar 'n maksimum van 2 argumente." #~ msgid "You can not compare a directory with a file" #~ msgstr "Jy kan nie vergelyk 'n gids met 'n lêer" diff --git a/tde-i18n-ar/messages/tdesdk/kompare.po b/tde-i18n-ar/messages/tdesdk/kompare.po index f6d25467b36..b40c220fe1c 100644 --- a/tde-i18n-ar/messages/tdesdk/kompare.po +++ b/tde-i18n-ar/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2004-04-22 20:01+0400\n" "Last-Translator: Ahmad M. Zawawi \n" "Language-Team: Arabic \n" @@ -16,322 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "تطبيق الاختلاف" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "إلغاء تطبيق الاختلاف" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "تطبيق الكل" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "إ&لغ كل التطبيقات" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "الملف السابق" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "الملف التالي" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "التغيّر السابق" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "التغيّّر التالي" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "لا أو لا ليس أ" - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "هناك إلى." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "هناك إلى." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "فشل فتح ملف مؤقَت." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "فشل الكتابة إلى الملف المؤقَت." - -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "فشل الكتابة إلى الملف المؤقَت." - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "يمكن أن ليس إلى الـ أنت نسخ إلى يمين." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "فشل إعراب مخرجات الإختلافات." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "هذه الملفات متطابقة." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "فشل الكتابة إلى الملف المؤقَت." - -#. 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 -#, fuzzy, 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 "Ed" - -#. 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 "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 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "برنامج لعرض الإختلافات بين ملفات و دلائل و تكوين ملف إخلاف diff." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "هذا سيقارن الموقع 1 مع الموقع 2." - -#: main.cpp:40 -#, fuzzy -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 "هذا فتح و إلى أ و من يمكن أن لـ لـ o Kompare أ إلى بحث ث و ث و بوصة ل." - -#: main.cpp:41 -#, fuzzy -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 -#, fuzzy -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "يعطّل لـ ث URL مع o." - -#: 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 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "الحقوق محفوظة 2001_2003، جون فايربو وأوتو بروجمان" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "المؤلف" - -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "برنامج KomparePart" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "كثيراَ من النصيحة الجيَدة" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "عارض الإختلافات Cervisia" - -#: 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 -#, fuzzy -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "إذا أو بوصة بوصة حوار مفعل و بدء أ من أو " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Isam Bayazidi, Nuriddin Aminagha,أحمد محمد زواوي" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -437,22 +128,46 @@ msgstr "إخلط هذا الملف أو المجلَد مع مخرجات الإ #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"إذا أ أو اسم و أ يحوي بوصة بوصة حوار مفعل و فتح ث من أو من مع تطبيق ث إلى أ أو " -"إلى " - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "قارن هذه الملفَات أو المجلَدات" +"إذا أ أو اسم و أ يحوي بوصة بوصة حوار مفعل و فتح ث من أو من مع تطبيق ث إلى أ " +"أو إلى " -#: kompare_shell.cpp:439 -msgid "Text View" -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 "قارن" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "قارن هذه الملفَات أو المجلَدات" + +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "إذا أو بوصة بوصة حوار مفعل و بدء أ من أو " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "مشهد النص" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -533,18 +248,233 @@ msgstr "مجهزل" msgid "KompareNavTreePart" msgstr "" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "حفظ ال&كل" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +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 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr "عنوان الموقع %1 لا يمكن تحميله." + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "The URL %1 does not exist on your system." +msgstr "عنوان الموقع %1 غير موجود على نظامك." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "خيارات الاختلافات" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch | ملفات الرقعة" + +#: 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" + +#: 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 "جاري مقارنة الملف %1 مع الملف %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "جاري مقارنة الملفات في %1 مع الملفات في %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "جاري عرض مخرجات الإختلافات من %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "جاري مزج مخرجات الإختلافات من %1 إلى الملف %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "جاري مزج مخرجات الإختلافات من %1 إلى المجلَد %2" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"لقد أحدثت تغييرات على الهدف\n" +"هل تريد حفظهم؟" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"إحصائيات:\n" +"\n" +"ملف قديم: %1\n" +"ملف جديد: %2\n" +"\n" +"هيئة: %3\n" +"عدد الكتل: %4\n" +"عدد الإختلافات: %5" + +#: 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 "" +"إحصائيات:\n" +"\n" +"عدد الملفات في ملف الإختلافات: %1\n" +"هيئة: %2\n" +"\n" +"الملف القديم الحالي: %3\n" +"الملف الجديد الحالي: %4\n" +"\n" +"عدد الكتل: %5\n" +"عدد الإختلافات: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "خصائص" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "مشهد النص" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "عرض الإعدادات" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "الاختلافات" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "إعدادات الاختلافات" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "الملف التالي" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "المظهر" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -570,15 +500,20 @@ msgstr "هيئة المخرجات" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "خطوط السَياق" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "عدد سطور السَياق:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -699,14 +634,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -720,14 +655,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -795,174 +730,265 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "خصائص" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "عرض الإعدادات" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "تطبيق الاختلاف" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "إعدادات الاختلافات" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "إلغاء تطبيق الاختلاف" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "حفظ ال&كل" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "تطبيق الكل" -#: komparepart/kompare_part.cpp:168 +#: 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 #, fuzzy -msgid "Save .&diff..." -msgstr "حفظ الإ&ختلافات" +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "لا أو لا ليس أ" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "تبديل المصدر مع الهدف" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "هناك إلى." -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "عرض الإحصائيات" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "هناك إلى." -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "فشل فتح ملف مؤقَت." + +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr "عنوان الموقع %1 لا يمكن تحميله." +msgid "Could not write to the temporary file %1, deleting it." +msgstr "فشل الكتابة إلى الملف المؤقَت." -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr "عنوان الموقع %1 غير موجود على نظامك." +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "فشل الكتابة إلى الملف المؤقَت." -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "خيارات الاختلافات" +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "يمكن أن ليس إلى الـ أنت نسخ إلى يمين." -#: komparepart/kompare_part.cpp:443 +#: 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 "فشل الكتابة إلى الملف المؤقَت." + +#: main.cpp:33 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch | ملفات الرقعة" +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "برنامج لعرض الإختلافات بين ملفات و دلائل و تكوين ملف إخلاف diff." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "حفظ الإختلافات" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "هذا سيقارن الموقع 1 مع الموقع 2." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "" +#: main.cpp:40 +#, fuzzy +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 "هذا فتح و إلى أ و من يمكن أن لـ لـ o Kompare أ إلى بحث ث و ث و بوصة ل." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "" +#: main.cpp:41 +#, fuzzy +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "هذا إلى و أو إلى " -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "" +#: main.cpp:42 +#, fuzzy +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "يعطّل لـ ث URL مع o." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: main.cpp:43 +msgid "" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "الحقوق محفوظة 2001_2003، جون فايربو وأوتو بروجمان" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "المؤلف" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" msgstr "برنامج KomparePart" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "جاري البحث عن الإختلافات..." +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "كثيراَ من النصيحة الجيَدة" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "جاري إعراب مخرجات الإختلافات..." +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "عارض الإختلافات Cervisia" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "جاري مقارنة الملف %1 مع الملف %2" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "مقارنة هذه الملفَات أو المجلَد" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "جاري مقارنة الملفات في %1 مع الملفات في %2" +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "الملف التالي" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "جاري عرض مخرجات الإختلافات من %1" +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "اختلاف" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "جاري مزج مخرجات الإختلافات من %1 إلى الملف %2" +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "عرض الإعدادات" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "جاري مزج مخرجات الإختلافات من %1 إلى المجلَد %2" +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "تشغيل الاختلافات داخل" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy -msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"لقد أحدثت تغييرات على الهدف\n" -"هل تريد حفظهم؟" +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "سطر الأوامر" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "حفظ التغييرات؟" +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "فتح مصدر" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"لا تتوفر أي إحصاءات إما لعدم وجود ملف الإختلافات، أو لعدم مقارنة أي ملفين." +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "خيارات" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "إحصائيات الاختلافات" +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +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 "" -"إحصائيات:\n" -"\n" -"ملف قديم: %1\n" -"ملف جديد: %2\n" -"\n" -"هيئة: %3\n" -"عدد الكتل: %4\n" -"عدد الإختلافات: %5" +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +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" +#: 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 "" -"إحصائيات:\n" -"\n" -"عدد الملفات في ملف الإختلافات: %1\n" -"هيئة: %2\n" -"\n" -"الملف القديم الحالي: %3\n" -"الملف الجديد الحالي: %4\n" -"\n" -"عدد الكتل: %5\n" -"عدد الإختلافات: %6" #~ msgid "%1" #~ msgstr "%1" @@ -1002,7 +1028,9 @@ msgstr "" #~ "then Kompare will read from stdin, this can be used\n" #~ "for cvs diff | kompare -. If 2 files are given,\n" #~ "Kompare will compare them." -#~ msgstr "ملف الوثيقة الذي سيفتح.إذا تم توفير عنوان URL واحد فقط سيتم أعتبارة ملف إختلاف diff. إذا تم توفير ملفين، سيقوم Komapre بالمقارنة ما بينهم." +#~ msgstr "" +#~ "ملف الوثيقة الذي سيفتح.إذا تم توفير عنوان URL واحد فقط سيتم أعتبارة ملف " +#~ "إختلاف diff. إذا تم توفير ملفين، سيقوم Komapre بالمقارنة ما بينهم." #~ msgid "Big help" #~ msgstr "مساعدة كبيرة" @@ -1030,5 +1058,6 @@ msgstr "" #~ msgid "Destination:" #~ msgstr "الهدف:" -#~ msgid "Sorry, you gave too many arguments, I don't know what to do with them..." +#~ msgid "" +#~ "Sorry, you gave too many arguments, I don't know what to do with them..." #~ msgstr "عذرا، يوجد لديك معاملات عديدة، لا أعرف ماذا افعل بها ..." diff --git a/tde-i18n-az/messages/tdesdk/kompare.po b/tde-i18n-az/messages/tdesdk/kompare.po index 272f558f8dd..6d966c32fc3 100644 --- a/tde-i18n-az/messages/tdesdk/kompare.po +++ b/tde-i18n-az/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2001-11-22 00:46GMT+0200\n" "Last-Translator: Vasif İsmayıloğlu MD \n" "Language-Team: Azərbaycan Türkcəsi \n" @@ -15,314 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:76 -#, fuzzy -msgid "N&ext File" -msgstr "Mətn Görünüşü" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "" - -#. 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 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Fayl və ya Cərgələri Müqayisə Et" - -#. 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 "Kompare" - -#: 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 -#, fuzzy -msgid "Kompare icon artist" -msgstr "Kompare" - -#: 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 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Fayl və ya Cərgələri Müqayisə Et" - -#: kompare_shell.cpp:399 main.cpp:186 -#, fuzzy -msgid "Source" -msgstr "Mənbə:" - -#: kompare_shell.cpp:400 main.cpp:187 -#, fuzzy -msgid "Destination" -msgstr "Hədəf:" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Müqayisə Et" - -#: main.cpp:189 -#, fuzzy -msgid "Compare these files or folder" -msgstr "Bu fayl və ya cərgələri müqayisə et" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Vasif İsmayıloğlu MD" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -424,18 +123,44 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +#, fuzzy +msgid "Compare Files or Folders" +msgstr "Fayl və ya Cərgələri Müqayisə Et" + +#: kompare_shell.cpp:399 main.cpp:186 +#, fuzzy +msgid "Source" +msgstr "Mənbə:" + +#: kompare_shell.cpp:400 main.cpp:187 +#, fuzzy +msgid "Destination" +msgstr "Hədəf:" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Müqayisə Et" + #: kompare_shell.cpp:402 #, fuzzy msgid "Compare these files or folders" msgstr "Bu fayl və ya cərgələri müqayisə et" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Mətn Görünüşü" @@ -509,35 +234,224 @@ msgid "" "Applied: Deletion of %n lines undone" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +#, fuzzy +msgid "KompareNavTreePart" +msgstr "Kompare" + +#: 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 "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "" + +#: komparepart/kompare_part.cpp:481 +#, fuzzy +msgid "KomparePart" +msgstr "Kompare" + +#: 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 "" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Mətn Görünüşü" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:694 +#: kompareurldialog.cpp:41 #, fuzzy -msgid "KompareNavTreePart" -msgstr "Kompare" +msgid "Files" +msgstr "Mətn Görünüşü" #: kompareurldialog.cpp:41 msgid "Here you can enter the files you want to compare." msgstr "" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "" - #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +msgid "Appearance" +msgstr "" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -563,15 +477,20 @@ msgstr "" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -689,14 +608,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -710,14 +629,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -785,148 +704,254 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" +#: libdiff2/komparemodellist.cpp:76 +#, fuzzy +msgid "N&ext File" +msgstr "Mətn Görünüşü" + +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." msgstr "" -#: komparepart/kompare_part.cpp:481 +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "" + +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +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 "" + +#: main.cpp:57 #, fuzzy -msgid "KomparePart" +msgid "Kompare icon artist" msgstr "Kompare" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: main.cpp:58 +msgid "A lot of good advice" msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: main.cpp:59 +msgid "Cervisia diff viewer" msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Bu fayl və ya cərgələri müqayisə et" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Mətn Görünüşü" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, no-c-format +msgid "&Settings" msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" 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?" +#: komparepart/komparesaveoptionsbase.ui:118 +#, no-c-format +msgid "Options" msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" msgstr "" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" 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" +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" 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" +#: 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 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Fayl və ya Cərgələri Müqayisə Et" + +#: 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 "" #, fuzzy diff --git a/tde-i18n-be/messages/tdesdk/kompare.po b/tde-i18n-be/messages/tdesdk/kompare.po index 1588d2ce2e7..f8d119e52c1 100644 --- a/tde-i18n-be/messages/tdesdk/kompare.po +++ b/tde-i18n-be/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "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: 2007-01-25 01:17+0100\n" "Last-Translator: Siarhei Liantsevich \n" "Language-Team: Belarusian\n" @@ -14,638 +14,553 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -#, fuzzy -msgid "&Apply Difference" -msgstr "Ужыць адрозненні" +#: _translatorinfo:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Сяржук Лянцэвіч" -#: libdiff2/komparemodellist.cpp:64 +#: _translatorinfo:2 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "serzh.by@gmail.com" + +#: kompare_shell.cpp:77 #, fuzzy -msgid "Un&apply Difference" -msgstr "Адмяніць адрозненні" +msgid "Could not find our KompareViewPart." +msgstr "Не атрымоўваецца знайсці кампанент KompareViewPart." -#: libdiff2/komparemodellist.cpp:67 +#: kompare_shell.cpp:106 #, fuzzy -msgid "App&ly All" -msgstr "Ужыць усё" +msgid "Could not load our KompareViewPart." +msgstr "Не атрымоўваецца загрузіць кампанент KompareViewPart." -#: libdiff2/komparemodellist.cpp:70 +#: kompare_shell.cpp:114 #, fuzzy -msgid "&Unapply All" -msgstr "Адмяніць усё" +msgid "Could not find our KompareNavigationPart." +msgstr "Не атрымоўваецца знайсці кампанент KompareNavigationPart." -#: libdiff2/komparemodellist.cpp:73 +#: kompare_shell.cpp:138 #, fuzzy -msgid "P&revious File" -msgstr "Папярэдні файл" +msgid "Could not load our KompareNavigationPart." +msgstr "Не атрымоўваецца загрузіць кампанент KompareNavigationPart." -#: libdiff2/komparemodellist.cpp:76 +#: kompare_shell.cpp:233 #, fuzzy -msgid "N&ext File" -msgstr "Наступны файл" +msgid "&Open Diff..." +msgstr "Адкрыць Diff..." -#: libdiff2/komparemodellist.cpp:79 +#: kompare_shell.cpp:234 #, fuzzy -msgid "&Previous Difference" -msgstr "Папярэдняе адрозненне" +msgid "&Compare Files..." +msgstr "Параўнаць файлы..." -#: libdiff2/komparemodellist.cpp:82 +#: kompare_shell.cpp:237 #, fuzzy -msgid "&Next Difference" -msgstr "Наступнае адрозненне" +msgid "&Blend URL with Diff..." +msgstr "Зліць спасылку з Diff" -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#: kompare_shell.cpp:246 #, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Няма макетаў або адрозненняў. Файл %1 не з'яўляецца файлам фармату " -"diff." +msgid "Show T&ext View" +msgstr "Паказаць у выглядзе тэксту" -#: libdiff2/komparemodellist.cpp:246 +#: kompare_shell.cpp:248 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Паўсталі праблемы падчас ужывання diff %1 да файла %2." +msgid "Hide T&ext View" +msgstr "Схаваць прагляд тэксту" -#: libdiff2/komparemodellist.cpp:271 +#: kompare_shell.cpp:257 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Паўсталі праблемы падчас ужывання diff %1 да тэчкі %2." +msgid " 0 of 0 differences " +msgstr " 0 з 0 адрозненняў " -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +#: kompare_shell.cpp:258 #, fuzzy -msgid "Could not open a temporary file." -msgstr "Не атрымоўваецца адкрыць часовы файл." +msgid " 0 of 0 files " +msgstr " 0 з 0 файлаў " -#: libdiff2/komparemodellist.cpp:350 +#: kompare_shell.cpp:273 #, fuzzy -msgid "Could not write to the temporary file %1, deleting it." +msgid "" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -"Не атрымоўваецца запісаць у часовы файл %1, выдаляемы яго." +" %1 з %n файла \n" +" %1 з %n файлаў \n" +" %1 з %n файлаў " -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy +#: kompare_shell.cpp:275 +#, fuzzy, c-format msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." +"_n: %n file \n" +" %n files " msgstr "" -"Не атрымалася стварыць канчатковую тэчку %1.\n" -"Файл не захаваны." +" %n файл \n" +" %n файла \n" +" %n файлаў " -#: libdiff2/komparemodellist.cpp:383 +#: kompare_shell.cpp:278 #, fuzzy msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" -"Не атрымоўваецца загрузіць часовы файл у кропку прызначэння %1" -". Часовы файл усё яшчэ даступны пад імем %2. Вы можаце ўручную " -"скапіяваць яго ў патрэбнае месца." +" %1 з %n адрозненні, %2 ужыта \n" +" %1 з %n адрозненняў, %2 ужыта \n" +" %1 з %n адрозненняў, %2 ужыта " -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +#: kompare_shell.cpp:281 +#, fuzzy, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +" %n адрозненне \n" +" %n адрозненні \n" +" %n адрозненняў " + +#: kompare_shell.cpp:369 #, fuzzy -msgid "Could not parse diff output." -msgstr "Не атрымоўваецца апрацаваць выснову diff." +msgid "Blend File/Folder with diff Output" +msgstr "Зліць файл/тэчку з высновай diff" -#: libdiff2/komparemodellist.cpp:451 +#: kompare_shell.cpp:370 #, fuzzy -msgid "The files are identical." -msgstr "Усе файлы ідэнтычныя." +msgid "File/Folder" +msgstr "Файл/тэчка" -#: libdiff2/komparemodellist.cpp:613 +#: kompare_shell.cpp:371 #, fuzzy -msgid "Could not write to the temporary file." -msgstr "Не атрымоўваецца запісаць у часовы файл." +msgid "Diff Output" +msgstr "Выснова Diff" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Difference" -msgstr "Адрозненне" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend" +msgstr "Зліць" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Run Diff In" -msgstr "Запусціць Diff у" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend this file or folder with the diff output" +msgstr "Зліць гэты файл або тэчку з высновай diff" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "Command Line" -msgstr "Камандны радок" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "" +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" +"Калі вы паказалі імя файла або тэчкі і файл, у якім утрымоўваецца выснова " +"diff, у гэтым дыялогу, гэтая кнопка стане даступная і націск на яе адкрые " +"галоўнае акно Kompare, дзе выснова паказанага файла або файлаў з тэчкі " +"змяшаецца з высновай diff так, што вы зможаце \"ужыць\" адрозненні да файлаў." -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir diff -udHprNa -- <крыніца> <прызначэнне>" +#: kompare_shell.cpp:398 main.cpp:185 +#, fuzzy +msgid "Compare Files or Folders" +msgstr "Параўнанне файлаў або тэчак" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, fuzzy, no-c-format -msgid "Look for smaller changes" -msgstr "Пошук найменшых змен" +#: kompare_shell.cpp:399 main.cpp:186 +#, fuzzy +msgid "Source" +msgstr "Крыніца" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, fuzzy, no-c-format -msgid "Optimize for large files" -msgstr "Аптымізацыя для вялікіх файлаў" +#: kompare_shell.cpp:400 main.cpp:187 +#, fuzzy +msgid "Destination" +msgstr "Прызначэнне" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, fuzzy, no-c-format -msgid "Ignore changes in case" -msgstr "Ігнараваць змены ў рэгістры літар" +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +msgid "Compare" +msgstr "Параўнаць" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Замяніць табуляцыю прабеламі" +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Параўнаць файлы або тэчкі" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, fuzzy, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ігнараваць дададзеныя і выдаленыя пустыя радкі" +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"Калі вы паказалі файлы або тэчкі ў палях гэтага дыялогу, гэтая кнопка стане " +"даступная і націск на яе пачне параўнанне паказаных файлаў або тэчак." -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, fuzzy, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ігнараваць змены прабелаў" +#: kompare_shell.cpp:439 +#, fuzzy +msgid "Text View" +msgstr "Прагляд тэксту" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, fuzzy, no-c-format -msgid "Show function names" -msgstr "Паказваць імёны функцый" +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Тэчка-крыніца" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Параўнаць тэчкі рэкурсіўна" +#: komparenavtreepart/komparenavtreepart.cpp:66 +#, fuzzy +msgid "Destination Folder" +msgstr "Тэчка-прызначэнне" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, fuzzy, no-c-format -msgid "Treat new files as empty" -msgstr "Лічыць новыя файлы як пустыя" +#: komparenavtreepart/komparenavtreepart.cpp:71 +#, fuzzy +msgid "Source File" +msgstr "Зыходны файл" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, fuzzy, no-c-format -msgid "Format" -msgstr "Фармат" +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Файл прызначэння" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, fuzzy, no-c-format -msgid "Context" -msgstr "Кантэкст" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Зыходны радок" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, fuzzy, no-c-format -msgid "Ed" -msgstr "Ed" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Радок прызначэння" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, fuzzy, 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 -#, fuzzy, 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 -#, fuzzy, no-c-format -msgid "Unified" -msgstr "Аб'яднаны" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, fuzzy, no-c-format -msgid "Side-by-side" -msgstr "Побач сябар з сябрам" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, fuzzy, no-c-format -msgid "Number of context lines:" -msgstr "Колькасць радкоў кантэксту:" - -#: main.cpp:33 +#: komparenavtreepart/komparenavtreepart.cpp:80 #, fuzzy +msgid "Difference" +msgstr "Адрозненне" + +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, fuzzy, c-format msgid "" -"A program to view the differences between files and optionally generate a diff" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" msgstr "" -"Праграма для прагляду адрозненняў паміж файламі і стварэнні файла diff." +"Ужыта: Змены %n радкі скасаваныя\n" +"Ужыта: Змены %n радкоў скасаваныя\n" +"Ужыта: Змены %n радкоў скасаваныя" -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Параўнанне \"Спасылкі1\" з \"Спасылкай2\"" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Змененая %n радок\n" +"Зменена %n радкі\n" +"Зменена %n радкоў" -#: main.cpp:40 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, fuzzy, c-format 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." +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" msgstr "" -"Адкрыць URL1, лічачы,што гэта выснова diff. URL1 таксама можа быць '-'. Гэта " -"можна выкарыстаць, напрыклад, так: cvs diff | kompare -o -. Kompare праверыць, " -"ці існуе арыгінальны файл, а затым змяшае з высновай diff і пакажа вынік. Ключ " -"-n адмяняе праверку." +"Ужыта: Устаўка %n радкі скасаваная\n" +"Ужыта: Устаўка %n радкоў скасаваная\n" +"Ужыта: Устаўка %n радкоў скасаваная" -#: main.cpp:41 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format 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. " +"_n: Inserted %n line\n" +"Inserted %n lines" msgstr "" -"Змяшаць URL2 і URL1, URL2 павінен быць высновай diff, а URL1 - (арыгінальны) " -"файл або тэчка." +"Устаўленая %n радок\n" +"Устаўлена %n радкі\n" +"Устаўлена %n радкоў" -#: main.cpp:42 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, fuzzy, c-format msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" msgstr "" -"Адключае праверку аўтаматычнага пошуку арыгінальнага файла(ов) пры выкарыстанні " -"'-' у якасці крыніцы з опцыяй -o." +"Ужыта: Выдаленне %n радкі скасавана\n" +"Ужыта: Выдаленне %n радкоў скасавана\n" +"Ужыта: Выдаленне %n радкоў скасавана" -#: main.cpp:43 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +"_n: Deleted %n line\n" +"Deleted %n lines" msgstr "" -"Паказаць кадыроўку. Па змаўчанні будзе выкарыстоўвацца кадыроўка лакалі." +"Выдаленая %n радок\n" +"Выдаленае %n радкі\n" +"Выдаленае %n радкоў" -#: main.cpp:52 +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 #, fuzzy -msgid "Kompare" -msgstr "Kompare" +msgid "Unknown" +msgstr "Невядомы" -#: main.cpp:54 +#: komparenavtreepart/komparenavtreepart.cpp:694 #, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "" -"(c) 2001-2004, Джон Файербаух (John Firebaugh) і Отто Брюггеман (Otto " -"Bruggeman)" +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" -#: main.cpp:55 main.cpp:56 +#: komparepart/kompare_part.cpp:165 #, fuzzy -msgid "Author" -msgstr "Аўтар" +msgid "Save &All" +msgstr "Захаваць усё" -#: main.cpp:57 +#: komparepart/kompare_part.cpp:168 #, fuzzy -msgid "Kompare icon artist" -msgstr "Значкі" +msgid "Save .&diff..." +msgstr "Захаваць адрозненні ў файл .diff..." -#: main.cpp:58 +#: komparepart/kompare_part.cpp:171 #, fuzzy -msgid "A lot of good advice" -msgstr "Шмат добрых рад" +msgid "Swap Source with Destination" +msgstr "Памяняць месцамі крыніца і прызначэнне" -#: main.cpp:59 +#: komparepart/kompare_part.cpp:174 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Прагляд адрозненняў у Cervisia" +msgid "Show Statistics" +msgstr "Паказаць статыстыку" -#: kompare_shell.cpp:398 main.cpp:185 +#: komparepart/kompare_part.cpp:269 #, fuzzy -msgid "Compare Files or Folders" -msgstr "Параўнанне файлаў або тэчак" +msgid "The URL %1 cannot be downloaded." +msgstr "Немагчыма загрузіць спасылку %1." -#: kompare_shell.cpp:399 main.cpp:186 +#: komparepart/kompare_part.cpp:281 #, fuzzy -msgid "Source" -msgstr "Крыніца" +msgid "The URL %1 does not exist on your system." +msgstr "Немагчыма адкрыць %1." -#: kompare_shell.cpp:400 main.cpp:187 +#: komparepart/kompare_part.cpp:425 #, fuzzy -msgid "Destination" -msgstr "Прызначэнне" +msgid "Diff Options" +msgstr "Параметры Diff" -#: kompare_shell.cpp:402 main.cpp:189 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Compare" -msgstr "Параўнаць" +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Файлы адрозненняў (*.diff *.dif *.patch)" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Compare these files or folder" -msgstr "Параўнаць файлы або тэчку" +msgid "Save .diff" +msgstr "Захаваць .diff" -#: kompare_shell.cpp:402 main.cpp:189 +#: komparepart/kompare_part.cpp:446 #, fuzzy -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 "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "Сяржук Лянцэвіч" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "serzh.by@gmail.com" +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Файл ужо існуе. Замяніць яго?" -#: kompare_shell.cpp:77 +#: komparepart/kompare_part.cpp:446 #, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "Не атрымоўваецца знайсці кампанент KompareViewPart." +msgid "File Exists" +msgstr "Файл ужо існуе" -#: kompare_shell.cpp:106 +#: komparepart/kompare_part.cpp:446 #, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "Не атрымоўваецца загрузіць кампанент KompareViewPart." +msgid "Overwrite" +msgstr "Замяніць" -#: kompare_shell.cpp:114 +#: komparepart/kompare_part.cpp:446 #, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "Не атрымоўваецца знайсці кампанент KompareNavigationPart." +msgid "Do Not Overwrite" +msgstr "Не замяняць" -#: kompare_shell.cpp:138 +#: komparepart/kompare_part.cpp:481 #, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "Не атрымоўваецца загрузіць кампанент KompareNavigationPart." +msgid "KomparePart" +msgstr "KomparePart" -#: kompare_shell.cpp:233 +#: komparepart/kompare_part.cpp:493 #, fuzzy -msgid "&Open Diff..." -msgstr "Адкрыць Diff..." +msgid "Running diff..." +msgstr "Запушчаны diff..." -#: kompare_shell.cpp:234 +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "&Compare Files..." -msgstr "Параўнаць файлы..." +msgid "Parsing diff output..." +msgstr "Апрацоўваецца выснова diff..." -#: kompare_shell.cpp:237 +#: komparepart/kompare_part.cpp:545 #, fuzzy -msgid "&Blend URL with Diff..." -msgstr "Зліць спасылку з Diff" +msgid "Comparing file %1 with file %2" +msgstr "Параўноўваюцца файл %1 з файлам %2" -#: kompare_shell.cpp:246 +#: komparepart/kompare_part.cpp:550 #, fuzzy -msgid "Show T&ext View" -msgstr "Паказаць у выглядзе тэксту" +msgid "Comparing files in %1 with files in %2" +msgstr "Параўноўваюцца файлы ў %1 з файламі ў %2" -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Схаваць прагляд тэксту" +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Прагляд высновы diff з %1" -#: kompare_shell.cpp:257 +#: komparepart/kompare_part.cpp:558 #, fuzzy -msgid " 0 of 0 differences " -msgstr " 0 з 0 адрозненняў " +msgid "Blending diff output from %1 into file %2" +msgstr "Змешванне высновы diff з файла %1 у файл %2" -#: kompare_shell.cpp:258 +#: komparepart/kompare_part.cpp:563 #, fuzzy -msgid " 0 of 0 files " -msgstr " 0 з 0 файлаў " +msgid "Blending diff output from %1 into folder %2" +msgstr "Змешванне высновы diff з файла %1 у тэчку %2" -#: kompare_shell.cpp:273 +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #, fuzzy msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" -" %1 з %n файла \n" -" %1 з %n файлаў \n" -" %1 з %n файлаў " +"Файл прызначэння быў зменены.\n" +"Вы жадаеце яго захаваць?" -#: kompare_shell.cpp:275 -#, fuzzy, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n файл \n" -" %n файла \n" -" %n файлаў " - -#: kompare_shell.cpp:278 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #, fuzzy -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -" %1 з %n адрозненні, %2 ужыта \n" -" %1 з %n адрозненняў, %2 ужыта \n" -" %1 з %n адрозненняў, %2 ужыта " - -#: kompare_shell.cpp:281 -#, fuzzy, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n адрозненне \n" -" %n адрозненні \n" -" %n адрозненняў " +msgid "Save Changes?" +msgstr "Захаваць змены?" -#: kompare_shell.cpp:369 -#, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Зліць файл/тэчку з высновай diff" +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, fuzzy, no-c-format +msgid "Unified" +msgstr "Аб'яднаны" -#: kompare_shell.cpp:370 -#, fuzzy -msgid "File/Folder" -msgstr "Файл/тэчка" +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, fuzzy, no-c-format +msgid "Context" +msgstr "Кантэкст" -#: kompare_shell.cpp:371 -#, fuzzy -msgid "Diff Output" -msgstr "Выснова Diff" +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, fuzzy, no-c-format +msgid "RCS" +msgstr "RCS" -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend" -msgstr "Зліць" +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, fuzzy, no-c-format +msgid "Ed" +msgstr "Ed" -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend this file or folder with the diff output" -msgstr "Зліць гэты файл або тэчку з высновай diff" +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, fuzzy, no-c-format +msgid "Normal" +msgstr "Звычайны" -#: kompare_shell.cpp:373 +#: komparepart/kompare_part.cpp:667 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." msgstr "" -"Калі вы паказалі імя файла або тэчкі і файл, у якім утрымоўваецца выснова diff, " -"у гэтым дыялогу, гэтая кнопка стане даступная і націск на яе адкрые галоўнае " -"акно Kompare, дзе выснова паказанага файла або файлаў з тэчкі змяшаецца з " -"высновай diff так, што вы зможаце \"ужыць\" адрозненні да файлаў." - -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Параўнаць файлы або тэчкі" - -#: kompare_shell.cpp:439 -#, fuzzy -msgid "Text View" -msgstr "Прагляд тэксту" +"Няма файла diff або параўнанне выраблена не па двух файлам. Статыстыка " +"недаступная." -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 #, fuzzy -msgid "Source Folder" -msgstr "Тэчка-крыніца" +msgid "Diff Statistics" +msgstr "Статыстыка адрозненняў" -#: komparenavtreepart/komparenavtreepart.cpp:66 +#: komparepart/kompare_part.cpp:673 #, fuzzy -msgid "Destination Folder" -msgstr "Тэчка-прызначэнне" +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 "" +"Статыстыка:\n" +"\n" +"Стары файл: %1\n" +"Новы файл: %2\n" +"\n" +"Фармат: %3\n" +"Колькасць не змененых: %4\n" +"Колькасць адрозненняў: %5" -#: komparenavtreepart/komparenavtreepart.cpp:71 +#: komparepart/kompare_part.cpp:686 #, fuzzy -msgid "Source File" -msgstr "Зыходны файл" +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 "" +"Статыстыка:\n" +"\n" +"Колькасць файлаў у файле адрозненняў: %1\n" +"Фармат: %2\n" +"\n" +"Бягучы стары файл: %3\n" +"Бягучы новы файл: %4\n" +"\n" +"Колькасць не змененых: %5\n" +"Колькасць адрозненняў: %6" -#: komparenavtreepart/komparenavtreepart.cpp:72 +#: komparepart/kompareprefdlg.cpp:33 #, fuzzy -msgid "Destination File" -msgstr "Файл прызначэння" +msgid "Preferences" +msgstr "Параметры" -#: komparenavtreepart/komparenavtreepart.cpp:78 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Source Line" -msgstr "Зыходны радок" +msgid "View" +msgstr "Прагляд тэксту" -#: komparenavtreepart/komparenavtreepart.cpp:79 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Destination Line" -msgstr "Радок прызначэння" +msgid "View Settings" +msgstr "Налады выгляду" -#: komparenavtreepart/komparenavtreepart.cpp:80 +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 #, fuzzy -msgid "Difference" -msgstr "Адрозненне" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, fuzzy, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" -"Ужыта: Змены %n радкі скасаваныя\n" -"Ужыта: Змены %n радкоў скасаваныя\n" -"Ужыта: Змены %n радкоў скасаваныя" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, fuzzy, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" -"Змененая %n радок\n" -"Зменена %n радкі\n" -"Зменена %n радкоў" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, fuzzy, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" -"Ужыта: Устаўка %n радкі скасаваная\n" -"Ужыта: Устаўка %n радкоў скасаваная\n" -"Ужыта: Устаўка %n радкоў скасаваная" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, fuzzy, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Устаўленая %n радок\n" -"Устаўлена %n радкі\n" -"Устаўлена %n радкоў" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, fuzzy, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" -"Ужыта: Выдаленне %n радкі скасавана\n" -"Ужыта: Выдаленне %n радкоў скасавана\n" -"Ужыта: Выдаленне %n радкоў скасавана" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, fuzzy, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Выдаленая %n радок\n" -"Выдаленае %n радкі\n" -"Выдаленае %n радкоў" +msgid "Diff" +msgstr "Адрозненні" -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 +#: komparepart/kompareprefdlg.cpp:43 #, fuzzy -msgid "Unknown" -msgstr "Невядомы" +msgid "Diff Settings" +msgstr "Налады адрозненняў" -#: komparenavtreepart/komparenavtreepart.cpp:694 +#: kompareurldialog.cpp:41 #, fuzzy -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" +msgid "Files" +msgstr "Файлы" #: kompareurldialog.cpp:41 #, fuzzy msgid "Here you can enter the files you want to compare." msgstr "Тут можна ўвесці файла для параўнання" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -#, fuzzy -msgid "Diff" -msgstr "Адрозненні" - #: kompareurldialog.cpp:47 #, fuzzy msgid "Here you can change the options for comparing the files." msgstr "Тут можна наладзіць параметры параўнання" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Паданне:" + #: kompareurldialog.cpp:53 #, fuzzy msgid "Here you can change the options for the view." @@ -663,9 +578,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Вы можаце вылучыць подграмму diff тут. На сістэмах Solaris стандартная праграма " -"diff не падтрымлівае ўсе ключы версіі GNU. Так вы можаце вылучыць патрэбную " -"версію праграмы." +"Вы можаце вылучыць подграмму diff тут. На сістэмах Solaris стандартная " +"праграма diff не падтрымлівае ўсе ключы версіі GNU. Так вы можаце вылучыць " +"патрэбную версію праграмы." #: libdialogpages/diffpage.cpp:221 #, fuzzy @@ -680,9 +595,9 @@ msgstr "Фармат высновы" #: libdialogpages/diffpage.cpp:233 #, fuzzy msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Вылучыце фармат высновы, генеруемы diff. Найболей часта выкарыстоўваным " "з'яўляецца Unified, т.к. ён лёгкі для чытання. Калі ласка, выкарыстайце " @@ -693,6 +608,11 @@ msgstr "" msgid "Lines of Context" msgstr "Радкі кантэксту" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, fuzzy, no-c-format +msgid "Number of context lines:" +msgstr "Колькасць радкоў кантэксту:" + #: libdialogpages/diffpage.cpp:253 #, fuzzy msgid "" @@ -839,17 +759,17 @@ msgstr "Шаблон імя для выключэння" #: libdialogpages/diffpage.cpp:330 #, fuzzy msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Калі гэта ўключана, вы зможаце ўвесці маску файла ў тэкставым полі справа або " -"вылучыць адно з значэнняў з спісу." +"Калі гэта ўключана, вы зможаце ўвесці маску файла ў тэкставым полі справа " +"або вылучыць адно з значэнняў з спісу." #: libdialogpages/diffpage.cpp:332 #, fuzzy msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "Тут вы можаце ўвесці маску файла, або вылучыць наканаваныя значэнні." #: libdialogpages/diffpage.cpp:338 @@ -867,8 +787,8 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 #, fuzzy msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Тут вы можаце ўвесці шлях да файла, які змяшчае маскі файлаў, якія трэба " "ігнараваць пры параўнанні тэчак." @@ -876,8 +796,8 @@ msgstr "" #: libdialogpages/diffpage.cpp:344 #, fuzzy msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Файлы, якія вы вылучыце ў які з'явіўся дыялогу, будуць бачныя ў спісе злева." @@ -961,196 +881,303 @@ msgstr "Шрыфт:" msgid "Size:" msgstr "Памер:" -#: komparepart/kompareprefdlg.cpp:33 +#: libdialogpages/viewpage.cpp:119 #, fuzzy -msgid "Preferences" -msgstr "Параметры" +msgid "&Fonts" +msgstr "Шрыфт:" -#: komparepart/kompareprefdlg.cpp:39 +#: libdiff2/komparemodellist.cpp:61 #, fuzzy -msgid "View Settings" -msgstr "Налады выгляду" +msgid "&Apply Difference" +msgstr "Ужыць адрозненні" -#: komparepart/kompareprefdlg.cpp:43 +#: libdiff2/komparemodellist.cpp:64 #, fuzzy -msgid "Diff Settings" -msgstr "Налады адрозненняў" +msgid "Un&apply Difference" +msgstr "Адмяніць адрозненні" -#: komparepart/kompare_part.cpp:165 +#: libdiff2/komparemodellist.cpp:67 #, fuzzy -msgid "Save &All" -msgstr "Захаваць усё" +msgid "App&ly All" +msgstr "Ужыць усё" -#: komparepart/kompare_part.cpp:168 +#: libdiff2/komparemodellist.cpp:70 #, fuzzy -msgid "Save .&diff..." -msgstr "Захаваць адрозненні ў файл .diff..." +msgid "&Unapply All" +msgstr "Адмяніць усё" -#: komparepart/kompare_part.cpp:171 +#: libdiff2/komparemodellist.cpp:73 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Памяняць месцамі крыніца і прызначэнне" +msgid "P&revious File" +msgstr "Папярэдні файл" -#: komparepart/kompare_part.cpp:174 +#: libdiff2/komparemodellist.cpp:76 #, fuzzy -msgid "Show Statistics" -msgstr "Паказаць статыстыку" +msgid "N&ext File" +msgstr "Наступны файл" -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:79 #, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr "Немагчыма загрузіць спасылку %1." +msgid "&Previous Difference" +msgstr "Папярэдняе адрозненне" -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:82 #, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr "Немагчыма адкрыць %1." +msgid "&Next Difference" +msgstr "Наступнае адрозненне" -#: komparepart/kompare_part.cpp:425 +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 #, fuzzy -msgid "Diff Options" -msgstr "Параметры Diff" +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Няма макетаў або адрозненняў. Файл %1 не з'яўляецца файлам " +"фармату diff." -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:246 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Файлы адрозненняў (*.diff *.dif *.patch)" +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Паўсталі праблемы падчас ужывання diff %1 да файла %2." -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:271 #, fuzzy -msgid "Save .diff" -msgstr "Захаваць .diff" +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Паўсталі праблемы падчас ужывання diff %1 да тэчкі %2." -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 #, fuzzy -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Файл ужо існуе. Замяніць яго?" +msgid "Could not open a temporary file." +msgstr "Не атрымоўваецца адкрыць часовы файл." -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "File Exists" -msgstr "Файл ужо існуе" +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Не атрымоўваецца запісаць у часовы файл %1, выдаляемы яго." -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "Overwrite" -msgstr "Замяніць" +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Не атрымалася стварыць канчатковую тэчку %1.\n" +"Файл не захаваны." -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:383 #, fuzzy -msgid "Do Not Overwrite" -msgstr "Не замяняць" +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Не атрымоўваецца загрузіць часовы файл у кропку прызначэння %1. " +"Часовы файл усё яшчэ даступны пад імем %2. Вы можаце ўручную " +"скапіяваць яго ў патрэбнае месца." -#: komparepart/kompare_part.cpp:481 +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 #, fuzzy -msgid "KomparePart" -msgstr "KomparePart" +msgid "Could not parse diff output." +msgstr "Не атрымоўваецца апрацаваць выснову diff." -#: komparepart/kompare_part.cpp:493 +#: libdiff2/komparemodellist.cpp:451 #, fuzzy -msgid "Running diff..." -msgstr "Запушчаны diff..." +msgid "The files are identical." +msgstr "Усе файлы ідэнтычныя." -#: komparepart/kompare_part.cpp:496 +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Parsing diff output..." -msgstr "Апрацоўваецца выснова diff..." +msgid "Could not write to the temporary file." +msgstr "Не атрымоўваецца запісаць у часовы файл." -#: komparepart/kompare_part.cpp:545 +#: main.cpp:33 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Параўноўваюцца файл %1 з файлам %2" +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Праграма для прагляду адрозненняў паміж файламі і стварэнні файла diff." -#: komparepart/kompare_part.cpp:550 +#: main.cpp:39 #, fuzzy -msgid "Comparing files in %1 with files in %2" -msgstr "Параўноўваюцца файлы ў %1 з файламі ў %2" +msgid "This will compare URL1 with URL2" +msgstr "Параўнанне \"Спасылкі1\" з \"Спасылкай2\"" -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Прагляд высновы diff з %1" +#: main.cpp:40 +#, fuzzy +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 "" +"Адкрыць URL1, лічачы,што гэта выснова diff. URL1 таксама можа быць '-'. Гэта " +"можна выкарыстаць, напрыклад, так: cvs diff | kompare -o -. Kompare " +"праверыць, ці існуе арыгінальны файл, а затым змяшае з высновай diff і " +"пакажа вынік. Ключ -n адмяняе праверку." -#: komparepart/kompare_part.cpp:558 +#: main.cpp:41 #, fuzzy -msgid "Blending diff output from %1 into file %2" -msgstr "Змешванне высновы diff з файла %1 у файл %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 "" +"Змяшаць URL2 і URL1, URL2 павінен быць высновай diff, а URL1 - (арыгінальны) " +"файл або тэчка." -#: komparepart/kompare_part.cpp:563 +#: main.cpp:42 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Змешванне высновы diff з файла %1 у тэчку %2" +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Адключае праверку аўтаматычнага пошуку арыгінальнага файла(ов) пры " +"выкарыстанні '-' у якасці крыніцы з опцыяй -o." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 #, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Файл прызначэння быў зменены.\n" -"Вы жадаеце яго захаваць?" +"Паказаць кадыроўку. Па змаўчанні будзе выкарыстоўвацца кадыроўка лакалі." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: main.cpp:52 #, fuzzy -msgid "Save Changes?" -msgstr "Захаваць змены?" +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:54 #, fuzzy -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -"Няма файла diff або параўнанне выраблена не па двух файлам. Статыстыка " -"недаступная." +"(c) 2001-2004, Джон Файербаух (John Firebaugh) і Отто Брюггеман (Otto " +"Bruggeman)" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: main.cpp:55 main.cpp:56 #, fuzzy -msgid "Diff Statistics" -msgstr "Статыстыка адрозненняў" +msgid "Author" +msgstr "Аўтар" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:57 #, fuzzy -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 "" -"Статыстыка:\n" -"\n" -"Стары файл: %1\n" -"Новы файл: %2\n" -"\n" -"Фармат: %3\n" -"Колькасць не змененых: %4\n" -"Колькасць адрозненняў: %5" +msgid "Kompare icon artist" +msgstr "Значкі" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:58 #, fuzzy -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" +msgid "A lot of good advice" +msgstr "Шмат добрых рад" + +#: main.cpp:59 +#, fuzzy +msgid "Cervisia diff viewer" +msgstr "Прагляд адрозненняў у Cervisia" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Параўнаць файлы або тэчку" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Файлы" + +#: komparepart/komparepartui.rc:13 +#, fuzzy, no-c-format +msgid "&Difference" +msgstr "Адрозненне" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Налады выгляду" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, fuzzy, no-c-format +msgid "Run Diff In" +msgstr "Запусціць Diff у" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, fuzzy, no-c-format +msgid "Command Line" +msgstr "Камандны радок" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir diff -udHprNa -- <крыніца> <прызначэнне>" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Параметры" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, fuzzy, no-c-format +msgid "Look for smaller changes" +msgstr "Пошук найменшых змен" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, fuzzy, no-c-format +msgid "Optimize for large files" +msgstr "Аптымізацыя для вялікіх файлаў" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, fuzzy, no-c-format +msgid "Ignore changes in case" +msgstr "Ігнараваць змены ў рэгістры літар" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Замяніць табуляцыю прабеламі" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, fuzzy, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ігнараваць дададзеныя і выдаленыя пустыя радкі" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, fuzzy, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ігнараваць змены прабелаў" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, fuzzy, no-c-format +msgid "Show function names" +msgstr "Паказваць імёны функцый" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Параўнаць тэчкі рэкурсіўна" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, fuzzy, no-c-format +msgid "Treat new files as empty" +msgstr "Лічыць новыя файлы як пустыя" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, fuzzy, no-c-format +msgid "Format" +msgstr "Фармат" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, fuzzy, no-c-format +msgid "Side-by-side" +msgstr "Побач сябар з сябрам" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Статыстыка:\n" -"\n" -"Колькасць файлаў у файле адрозненняў: %1\n" -"Фармат: %2\n" -"\n" -"Бягучы стары файл: %3\n" -"Бягучы новы файл: %4\n" -"\n" -"Колькасць не змененых: %5\n" -"Колькасць адрозненняў: %6" diff --git a/tde-i18n-bg/messages/tdesdk/kompare.po b/tde-i18n-bg/messages/tdesdk/kompare.po index 5db61e38f3b..464dd5f1ac6 100644 --- a/tde-i18n-bg/messages/tdesdk/kompare.po +++ b/tde-i18n-bg/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "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: 2007-08-31 17:51+0000\n" "Last-Translator: Zlatko Popov \n" "Language-Team: Bulgarian \n" @@ -14,331 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Прилагане на разликите" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Отмяна прилагането на разликите" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "&Прилагане на всички" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Отмяна на прилагане на всички" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&редишен файл" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Следващ файл" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Предишна разлика" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Следваща разлика" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Няма модели или разлики. Файлът: %1 не е валиден diff файл." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Има проблеми при прилагането на разлика %1 към файл %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Има проблеми при прилагането на разлика %1 към папка %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Временният файл не може да бъде творен." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Записът във временният файл %1 е невъзможен. Ще бъде изтрит." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Целева директория %1 не може да бъде създадена.\n" -"Файлът не е записан." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Временният файл в целевата директория %1 не може да бъде зареден. " -"Той е достъпен като: %2. Можете ръчно да го копирате в подходящото " -"място.." - -#: 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 "Изпълнение на Diff In" - -#. 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 "cd dir && diff -udHprNa -- целеви източник" - -#. 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 "Ed" - -#. 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 "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 "Това ще сравни URL1 и URL2" - -#: 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 "" -"Това ще отвори URL1 и ще очаква да са данни за разликите. URL1 може също така " -"да бъде \"-\" и тогава ще бъде прочетен от позицията на стандартните входни " -"данни. Например може да бъде използвано за cvs diff | kompare -o -. Ще бъдат " -"проверени, за да види дали може да намери оригиналния файл(ове), да ги смеси и " -"да покаже резултата. -n изключва проверката." - -#: 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 "" -"Това ще смеси URL2 с URL1. URL2 се очаква да бъде данните за разлики, а URL1 - " -"файлът или директорията, където да бъде смесването. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Изключете отметката, ако искате автоматично да откривате оригиналния файл(ове) " -"като използвате \"-\" като URL с опция -o." - -#: 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 и Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Автор" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare icon artist" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "A lot of good advice" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Разлики във Cervisia" - -#: 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 "" -"Ако в полетата сте въвели 2 имена на файлове или 2 папки, тогава този бутон ще " -"бъде включен, а при натискането му ще започне сравняване на въведените файлове " -"или папки. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Златко Попов" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -444,22 +126,48 @@ msgstr "Смесване на тази директория или папка с #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Ако сте въвели име на файл или папка, а също така и файла с изходните данни, " "тогава бутонът ще бъде активен. Когато го натиснете, ще се покаже прозорец, " "където се смесват изходните данни, така че после можете да приложите " "разликата(е) към файл(ове). " +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Сравняване на файлове и папки" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Източник" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Цел" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Сравняване" + #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Сравняване на тези файлове или папки" -#: kompare_shell.cpp:439 +#: 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 "" +"Ако в полетата сте въвели 2 имена на файлове или 2 папки, тогава този бутон " +"ще бъде включен, а при натискането му ще започне сравняване на въведените " +"файлове или папки. " + +#: kompare_shell.cpp:439 msgid "Text View" msgstr "Изглед \"текст\"" @@ -554,18 +262,230 @@ msgstr "Неизвестен" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -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 "The URL %1 cannot be downloaded." +msgstr "Адресът (URL) %1 не може да бъде зареден." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Адресът (URL) %1 не съществува на компютъра." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Опции за разлики" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Кръпки" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Запис на .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 "Вече има такъв файл" + +#: 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" + +#: 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 "Сравняване на файл %1 с файл %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Сравняване на файлове в %1 с файлове в %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Преглед на разликите от %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Смесване на разликите за%1 във файл %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Смесване на разликите за%1 във папка %2" + +#: 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 "" +"Направихте промени в целевия файл(ове).\n" +"Искате ли да ги запишете?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Статистика:\n" +"\n" +"Стар файл: %1\n" +"Нов файл: %2\n" +"\n" +"Формат: %3\n" +"Брой парчета: %4\n" +"Брой разлики: %5" + +#: 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 "" +"Статистика:\n" +"\n" +"Брой файлове във файла за разлики: %1\n" +"Format: %2\n" +"\n" +"Текущ стар файл: %3\n" +"Текущ нов файл: %4\n" +"\n" +"Брой парчета: %5\n" +"Брой разлики: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Настройки" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Изглед \"текст\"" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Настройки на изглед" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Разлики" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Настройки на разлики" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Файлове" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Тук въведете файловете, които искате да сравните." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Тук можете да промените опциите за сравняване на файлове." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Изглед" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Тук можете да промените опциите за изгледа." @@ -594,9 +514,9 @@ msgstr "Формат на изходните данни" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Изберете формата на изходните данни за разликите. Unified е сред най-често " "използваните, защото е четим. Разработчиците на TDE най-много го харесват за " @@ -606,6 +526,11 @@ msgstr "" msgid "Lines of Context" msgstr "Редове контекст" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Брой редове контекст:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -730,19 +655,19 @@ msgstr "Изключение - шаблон на файл" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Ако е включена тази отметка, можете да въведете шаблон на шел вдясно или да " "изберете елементи от списъка." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Тук можете да въведете или премахнете шаблон на шел или да изберете елементи от " -"списъка." +"Тук можете да въведете или премахнете шаблон на шел или да изберете елементи " +"от списъка." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -756,19 +681,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Тук можете да въведете адрес на файл със шаблони на шелове, които да бъдат " "игнорирани по време на сравняването на папките." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Всеки файл, който маркирате в изскачащия прозорец, ще бъде поставен отдясно на " -"бутона." +"Всеки файл, който маркирате в изскачащия прозорец, ще бъде поставен отдясно " +"на бутона." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -834,168 +759,272 @@ msgstr "Шрифт:" msgid "Size:" msgstr "Размер:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Настройки" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Настройки на изглед" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Настройки на разлики" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Запис на &всичко" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Шрифт:" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Запис на &разликите..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Прилагане на разликите" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Запомняне на източника и направлението" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Отмяна прилагането на разликите" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Показване на статистика" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "&Прилагане на всички" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Адресът (URL) %1 не може да бъде зареден." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Отмяна на прилагане на всички" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Адресът (URL) %1 не съществува на компютъра." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&редишен файл" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Опции за разлики" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Следващ файл" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Кръпки" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Предишна разлика" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Запис на .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Следваща разлика" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Вече има такъв файл или е защитен от запис. Искате ли да бъде презаписан?" +"Няма модели или разлики. Файлът: %1 не е валиден diff файл." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Вече има такъв файл" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Има проблеми при прилагането на разлика %1 към файл %2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Презапис" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Има проблеми при прилагането на разлика %1 към папка %2." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Без презапис" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Временният файл не може да бъде творен." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Записът във временният файл %1 е невъзможен. Ще бъде изтрит." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Проверка за разлики..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Целева директория %1 не може да бъде създадена.\n" +"Файлът не е записан." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Обработка на данните за разликите..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Временният файл в целевата директория %1 не може да бъде зареден. " +"Той е достъпен като: %2. Можете ръчно да го копирате в подходящото " +"място.." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Сравняване на файл %1 с файл %2" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Данните за разликите не могат да бъдат обработени." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Сравняване на файлове в %1 с файлове в %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Файловете са същите." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Преглед на разликите от %1" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Записът във временния файл е невъзможен." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Смесване на разликите за%1 във файл %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Програма за намиране (и генериране) на разлики между файлове" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Смесване на разликите за%1 във папка %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Това ще сравни URL1 и URL2" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Направихте промени в целевия файл(ове).\n" -"Искате ли да ги запишете?" +"Това ще отвори URL1 и ще очаква да са данни за разликите. URL1 може също " +"така да бъде \"-\" и тогава ще бъде прочетен от позицията на стандартните " +"входни данни. Например може да бъде използвано за cvs diff | kompare -o -. " +"Ще бъдат проверени, за да види дали може да намери оригиналния файл(ове), да " +"ги смеси и да покаже резултата. -n изключва проверката." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Запис на промените?" - -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Или няма файл с разлики, или не са сравнени два файла. Следователно няма " -"статистика." +"Това ще смеси URL2 с URL1. URL2 се очаква да бъде данните за разлики, а URL1 " +"- файлът или директорията, където да бъде смесването. " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика за разлики" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Статистика:\n" -"\n" -"Стар файл: %1\n" -"Нов файл: %2\n" -"\n" -"Формат: %3\n" -"Брой парчета: %4\n" -"Брой разлики: %5" +"Изключете отметката, ако искате автоматично да откривате оригиналния " +"файл(ове) като използвате \"-\" като URL с опция -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 и Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Автор" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare icon artist" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "A lot of good advice" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Разлики във Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Сравняване на тези файлове и папки" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Файлове" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Разлика" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Настройки на изглед" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Изпълнение на Diff In" + +#: 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 "cd dir && diff -udHprNa -- целеви източник" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Статистика:\n" -"\n" -"Брой файлове във файла за разлики: %1\n" -"Format: %2\n" -"\n" -"Текущ стар файл: %3\n" -"Текущ нов файл: %4\n" -"\n" -"Брой парчета: %5\n" -"Брой разлики: %6" diff --git a/tde-i18n-br/messages/tdesdk/kompare.po b/tde-i18n-br/messages/tdesdk/kompare.po index cea39b88a17..645e517c615 100644 --- a/tde-i18n-br/messages/tdesdk/kompare.po +++ b/tde-i18n-br/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" @@ -14,310 +14,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "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 "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "N'hellan ket digeriñ ur restr padennek." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Ne m'eus ket gallet skrivañ d'ar restr padennek %1" -", emaon o lemel anezhañ." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Thierry Vignaud, Jañ-Mai Drapier" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -415,17 +118,40 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Tarzh" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Dehaezadur" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Gwel ar skrid" @@ -509,18 +235,207 @@ msgstr "Dianav" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "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 "The URL %1 cannot be downloaded." +msgstr "N'em eus ket enkargañ an URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "N'eo ket endeo an URL %1 e-barzh ho reizhiad." + +#: 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 "" +#: 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 msgid "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 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Neuziadur" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Amañ e c'hellit kemmañ dibarzhoù ar gwell." @@ -546,15 +461,20 @@ msgstr "Furmad ezkas" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -672,14 +592,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -693,14 +613,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -767,145 +687,252 @@ msgstr "Nodrezh :" msgid "Size:" msgstr "Ment :" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Dibaboù" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Nodrezh :" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Sell ouzh an dibarzhoù" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Enrol&lañ an holl re" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Restr dia&raok" + +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Restr a h&eul" + +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Diskouez ar stadegoù" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "N'em eus ket enkargañ an URL %1." +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "N'eo ket endeo an URL %1 e-barzh ho reizhiad." +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Dibaboù diff" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Restroù Patch" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "N'hellan ket digeriñ ur restr padennek." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Enrollañ .diff" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Ne m'eus ket gallet skrivañ d'ar restr padennek %1, emaon o lemel " +"anezhañ." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Ar restr a zo endeo" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Rasklañ" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ne rasklit ket" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Heñvel eo ar restroù." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ne m'eus ket skrivañ d'ar restr padennek." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Emaon o seveniñ diff ..." +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:43 +msgid "" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: 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 "" -#: 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?" +#: main.cpp:58 +msgid "A lot of good advice" msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Enrollañ ar c'hemmoù ?" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:189 +msgid "Compare these files or folder" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +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 "" -#: 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" +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Linenn urzhiañ" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" 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" +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Dibaboù" + +#: 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 "Furmadiñ" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" diff --git a/tde-i18n-ca/messages/tdesdk/kompare.po b/tde-i18n-ca/messages/tdesdk/kompare.po index 060f90c78e7..292542a9b70 100644 --- a/tde-i18n-ca/messages/tdesdk/kompare.po +++ b/tde-i18n-ca/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2007-05-06 20:10+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -16,337 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplica la diferència" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "De&sfés diferència" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&lica-ho tot" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "D&esaplica-ho tot" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fitxer p&revi" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Fitxer s&egüent" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Di&ferència anterior" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Diferència següe&nt" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Sense models o diferencies, el fitxer %1 no és un fitxer diff " -"vàlid." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"S'han produït problemes durant l'aplicació del diff %1 al fitxer " -"%2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"S'han produït problemes durant l'aplicació del diff %1 " -"a la carpeta %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "No s'ha pogut obrir un fitxer temporal." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"No s'ha pogut escriure al fitxer temporal %1, s'esborra." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"No s'ha pogut crear el directori destí %1.\n" -"El fitxer no ha estat desat." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"No s'ha pogut pujar el fitxer temporal a la localització de destí %1" -". El fitxer temporal encara és disponible sota: %2" -". Podeu copiar-lo manualment a l'ubicació correcta." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "No s'ha pogut analitzar la sortida de diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Els fitxers són idèntics. " - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "No s'ha pogut escriure al fitxer temporal." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Diferència" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Executa diff en" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Línia de comandaments" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir i diff -udHprNa -- font de destí" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Cerca canvis menors" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimitza per a fitxers grans" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignora canvis entre minúscula/majúscula" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expàndre tabulacions a espais" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignora línies buides afegides o eliminades" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignora canvis en espais en blanc" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostra noms de les funcions" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Compara carpetes recursivament" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tracta als fitxers nous com a buits" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Context" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unificat" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Cara-a-cara" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Nombre de línies de context:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Un programa per a veure diferències entre fitxers i opcionalment generar un " -"fitxer diff" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Això compararà URL1 amb URL2" - -#: 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 "" -"Això obrirà URL 1 i esperarà a la sortida de diff. URL 1 també pot ser '-' i " -"llavores es llegirà a l'entrada estàndard. Per exemple es pot emprar per a " -"\"diff cvs | kompare -o -\". Kompare farà una comprovació per a veure si pot " -"trobar el(s) fitxer(s) original(s) i llavores fusionarà l'original a la sortida " -"de diff i la mostrarà en el visor. \"- n\" deshabilita la comprovació." - -#: 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 "" -"Això fusionarà URL 2 dintre de URL 1, s'esperarà que URL 2 sigui una sortida de " -"diff i que el fitxer o carpeta de URL 1 sigui el corresponent per a dita " -"sortida de diff. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Deshablita la comprovació per a la recerca automàtica dels fitxers originals " -"quan s'usi '-' com a URL amb l'opció \"-o\"." - -#: 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 "" -"Useu per especificar la codificació al cridar des de la línia d'ordres. Per " -"defecte s'usarà la codificació local." - -#: 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 i Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Creador de la icona de Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Un munt de bons consells" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visor diff de Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Compara fitxers o carpetes" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Font" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destí" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Compara" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Compara aquests fitxers o carpetes" - -#: 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 "" -"Si en els camps d'aquest diàleg heu introduït 2 noms de fitxer o 2 carpetes, " -"llavores s'habilitarà aquest botó i prement-lo es començarà a fer una " -"comparació dels fitxers o carpetes introduïdes. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Albert Astals Cid,Antoni Bella Pérez" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,21 +128,48 @@ msgstr "Fusiona aquest fitxer o carpeta amb la sortida de diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i un " -"de fitxer que contindrà la sortida de diff, llavores aquest botó serà habilitat " -"i prement-lo s'obrirà la finestra de vista principal de kompare, a on el fitxer " -"o fitxers de la carpeta seran mesclats amb la sortida de diff, de manera que " -"pugueu aplicar la(es) diferència(es) a un fitxer o als fitxers. " +"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i " +"un de fitxer que contindrà la sortida de diff, llavores aquest botó serà " +"habilitat i prement-lo s'obrirà la finestra de vista principal de kompare, a " +"on el fitxer o fitxers de la carpeta seran mesclats amb la sortida de diff, " +"de manera que pugueu aplicar la(es) diferència(es) a un fitxer o als " +"fitxers. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Compara aquests fitxers o carpetes" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Compara fitxers o carpetes" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Font" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destí" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Compara" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Compara aquests fitxers o carpetes" + +#: 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 "" +"Si en els camps d'aquest diàleg heu introduït 2 noms de fitxer o 2 carpetes, " +"llavores s'habilitarà aquest botó i prement-lo es començarà a fer una " +"comparació dels fitxers o carpetes introduïdes. " #: kompare_shell.cpp:439 msgid "Text View" @@ -563,18 +266,230 @@ msgstr "Desconegut" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Aquí podeu introduir els fitxers que voleu comparar." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Desa-ho &tot" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Desa .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Intercanvia font amb destí" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostra estadístiques" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "La URL %1 no s'ha pogut descarregar." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "La URL %1 no existeix en el vostre sistema." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opcions de diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Fitxers pedaç" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Desa .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"El fitxer existeix o està protegit contra escriptura, voleu sobrescriure'l?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "El fitxer ja existeix" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sobreescriure" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "No sobreescriure" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "S'està executant diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "S'està analitzant la sortida de diff...." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Es compara el fitxer %1 amb el fitxer %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Es comparen els fitxers de %1 amb els de %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "S'està analitzant la sortida de diff des de %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2" + +#: 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 "" +"Heu realitzat canvis en el(s) fitxer(s) destí.\n" +"Desitgeu desar-los?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Desar els canvis?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificat" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Context" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"No hi ha fitxer diff o no s'han comparat 2 fitxers. Pel que no hi ha " +"estadístiques disponibles." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Estadístiques del diff" + +#: 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 "" +"Estadístiques:\n" +"\n" +"Fitxer antic: %1\n" +"Fitxer nou: %2\n" +"\n" +"Format : %3\n" +"Nombre de blocs : %4\n" +"Nombre de diferències : %5" + +#: 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 "" +"Estadístiques:\n" +"\n" +"Nombre de fitxers en el fitxer diff: %1\n" +"Format: %2\n" +"\n" +"Fitxer antic actual: %3\n" +"Fitxer nou actual: %4\n" +"\n" +"Nombre de blocs: %5\n" +"Nombre de diferències: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferències" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Vista de text" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Arranjament de la vista" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Arranjament de diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Fitxers" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Aquí podeu introduir els fitxers que voleu comparar." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Aquí podeu canviar les opcions per a comparar els fitxers." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "A&parença" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Aquí podeu canviar les opcions per a la vista." @@ -589,9 +504,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Aquí podeu seleccionar un programa de diff diferent. Sobre Solaris el programa " -"estàndard per a diff no accepta totes les opcions que poseëix la versió de GNU. " -"D'aquesta manera podeu seleccionar aquesta versió." +"Aquí podeu seleccionar un programa de diff diferent. Sobre Solaris el " +"programa estàndard per a diff no accepta totes les opcions que poseëix la " +"versió de GNU. D'aquesta manera podeu seleccionar aquesta versió." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -603,27 +518,33 @@ msgstr "Format de la sortida" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Seleccioneu el format de la sortida generada per diff. Unificada és l'emprada " -"més sovint degut a que és de més fàcil lectura. És la que més agrada als " -"desenvolupadors de TDE pel que és recomana usar-la per enviar pedaços." +"Seleccioneu el format de la sortida generada per diff. Unificada és " +"l'emprada més sovint degut a que és de més fàcil lectura. És la que més " +"agrada als desenvolupadors de TDE pel que és recomana usar-la per enviar " +"pedaços." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Línies de context" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Nombre de línies de context:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"El nombre de línies de context normalment és de 2 o 3. Això torna llegible al " -"diff i aplicable en la majoria dels casos. Més de 3 línies complicarà el diff " -"innecessàriament." +"El nombre de línies de context normalment és de 2 o 3. Això torna llegible " +"al diff i aplicable en la majoria dels casos. Més de 3 línies complicarà el " +"diff innecessàriament." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -739,16 +660,16 @@ msgstr "Patró de fitxer a excloure" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Si està marcada podeu introduir un patró d'intèrpret de comandaments a la caixa " -"de text de la dreta o triar-ne una entrada de la llista." +"Si està marcada podeu introduir un patró d'intèrpret de comandaments a la " +"caixa de text de la dreta o triar-ne una entrada de la llista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Aquí podeu introduir o eliminar un patró per a l'intèrpret de comandaments o " "triar-ne un o més des de les entrades que apareixen a la llista." @@ -766,19 +687,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Aquí podeu introduir la URL d'un fitxer amb patrons per a l'intèrpret de " "comandaments que seran ignorats durant la comparació de les carpetes." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Qualsevol fitxer que seleccioneu en el diàleg que aparegui quan feu clic serà " -"inclòs en el diàleg que apareix a l'esquerra d'aquest botó." +"Qualsevol fitxer que seleccioneu en el diàleg que aparegui quan feu clic " +"serà inclòs en el diàleg que apareix a l'esquerra d'aquest botó." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -844,168 +765,277 @@ msgstr "Font:" msgid "Size:" msgstr "Mida:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferències" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Font:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Arranjament de la vista" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplica la diferència" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Arranjament de diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "De&sfés diferència" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Desa-ho &tot" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&lica-ho tot" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Desa .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "D&esaplica-ho tot" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Intercanvia font amb destí" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostra estadístiques" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "La URL %1 no s'ha pogut descarregar." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "La URL %1 no existeix en el vostre sistema." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fitxer p&revi" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opcions de diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Fitxer s&egüent" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Fitxers pedaç" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Di&ferència anterior" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Desa .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Diferència següe&nt" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"El fitxer existeix o està protegit contra escriptura, voleu sobrescriure'l?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "El fitxer ja existeix" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sobreescriure" +"Sense models o diferencies, el fitxer %1 no és un fitxer diff " +"vàlid." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "No sobreescriure" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"S'han produït problemes durant l'aplicació del diff %1 al fitxer " +"%2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"S'han produït problemes durant l'aplicació del diff %1 a la " +"carpeta %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "S'està executant diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "No s'ha pogut obrir un fitxer temporal." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "S'està analitzant la sortida de diff...." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"No s'ha pogut escriure al fitxer temporal %1, s'esborra." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Es compara el fitxer %1 amb el fitxer %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"No s'ha pogut crear el directori destí %1.\n" +"El fitxer no ha estat desat." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Es comparen els fitxers de %1 amb els de %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"No s'ha pogut pujar el fitxer temporal a la localització de destí %1. El fitxer temporal encara és disponible sota: %2. Podeu copiar-lo " +"manualment a l'ubicació correcta." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "S'està analitzant la sortida de diff des de %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "No s'ha pogut analitzar la sortida de diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Els fitxers són idèntics. " -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "No s'ha pogut escriure al fitxer temporal." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Heu realitzat canvis en el(s) fitxer(s) destí.\n" -"Desitgeu desar-los?" +"Un programa per a veure diferències entre fitxers i opcionalment generar un " +"fitxer diff" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Desar els canvis?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Això compararà URL1 amb URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"No hi ha fitxer diff o no s'han comparat 2 fitxers. Pel que no hi ha " -"estadístiques disponibles." +"Això obrirà URL 1 i esperarà a la sortida de diff. URL 1 també pot ser '-' i " +"llavores es llegirà a l'entrada estàndard. Per exemple es pot emprar per a " +"\"diff cvs | kompare -o -\". Kompare farà una comprovació per a veure si pot " +"trobar el(s) fitxer(s) original(s) i llavores fusionarà l'original a la " +"sortida de diff i la mostrarà en el visor. \"- n\" deshabilita la " +"comprovació." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Estadístiques del diff" +#: 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 "" +"Això fusionarà URL 2 dintre de URL 1, s'esperarà que URL 2 sigui una sortida " +"de diff i que el fitxer o carpeta de URL 1 sigui el corresponent per a dita " +"sortida de diff. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estadístiques:\n" -"\n" -"Fitxer antic: %1\n" -"Fitxer nou: %2\n" -"\n" -"Format : %3\n" -"Nombre de blocs : %4\n" -"Nombre de diferències : %5" +"Deshablita la comprovació per a la recerca automàtica dels fitxers originals " +"quan s'usi '-' com a URL amb l'opció \"-o\"." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Useu per especificar la codificació al cridar des de la línia d'ordres. Per " +"defecte s'usarà la codificació local." + +#: 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 i Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Creador de la icona de Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Un munt de bons consells" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visor diff de Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Compara aquests fitxers o carpetes" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Fitxers" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Diferència" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Arranjament de la vista" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Executa diff en" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Línia de comandaments" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir i diff -udHprNa -- font de destí" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pcions" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Cerca canvis menors" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimitza per a fitxers grans" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignora canvis entre minúscula/majúscula" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expàndre tabulacions a espais" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignora línies buides afegides o eliminades" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignora canvis en espais en blanc" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostra noms de les funcions" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Compara carpetes recursivament" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tracta als fitxers nous com a buits" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Cara-a-cara" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estadístiques:\n" -"\n" -"Nombre de fitxers en el fitxer diff: %1\n" -"Format: %2\n" -"\n" -"Fitxer antic actual: %3\n" -"Fitxer nou actual: %4\n" -"\n" -"Nombre de blocs: %5\n" -"Nombre de diferències: %6" diff --git a/tde-i18n-cs/messages/tdesdk/kompare.po b/tde-i18n-cs/messages/tdesdk/kompare.po index a7a8fe7531f..a6034da76ee 100644 --- a/tde-i18n-cs/messages/tdesdk/kompare.po +++ b/tde-i18n-cs/messages/tdesdk/kompare.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "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: 2006-07-05 10:12+0200\n" "Last-Translator: Klara Cihlarova \n" "Language-Team: Czech \n" @@ -19,324 +19,24 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplikovat rozdíl" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Vrátit rozdíl" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&likovat všechny" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Vrátit vš&e" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Předchozí soubo&r" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Násl&edující soubor" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Předchozí rozdíl" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Následující rozdíl" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Nastaly problémy při aplikování rozdílů %1 do souboru %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Nastaly problémy při aplikování rozdílů %1 do složky %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Nepodařilo se otevřít dočasný soubor." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Nepodařil se zápis do dočasného souboru %1, probíhá mazání." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Nepodařilo se zpracovat výstup z diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Soubory jsou stejné." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nepodařil se zápis do dočasného souboru." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Rozdíl" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Spustit diff v" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Příkazový řádek" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- cíl zdroje" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Hledat menší změny" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimalizovat pro velké soubory" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorovat změnu velikosti písmen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Nahradit tabulátory mezerami" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorovat přidané nebo odstraněné prázdné řádky" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorovat změny v prázdném místě" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Zobrazit názvy funkcí" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Porovnat složky rekurzivně" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Nové soubory považovat za prázdné" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formát" - -#. 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 "Kontextový" - -#. 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 "Ed" - -#. 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ální" - -#. 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 "Unifikovaný" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Vedle sebe" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Počet řádků kontextu:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "Program pro zobrazení rozdílů mezi soubory s možností generovat diff" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Tímto porovnáte URL1 s URL2" - -#: 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 a Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Autor ikon" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Spousta dobrých rad" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff prohlížeč" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Porovnat soubory nebo složky" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Zdroj" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cíl" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Porovnat" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Porovnat tyto soubory nebo složky" - -#: 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 "" -"Pokud jste zadali 2 jména souborů nebo 2 složky, toto tlačítko bude povolené a " -"jeho stisknutím se spustí porovnání zadaných souborů nebo adresářů." - -#: _translatorinfo.cpp:1 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Lukáš Tinkl,Klára Cihlářová" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -446,17 +146,42 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Porovnat soubory nebo složky" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Zdroj" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cíl" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Porovnat" + #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Porovnat tyto soubory nebo složky" +#: 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 "" +"Pokud jste zadali 2 jména souborů nebo 2 složky, toto tlačítko bude povolené " +"a jeho stisknutím se spustí porovnání zadaných souborů nebo adresářů." + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Textový pohled" @@ -552,18 +277,229 @@ msgstr "Neznámý" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Zde můžete zadat soubory k porovnání." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Uložit &vše" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Uložit .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Prohodit zdroj a cíl" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Zobrazit statistiku" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL %1 nelze stáhnout." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 neexistuje ve vašem systému." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Možnosti Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Soubory se záplatami" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Uložit .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Soubor existuje, ale je chráněn proti zápisu; přejete si jej přepsat?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Soubor existuje" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Přepsat" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nepřepisovat" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Spouštím diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Zpracovávám výstup z diffu..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Porovnávám soubor %1 se souborem %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Porovnávám soubory v %1 se soubory v %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Zobrazuji výstup rozdílu z %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Mísím výstup diff %1 s adresářem %2" + +#: 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 "" +"Změnili jste cílové soubory.\n" +"Chcete tyto změny uložit?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Uložit změny?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unifikovaný" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontextový" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normální" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nebylo vykonáno porovnání 2 souborů ani zadaný soubor diff,\n" +"takže statistika není k dispozici." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistika Diff" + +#: 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 "" +"Statistika:\n" +"\n" +"Aktuální starý soubor: %1\n" +"Aktuální nový soubor: %2\n" +"\n" +"Formát: %3\n" +"Počet kusů: %4\n" +"Počet rozdílů: %5" + +#: 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 "" +"Statistika:\n" +"\n" +"Počet souborů v souboru diff: %1\n" +"Formát : %2\n" +"\n" +"Aktuální starý soubor: %3\n" +"Aktuální nový soubor: %4\n" +"\n" +"Počet kusů: %5\n" +"Počet rozdílů: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Nastavení" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textový pohled" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Nastavení pohledu" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Nastavení Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "Sou&bory" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Zde můžete zadat soubory k porovnání." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Zde můžete změnit nastavení porovnávání souborů." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Vzhled" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Zde můžete změnit nastavení pohledu." @@ -592,15 +528,20 @@ msgstr "Formát výstupu" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Počet řádků kontextu" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Počet řádků kontextu:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -718,14 +659,14 @@ msgstr "Vyjmout vzorek souborů" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -739,14 +680,14 @@ msgstr "Pokud je zaškrtnuto, můžete napravo zadat cestu k souboru." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -813,167 +754,255 @@ msgstr "Písmo:" msgid "Size:" msgstr "Velikost:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Nastavení" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Nastavení pohledu" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Nastavení Diff" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Písmo:" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Uložit &vše" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplikovat rozdíl" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Uložit .&diff..." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Vrátit rozdíl" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Prohodit zdroj a cíl" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&likovat všechny" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Zobrazit statistiku" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Vrátit vš&e" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 nelze stáhnout." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Předchozí soubo&r" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 neexistuje ve vašem systému." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Násl&edující soubor" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Možnosti Diff" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Předchozí rozdíl" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Soubory se záplatami" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Následující rozdíl" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Uložit .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Soubor existuje, ale je chráněn proti zápisu; přejete si jej přepsat?" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Nastaly problémy při aplikování rozdílů %1 do souboru %2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Soubor existuje" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Nastaly problémy při aplikování rozdílů %1 do složky %2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Přepsat" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Nepodařilo se otevřít dočasný soubor." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nepřepisovat" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Nepodařil se zápis do dočasného souboru %1, probíhá mazání." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Spouštím diff..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Zpracovávám výstup z diffu..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Nepodařilo se zpracovat výstup z diff." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Porovnávám soubor %1 se souborem %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Soubory jsou stejné." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Porovnávám soubory v %1 se soubory v %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nepodařil se zápis do dočasného souboru." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Zobrazuji výstup rozdílu z %1" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Program pro zobrazení rozdílů mezi soubory s možností generovat diff" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Mísím výstup diff %1 s adresářem %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Tímto porovnáte URL1 s URL2" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Změnili jste cílové soubory.\n" -"Chcete tyto změny uložit?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Uložit změny?" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:42 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Nebylo vykonáno porovnání 2 souborů ani zadaný soubor diff,\n" -"takže statistika není k dispozici." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistika Diff" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Statistika:\n" -"\n" -"Aktuální starý soubor: %1\n" -"Aktuální nový soubor: %2\n" -"\n" -"Formát: %3\n" -"Počet kusů: %4\n" -"Počet rozdílů: %5" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh a Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Autor ikon" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Spousta dobrých rad" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff prohlížeč" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Porovnat tyto soubory nebo složky" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Sou&bory" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Rozdíl" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Nastavení pohledu" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Spustit diff v" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Příkazový řádek" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- cíl zdroje" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Možnos&ti" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Hledat menší změny" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimalizovat pro velké soubory" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorovat změnu velikosti písmen" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Nahradit tabulátory mezerami" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorovat přidané nebo odstraněné prázdné řádky" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorovat změny v prázdném místě" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Zobrazit názvy funkcí" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Porovnat složky rekurzivně" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Nové soubory považovat za prázdné" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formát" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Vedle sebe" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Počet souborů v souboru diff: %1\n" -"Formát : %2\n" -"\n" -"Aktuální starý soubor: %3\n" -"Aktuální nový soubor: %4\n" -"\n" -"Počet kusů: %5\n" -"Počet rozdílů: %6" diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po index ea1c0865cd5..b3b7263c0bc 100644 --- a/tde-i18n-cy/messages/tdesdk/kompare.po +++ b/tde-i18n-cy/messages/tdesdk/kompare.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n" -"POT-Creation-Date: 2014-09-29 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: cy \n" @@ -10,308 +10,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "" - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Llinell orchymyn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Fformat" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, no-c-format -msgid "Context" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, no-c-format -msgid "Ed" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, no-c-format -msgid "Normal" -msgstr "Arferol" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, no-c-format -msgid "RCS" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, no-c-format -msgid "Unified" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "" - -#: main.cpp:40 -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." -msgstr "" - -#: main.cpp:41 -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " -msgstr "" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Awdur" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Tarddiad" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cyrchfan" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "KD wrth KGyfieithu" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -409,17 +114,40 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Tarddiad" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cyrchfan" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Golwg Testun" @@ -499,22 +227,211 @@ msgstr "" msgid "Unknown" msgstr "Anhysbys" -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "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 "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Ffeil yn Bodoli" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Trosysgrifo" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Peidio â Throsysgrifo" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "" + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "" + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Cadw Newidiadau?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "" + +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, no-c-format +msgid "RCS" +msgstr "" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Arferol" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "" + +#: komparepart/kompare_part.cpp:673 +msgid "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" +msgstr "" + +#: komparepart/kompare_part.cpp:686 +msgid "" +"Statistics:\n" +"\n" +"Number of files in diff file: %1\n" +"Format: %2\n" +"\n" +"Current old file: %3\n" +"Current new file: %4\n" +"\n" +"Number of hunks: %5\n" +"Number of differences: %6" +msgstr "" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Hoffterau" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Golwg Testun" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Gweld Gosodiadau" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Diff" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Ffeiliau" #: kompareurldialog.cpp:41 msgid "Here you can enter the files you want to compare." msgstr "" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" - #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Golwg" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -540,15 +457,20 @@ msgstr "" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -666,14 +588,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -687,14 +609,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -761,145 +683,250 @@ msgstr "Wynebfath:" msgid "Size:" msgstr "Maint:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Hoffterau" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Wynebfath:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Gweld Gosodiadau" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Cadw &Popeth" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Dangos Ystadegau" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Ffeil yn Bodoli" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Trosysgrifo" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Peidio â Throsysgrifo" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Cadw Newidiadau?" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Awdur" + +#: main.cpp:57 +msgid "Kompare icon artist" msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:58 +msgid "A lot of good advice" msgstr "" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Ffeiliau" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Gweld Gosodiadau" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Llinell orchymyn" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "De&wisiadau" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Fformat" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" diff --git a/tde-i18n-da/messages/tdesdk/kompare.po b/tde-i18n-da/messages/tdesdk/kompare.po index 7a923a33f04..6733f0cd7da 100644 --- a/tde-i18n-da/messages/tdesdk/kompare.po +++ b/tde-i18n-da/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2005-09-26 19:44-0400\n" "Last-Translator: Erik Kjær Pedersen \n" "Language-Team: Danish \n" @@ -16,334 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Anvend forskel" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Fjern anvendelse af forskel" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "An&vend alt" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Fjern anvendelse af alt" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Forrige fil" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Næ&ste fil" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Forrige forskel" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Næste forskel" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ingen modeller eller ingen forskelle, denne fil: %1" -", er ikke en gyldig diff-fil" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Der var problemer med at anvende diff %1 på filen %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Der var problemer med at anvende diff %1 på mappen %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Kunne ikke åbne en midlertidig fil." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Kunne ikke skrive til en midlertidig fil.%1, sletter den." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Kunne ikke skrive til en midlertidig mappe.%1.\n" -"Filen er ikke blevet gemt." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Kunne ikke overføre den midlertidige fil til målstedet %1" -"Den midlertidige fil er stadig til stede i: %2" -". Du kan kopiere den manuelt til det rigtige sted." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Kunne ikke fortolke diff-uddata." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Filerne er identiske." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Kunne ikke skrive til en midlertidig fil." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Forskel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Kør diff i" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Kommandolinje" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- kilde mål" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Kig efter små ændringer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimér for store filer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorér versalændringer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Udvid tab til mellemrum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorér tilføjede eller fjernede tomme linjer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorér ændringer i mellemrum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Vis funktionsnavne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Sammenlign mapper rekursivt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Behandl nye filer som tomme" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Sammenhæng" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Forenet" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Ved siden af hinanden" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Antal sammenhængslinjer:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Et program til at se forskelle mellem filer og hvis man vil generere en " -"diff-fil." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Dette vil sammenligne URL1 med URL2" - -#: 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 "" -"Dette vil åbne URL1 og forvente at det er diff-uddata. URL1 kan også være en " -"'-' og så vil den læse fra standard-inddata. Kan bruges for eksempel til cvs " -"diff | kompare -o -. Kompare vil tjekke for at se om den kan finde de " -"oprindelige filer og så blande de oprindelige filer med diff-uddata og vise det " -"i fremviseren. -n deaktiverer tjekket." - -#: 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 "" -"Dette vil blande URL2 med URL1, URL2 forventes at være diff-uddata og URL1 " -"filen eller mappen som diff-uddata skal blandes med. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Deaktiverer tjekket for automatisk at finde de oprindelige file når det bruges " -"med '-' som URL med -o flaget." - -#: 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 "" -"Brug dette til at angive tegnsættet når der kaldes fra kommandolinjen. Det vil " -"som standard være det lokale tegnsæt hvis intet andet er angivet." - -#: 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 og Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Forfatter" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare ikonkunstner" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "En masse gode råd" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff-fremviser" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Sammenlign filer og mapper" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Kilde" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Mål" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Sammenlign" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Sammenlign disse filer og mapper" - -#: 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 "" -"Hvis du har indgivet 2 filnavne eller 2 mapper i felterne i denne dialog så vil " -"denne knap blive aktiveret og tryk på den vil starte en sammenligning af de " -"indtastede filer eller mapper. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Erik Kjær Pedersen" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -449,28 +128,54 @@ msgstr "Bland denne file eller dette katalog med diff-uddata" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Hvis du har indgivet et fil- eller mappenavn og en fil der indeholder " -"diff-uddata i felterne i denne dialog så vil denne knap blive aktiveret og tryk " +"Hvis du har indgivet et fil- eller mappenavn og en fil der indeholder diff-" +"uddata i felterne i denne dialog så vil denne knap blive aktiveret og tryk " "på den vil åbne kompare's hovedvisning hvor uddata fra de indgivne filer fra " -"mappen blandes med diff-uddata så du kan anvende forskellene på en eller flere " -"filer." +"mappen blandes med diff-uddata så du kan anvende forskellene på en eller " +"flere filer." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Sammenlign disse filer og mapper" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Sammenlign filer og mapper" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstvisning" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Kilde" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Mål" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Sammenlign" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Sammenlign disse filer og mapper" + +#: 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 "" +"Hvis du har indgivet 2 filnavne eller 2 mapper i felterne i denne dialog så " +"vil denne knap blive aktiveret og tryk på den vil starte en sammenligning af " +"de indtastede filer eller mapper. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstvisning" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "Kildemappe" #: komparenavtreepart/komparenavtreepart.cpp:66 @@ -560,18 +265,230 @@ msgstr "Ukendt" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Her kan du indtaste de filer du ønsker at sammenligne." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Gem &alt" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Gem .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Ombyt kilde med mål" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Vis statistik" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL'en %1 kan ikke hentes." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL'en %1 eksisterer ikke på dit system." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff-indstillinger" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Rettelsesfiler" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Gem .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Filen eksisterer eller er skrivebeskyttet. Ønsker du at overskrive den?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Fil eksisterer" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Overskriv" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Overskriv ikke" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Kører diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Fortolker diff-uddata..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Sammenligner filen %1 med filen %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Sammenligner filer i %1 med filer i %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Kigger på diff-uddata fra %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Indfletter diff-uddata fra %1 i filen %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Indfletter diff-uddata fra %1 i mappen %2" + +#: 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 "" +"Du har lavet ændringer i målfilerne.\n" +"Vil du gerne gemme dem?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Gem ændringer?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Forenet" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Sammenhæng" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Der er ingen diff-fil eller ingen 2 filer der er blevet 'diffet'.Derfor er " +"ingen statistik tilstede." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-statistik" + +#: 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 "" +"Statistik:\n" +"\n" +"Gammel fil: %1\n" +"Ny fil: %2\n" +"\n" +"Format: %3\n" +"Antal stumper: %4\n" +"Antal forskelle: %5" + +#: 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 "" +"Statistik:\n" +"\n" +"Antal filer i diff-fil: %1\n" +"Format: %2\n" +"\n" +"Nuværende gammel fil: %3\n" +"Nuværende ny fil: %4\n" +"\n" +"Antal stumper: %5\n" +"Antal forskelle: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Indstillinger" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstvisning" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Vis indstillinger" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff-indstillinger" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Filer" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Her kan du indtaste de filer du ønsker at sammenligne." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Her kan du ændre valgene sammenlign af filer." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Udseende" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Her kan du ændre valgene for visningen." @@ -587,8 +504,8 @@ msgid "" "you can select that version." msgstr "" "Du kan vælge et andet diff-program her. På Solaris understøtter standard " -"diff-programmet ikke alle de flag som GNU-versionen gør. På denne måde kan du " -"vælge denne udgave." +"diff-programmet ikke alle de flag som GNU-versionen gør. På denne måde kan " +"du vælge denne udgave." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -600,27 +517,32 @@ msgstr "Uddataformat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Vælg det uddataformat diff skal generere. Forenet er det der oftest bruges da " -"det er meget læsbart. TDE-udviklerne kan bedst lide dette format så de bruger " -"det til at sende programrettelser." +"Vælg det uddataformat diff skal generere. Forenet er det der oftest bruges " +"da det er meget læsbart. TDE-udviklerne kan bedst lide dette format så de " +"bruger det til at sende programrettelser." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Linjer sammenhæng" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Antal sammenhængslinjer:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"Antallet af sammenhængslinjer er normalt 2 eller 3. Dette gør diff'en læsbar og " -"anvendelig i de fleste tilfælde. Mere end 3 linjer vil blot blæse den unødigt " -"op." +"Antallet af sammenhængslinjer er normalt 2 eller 3. Dette gør diff'en læsbar " +"og anvendelig i de fleste tilfælde. Mere end 3 linjer vil blot blæse den " +"unødigt op." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -736,16 +658,16 @@ msgstr "Filmønstre der skal ekskluderes" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Hvis dette er afkrydset kan du indtaste et skalmønster i tekstfeltet til højre " -"og vælge indgange fra listen." +"Hvis dette er afkrydset kan du indtaste et skalmønster i tekstfeltet til " +"højre og vælge indgange fra listen." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Her kan du indtaste eller fjerne et skalmønster eller vælge en eller flere " "indgange fra listen." @@ -763,16 +685,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Her kan du indtaste URL'en for en fil med skalmønstre der skal ignoreres ved " "sammenligningen af mapperne." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Enhver fil du vælger i denne dialog der popper op når du klikker på den vil " "blive puttet ind i dialogen til venstre for denne knap." @@ -841,168 +763,273 @@ msgstr "Skrifttype:" msgid "Size:" msgstr "Størrelse:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Indstillinger" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Skrifttype:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Vis indstillinger" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Anvend forskel" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff-indstillinger" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Fjern anvendelse af forskel" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Gem &alt" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "An&vend alt" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Gem .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Fjern anvendelse af alt" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Ombyt kilde med mål" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Vis statistik" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL'en %1 kan ikke hentes." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL'en %1 eksisterer ikke på dit system." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Forrige fil" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff-indstillinger" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Næ&ste fil" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Rettelsesfiler" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Forrige forskel" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Gem .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Næste forskel" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Filen eksisterer eller er skrivebeskyttet. Ønsker du at overskrive den?" +"Ingen modeller eller ingen forskelle, denne fil: %1, er ikke en " +"gyldig diff-fil" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fil eksisterer" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Overskriv" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Overskriv ikke" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Der var problemer med at anvende diff %1 på filen %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Der var problemer med at anvende diff %1 på mappen %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Kører diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Kunne ikke åbne en midlertidig fil." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Fortolker diff-uddata..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Kunne ikke skrive til en midlertidig fil.%1, sletter den." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Sammenligner filen %1 med filen %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Kunne ikke skrive til en midlertidig mappe.%1.\n" +"Filen er ikke blevet gemt." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Sammenligner filer i %1 med filer i %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Kunne ikke overføre den midlertidige fil til målstedet %1Den " +"midlertidige fil er stadig til stede i: %2. Du kan kopiere den " +"manuelt til det rigtige sted." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Kigger på diff-uddata fra %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Kunne ikke fortolke diff-uddata." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Indfletter diff-uddata fra %1 i filen %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Filerne er identiske." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Indfletter diff-uddata fra %1 i mappen %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Kunne ikke skrive til en midlertidig fil." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Du har lavet ændringer i målfilerne.\n" -"Vil du gerne gemme dem?" +"Et program til at se forskelle mellem filer og hvis man vil generere en diff-" +"fil." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Gem ændringer?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Dette vil sammenligne URL1 med URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Der er ingen diff-fil eller ingen 2 filer der er blevet 'diffet'.Derfor er " -"ingen statistik tilstede." +"Dette vil åbne URL1 og forvente at det er diff-uddata. URL1 kan også være en " +"'-' og så vil den læse fra standard-inddata. Kan bruges for eksempel til cvs " +"diff | kompare -o -. Kompare vil tjekke for at se om den kan finde de " +"oprindelige filer og så blande de oprindelige filer med diff-uddata og vise " +"det i fremviseren. -n deaktiverer tjekket." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-statistik" +#: 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 "" +"Dette vil blande URL2 med URL1, URL2 forventes at være diff-uddata og URL1 " +"filen eller mappen som diff-uddata skal blandes med. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistik:\n" -"\n" -"Gammel fil: %1\n" -"Ny fil: %2\n" -"\n" -"Format: %3\n" -"Antal stumper: %4\n" -"Antal forskelle: %5" +"Deaktiverer tjekket for automatisk at finde de oprindelige file når det " +"bruges med '-' som URL med -o flaget." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Brug dette til at angive tegnsættet når der kaldes fra kommandolinjen. Det " +"vil som standard være det lokale tegnsæt hvis intet andet er angivet." + +#: 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 og Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Forfatter" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare ikonkunstner" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "En masse gode råd" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff-fremviser" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Sammenlign disse filer og mapper" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Filer" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Forskel" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Vis indstillinger" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Kør diff i" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Kommandolinje" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- kilde mål" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Indstillinger" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Kig efter små ændringer" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimér for store filer" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorér versalændringer" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Udvid tab til mellemrum" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorér tilføjede eller fjernede tomme linjer" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorér ændringer i mellemrum" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Vis funktionsnavne" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Sammenlign mapper rekursivt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Behandl nye filer som tomme" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Ved siden af hinanden" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistik:\n" -"\n" -"Antal filer i diff-fil: %1\n" -"Format: %2\n" -"\n" -"Nuværende gammel fil: %3\n" -"Nuværende ny fil: %4\n" -"\n" -"Antal stumper: %5\n" -"Antal forskelle: %6" diff --git a/tde-i18n-de/messages/tdesdk/kompare.po b/tde-i18n-de/messages/tdesdk/kompare.po index 0136701e89e..e72cfd134dd 100644 --- a/tde-i18n-de/messages/tdesdk/kompare.po +++ b/tde-i18n-de/messages/tdesdk/kompare.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "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: 2006-07-02 15:57+0200\n" "Last-Translator: Burkhard Lück \n" "Language-Team: Deutsch \n" @@ -20,339 +20,13 @@ msgstr "" "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Abweichung &annehmen" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Annahme rückgängig" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "A&lle annehmen" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Alle Änderungen &zurücknehmen" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Vo&rige Datei" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Nächst&e Datei" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Vorige Abweichung" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Nächste Ab&weichung" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Keine Modelle oder keine Unterschiede vorhanden. Die Datei %1 " -"ist keine gültige diff-Datei." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Es sind Probleme beim Einfügen des diff %1 in die Datei %2 " -"aufgetreten." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Es sind Probleme beim Einfügen des diff %1 in den Ordner %2 " -"aufgetreten." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Eine temporäre Datei kann nicht geöffnet werden." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"In die temporäre Datei %1 kann nicht geschrieben werden. Sie wird " -"gelöscht." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Der Zielordner %1 kann nicht angelegt werden.\n" -"Die Datei wurde nicht gespeichert." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Die temporäre Datei kann nicht nach %1 hochgeladen werden. Die " -"temporäre Datei ist noch verfügbar unter %2. Sie können diese Datei " -"manuell an die richtige Stelle kopieren." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Diff-Ausgabe lässt sich nicht einlesen." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Die Dateien sind identisch." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Eine temporäre Datei kann nicht gespeichert werden." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Abweichung" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Diff starten in" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Befehl" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- quelle ziel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Nach kleineren Änderungen suchen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Für große Dateien optimieren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Änderungen der Groß/Kleinschreibung ignorieren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Tabulatoren in Leerzeichen umwandeln" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Neue oder entfernte Leerzeilen ignorieren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Leerzeichen-Änderungen ignorieren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Funktionsnamen anzeigen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Unterordner einbeziehen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Neue Dateien als leer betrachten" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Mit Kontextzeilen" - -#. 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 "Ed-Skript" - -#. 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 "Normal" - -#. 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 "Vereinheitlichtes Kontext-Format (unified)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Nebeneinander" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Anzahl:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Ein Programm zur Darstellung der Unterschiede zwischen Dateien und zur " -"wahlweisen Erstellung von \"Diff\"-Dateien." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Die URL1 wird mit URL2 verglichen" - -#: 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 "" -"Hiermit wird die URL1 geöffnet und als Ausgabe von diff betrachtet. URL1 kann " -"auch den Wert '-' haben, wenn aus der Standardeingabe gelesen werden soll. Dies " -"kann zum Beispiel für cvs diff | kompare -o genutzt werden. Kompare prüft dann, " -"ob die ursprüngliche(n) Datei(en) auffindbar sind und blendet diese bei der " -"Anzeige in die Ausgabe von diff ein. Der Schalter -n schaltet diese Prüfung " -"aus." - -#: 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 "" -"Die URL2 wird in URL1 eingefügt. Dabei wird URL2 als Ausgabe von diff " -"betrachtet und URL1 als Datei oder Ordner, in den die Ausgabe von diff " -"eingefügt werden soll. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Schaltet bei Verwendung von '-' als URL in Verbindung mit dem Schalter -o die " -"Prüfung für das automatische Suchen nach der ursprünglichen Datei aus." - -#: 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 "" -"Setzen Sie hier die Kodierung beim Aufruf von der Befehlszeile. Fehlt diese " -"Angabe wird die lokale Kodierung verwendet." - -#: 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 und Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Schöpfer des Kompare-Symbols" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Eine Menge guter Ratschläge" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia Diff-Anzeige" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Dateien oder Ordner vergleichen" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Quelle" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Ziel" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Vergleichen" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Diese Dateien oder Ordner vergleichen" - -#: 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 "" -"Wenn Sie zwei Dateinamen oder zwei Ordner in die Eingabefelder dieser Dialogbox " -"eingegeben haben, wird dieser Knopf aktiviert. Über den Knopf können Sie den " -"Vergleich der Dateien oder Ordner starten. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Thomas Diehl, Martin Derungs" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -458,24 +132,50 @@ msgstr "Mische diese Datei oder den Ordner mit der Ausgabe von diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Wenn Sie den Namen einer Datei oder eines Ordners, sowie den Namen der Datei, " -"die die Ausgabe von diff enthält, in die Eingabefelder eingetragen haben, wird " -"dieser Knopf aktiviert. Durch Betätigen dieses Knopfes rufen Sie die " -"Hauptansicht von Kompare auf, in der die Datei oder der Ordner mit der Ausgabe " -"von diff vermischt wird, so dass Sie die Unterschiede in die Datei oder die " -"Dateien einfügen können. " +"Wenn Sie den Namen einer Datei oder eines Ordners, sowie den Namen der " +"Datei, die die Ausgabe von diff enthält, in die Eingabefelder eingetragen " +"haben, wird dieser Knopf aktiviert. Durch Betätigen dieses Knopfes rufen Sie " +"die Hauptansicht von Kompare auf, in der die Datei oder der Ordner mit der " +"Ausgabe von diff vermischt wird, so dass Sie die Unterschiede in die Datei " +"oder die Dateien einfügen können. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Diese Dateien oder Ordner vergleichen" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Dateien oder Ordner vergleichen" -#: kompare_shell.cpp:439 +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Quelle" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Ziel" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Vergleichen" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Diese Dateien oder Ordner vergleichen" + +#: 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 "" +"Wenn Sie zwei Dateinamen oder zwei Ordner in die Eingabefelder dieser " +"Dialogbox eingegeben haben, wird dieser Knopf aktiviert. Über den Knopf " +"können Sie den Vergleich der Dateien oder Ordner starten. " + +#: kompare_shell.cpp:439 msgid "Text View" msgstr "Text-Ansicht" @@ -570,18 +270,231 @@ msgstr "Unbekannt" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Hier können Sie die Dateien angeben, die verglichen werden sollen." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&Alles speichern" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "D&iff speichern ..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Quelle mit Ziel austauschen" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Statistik anzeigen" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Die URL %1 kann nicht heruntergeladen werden." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Die URL %1 existiert nicht auf Ihrem System." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff-Optionen" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch-Dateien" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Diff speichern" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Die Datei existiert bereits oder ist schreibgeschützt. Möchten Sie die Datei " +"überschreiben?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Datei existiert" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Überschreiben" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nicht überschreiben" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Diff läuft ..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Ausgabe von Diff wird analysiert ..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Vergleiche Datei %1 mit Datei %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Dateien in %1 mit Dateien in %2 vergleichen" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Ausgabe von Diff für %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Ausgabe von Diff für %1 wird in Datei %2 eingefügt" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Ausgabe von Diff für %1 wird in Ordner %2 eingefügt" + +#: 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 "" +"Sie haben die Zieldatei geändert.\n" +"Möchten Sie die Änderungen speichern?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Änderungen speichern?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Vereinheitlichtes Kontext-Format (unified)" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Mit Kontextzeilen" + +#: 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 "Ed-Skript" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Leider ist keine Statistik verfügbar, da es keine Diff-Datei gibt oder keine " +"Diff-Datei aus zwei Dateien erzeugt worden ist." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-Statistik" + +#: 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 "" +"Statistik:\n" +"\n" +"Alte Datei: %1\n" +"Neue Datei: %2\n" +"\n" +"Format: %3\n" +"Anzahl Gruppen (hunks): %4\n" +"Anzahl Abweichungen: %5" + +#: 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 "" +"Statistik:\n" +"\n" +"Anzahl Dateien in Diff-Datei: %1\n" +"Format: %2\n" +"\n" +"Aktuelle alte Datei: %3\n" +"Aktuelle neue Datei: %4\n" +"\n" +"Anzahl Gruppen (hunks): %5\n" +"Anzahl Abweichungen: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Persönliche Einstellungen" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Text-Ansicht" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Anzeige-Einstellungen" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff-Optionen" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Dateien" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Hier können Sie die Dateien angeben, die verglichen werden sollen." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Hier können Sie die Einstellungen für den Dateivergleich ändern." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Erscheinungsbild" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "hier können Sie die Einstellungen für die Ansicht einstellen." @@ -596,9 +509,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Sie können hier ein anderes diff-Programm auswählen. Unter Solaris unterstützt " -"das vorinstallierte diff nicht alle Optionen der GNU-Version von diff. Hierüber " -"können Sie diese Version auswählen." +"Sie können hier ein anderes diff-Programm auswählen. Unter Solaris " +"unterstützt das vorinstallierte diff nicht alle Optionen der GNU-Version von " +"diff. Hierüber können Sie diese Version auswählen." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -610,18 +523,24 @@ msgstr "Ausgabeformat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Wählen Sie das Ausgabeformat von diff. Das am häufigsten verwendete ist das " -"Format \"unified\" da es sehr übersichtlich ist. Die TDE-Entwickler bevorzugen " -"dieses Format. Verwenden Sie also am besten für Patches dieses Format." +"Format \"unified\" da es sehr übersichtlich ist. Die TDE-Entwickler " +"bevorzugen dieses Format. Verwenden Sie also am besten für Patches dieses " +"Format." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Kontextzeilen" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Anzahl:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -629,8 +548,8 @@ msgid "" "unnecessarily." msgstr "" "Die Anzahl der Kontextzeilen ist normalerweise 2 oder 3. Hierdurch wird die " -"Ausgabe lesbarer und kann in vielen Fälle leichter eingespielt werden. Mehr als " -"drei Zeilen blähen die diff-Ausgabe unnötig auf." +"Ausgabe lesbarer und kann in vielen Fälle leichter eingespielt werden. Mehr " +"als drei Zeilen blähen die diff-Ausgabe unnötig auf." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -746,19 +665,19 @@ msgstr "Dateimuster für Ausschluss" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Ist die Einstellung markiert, können Sie ein Dateimuster im Eingabefeld rechts " -"eingeben oder Einträge aus der Liste auswählen." +"Ist die Einstellung markiert, können Sie ein Dateimuster im Eingabefeld " +"rechts eingeben oder Einträge aus der Liste auswählen." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Hier können Sie ein Dateimuster eingeben oder löschen oder einen oder mehrere " -"Einträge aus der Liste auswählen." +"Hier können Sie ein Dateimuster eingeben oder löschen oder einen oder " +"mehrere Einträge aus der Liste auswählen." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -773,16 +692,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Hier können Sie die URL einer Datei mit Dateimustern eingeben, die beim " "Vergleich der Ordner ignoriert werden sollen." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Jeder Datei, die Sie im Dialog auswählen, der erscheint, wenn Sie darauf " "klicken, wird im Dialog links vom Knopf eingefügt." @@ -851,169 +770,278 @@ msgstr "Schriftart:" msgid "Size:" msgstr "Größe:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Persönliche Einstellungen" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Schriftart:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Anzeige-Einstellungen" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Abweichung &annehmen" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff-Optionen" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Annahme rückgängig" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&Alles speichern" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "A&lle annehmen" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "D&iff speichern ..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Alle Änderungen &zurücknehmen" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Quelle mit Ziel austauschen" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Statistik anzeigen" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Die URL %1 kann nicht heruntergeladen werden." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Die URL %1 existiert nicht auf Ihrem System." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Vo&rige Datei" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff-Optionen" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Nächst&e Datei" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch-Dateien" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Vorige Abweichung" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Diff speichern" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Nächste Ab&weichung" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Die Datei existiert bereits oder ist schreibgeschützt. Möchten Sie die Datei " -"überschreiben?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Datei existiert" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Überschreiben" +"Keine Modelle oder keine Unterschiede vorhanden. Die Datei %1 ist " +"keine gültige diff-Datei." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nicht überschreiben" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Es sind Probleme beim Einfügen des diff %1 in die Datei %2 " +"aufgetreten." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Es sind Probleme beim Einfügen des diff %1 in den Ordner %2 aufgetreten." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Diff läuft ..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Eine temporäre Datei kann nicht geöffnet werden." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Ausgabe von Diff wird analysiert ..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"In die temporäre Datei %1 kann nicht geschrieben werden. Sie wird " +"gelöscht." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Vergleiche Datei %1 mit Datei %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Der Zielordner %1 kann nicht angelegt werden.\n" +"Die Datei wurde nicht gespeichert." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Dateien in %1 mit Dateien in %2 vergleichen" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Die temporäre Datei kann nicht nach %1 hochgeladen werden. Die " +"temporäre Datei ist noch verfügbar unter %2. Sie können diese Datei " +"manuell an die richtige Stelle kopieren." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Ausgabe von Diff für %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Diff-Ausgabe lässt sich nicht einlesen." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Ausgabe von Diff für %1 wird in Datei %2 eingefügt" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Die Dateien sind identisch." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Ausgabe von Diff für %1 wird in Ordner %2 eingefügt" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Eine temporäre Datei kann nicht gespeichert werden." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Sie haben die Zieldatei geändert.\n" -"Möchten Sie die Änderungen speichern?" +"Ein Programm zur Darstellung der Unterschiede zwischen Dateien und zur " +"wahlweisen Erstellung von \"Diff\"-Dateien." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Änderungen speichern?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Die URL1 wird mit URL2 verglichen" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Leider ist keine Statistik verfügbar, da es keine Diff-Datei gibt oder keine " -"Diff-Datei aus zwei Dateien erzeugt worden ist." +"Hiermit wird die URL1 geöffnet und als Ausgabe von diff betrachtet. URL1 " +"kann auch den Wert '-' haben, wenn aus der Standardeingabe gelesen werden " +"soll. Dies kann zum Beispiel für cvs diff | kompare -o genutzt werden. " +"Kompare prüft dann, ob die ursprüngliche(n) Datei(en) auffindbar sind und " +"blendet diese bei der Anzeige in die Ausgabe von diff ein. Der Schalter -n " +"schaltet diese Prüfung aus." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-Statistik" +#: 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 "" +"Die URL2 wird in URL1 eingefügt. Dabei wird URL2 als Ausgabe von diff " +"betrachtet und URL1 als Datei oder Ordner, in den die Ausgabe von diff " +"eingefügt werden soll. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistik:\n" -"\n" -"Alte Datei: %1\n" -"Neue Datei: %2\n" -"\n" -"Format: %3\n" -"Anzahl Gruppen (hunks): %4\n" -"Anzahl Abweichungen: %5" +"Schaltet bei Verwendung von '-' als URL in Verbindung mit dem Schalter -o " +"die Prüfung für das automatische Suchen nach der ursprünglichen Datei aus." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Setzen Sie hier die Kodierung beim Aufruf von der Befehlszeile. Fehlt diese " +"Angabe wird die lokale Kodierung verwendet." + +#: 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 und Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Schöpfer des Kompare-Symbols" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Eine Menge guter Ratschläge" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia Diff-Anzeige" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Diese Dateien oder Ordner vergleichen" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Dateien" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Abweichung" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Anzeige-Einstellungen" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Diff starten in" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Befehl" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- quelle ziel" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Diff-O&ptionen" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Nach kleineren Änderungen suchen" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Für große Dateien optimieren" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Änderungen der Groß/Kleinschreibung ignorieren" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Tabulatoren in Leerzeichen umwandeln" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Neue oder entfernte Leerzeilen ignorieren" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Leerzeichen-Änderungen ignorieren" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Funktionsnamen anzeigen" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Unterordner einbeziehen" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Neue Dateien als leer betrachten" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Nebeneinander" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistik:\n" -"\n" -"Anzahl Dateien in Diff-Datei: %1\n" -"Format: %2\n" -"\n" -"Aktuelle alte Datei: %3\n" -"Aktuelle neue Datei: %4\n" -"\n" -"Anzahl Gruppen (hunks): %5\n" -"Anzahl Abweichungen: %6" diff --git a/tde-i18n-el/messages/tdesdk/kompare.po b/tde-i18n-el/messages/tdesdk/kompare.po index 89fc885b1dc..eb98cd77282 100644 --- a/tde-i18n-el/messages/tdesdk/kompare.po +++ b/tde-i18n-el/messages/tdesdk/kompare.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "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: 2007-03-14 13:08+0200\n" "Last-Translator: Spiros Georgaras \n" "Language-Team: Greek \n" @@ -19,336 +19,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Εφαρμογή διαφοράς" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Αν&αίρεση εφαρμογής διαφοράς" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ε&φαρμογή όλων" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Α&ναίρεση εφαρμογής όλων" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Π&ροηγούμενο αρχείο" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Ε&πόμενο αρχείο" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Πρ&οηγούμενη διαφορά" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Επό&μενη διαφορά" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Χωρίς μοντέλα ή χωρίς διαφορές, το αρχείο: %1" -", δεν είναι ένα έγκυρο αρχείο διαφορών." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Υπήρξαν προβλήματα εφαρμογής του diff %1 στο αρχείο %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Υπήρξαν προβλήματα εφαρμογής του diff %1 στο φάκελο %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Αδύνατο το άνοιγμα ενός προσωρινού αρχείου." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Αδύνατη η εγγραφή στο προσωρινό αρχείο %1, το διαγράφω." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Αδύνατη η δημιουργία του καταλόγου προορισμού %1.\n" -"Το αρχείο δεν αποθηκεύτηκε." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Αδυναμία αποστολής του προσωρινού αρχείου στην τοποθεσία προορισμού " -"%1. Το προσωρινό αρχείο είναι ακόμη διαθέσιμο κάτω από το: %2" -". Μπορείτε να το αντιγράψετε χειροκίνητα στη σωστή θέση." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Δεν ήταν δυνατή η επεξεργασία της εξόδου του diff." - -#: 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 "Εκτέλεση diff στο" - -#. 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 "cd dir && diff -udHprNa -- πηγή προορισμός" - -#. 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 "Ed" - -#. 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 "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 "" -"Ένα πρόγραμμα για την προβολή των διαφορών μεταξύ αρχείων και προαιρετικά τη " -"δημιουργία diff (αρχείου διαφορών)" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Αυτό θα συγκρίνει το URL1 με το URL2" - -#: 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 "" -"Αυτό θα ανοίξει το URL1 και θα αναμένει την έξοδο διαφορών. Το URL1 μπορεί " -"επίσης να είναι ένα '-' που σημαίνει ότι θα διαβάσει από την κανονική είσοδο. " -"Μπορεί να χρησιμοποιηθεί για παράδειγμα ως diff cvs | kompare -o -. Το Kompare " -"θα κάνει έναν έλεγχο αν μπορεί να εντοπίσει τα αρχικά αρχεία και έπειτα θα " -"αναμείξει τα αρχικά αρχεία με την έξοδο διαφορών και θα την εμφανίσει στην " -"προβολή. Το -n απενεργοποιεί αυτόν τον έλεγχο." - -#: 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 "" -"Αυτό θα αναμείξει το URL2 μέσα στο URL1, Το URL2 αναμένεται ως έξοδο διαφορών " -"και το URL1 ως αρχείο ή φάκελο στον οποίο θα αναμειχθεί η έξοδος διαφορών. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Απενεργοποιεί τον έλεγχο αυτόματης εύρεσης του αρχικού αρχείου(ων) κατά τη " -"χρήση του '-' ως URL με την επιλογή -o." - -#: 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 και Otto Bruggeman " - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Συγγραφέας" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Καλλιτέχνης εικονιδίων Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Πολλές καλές συμβουλές" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Προβολέας diff του Cervisia" - -#: 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 "" -"Αν έχετε δώσει 2 ονόματα αρχείων ή 2 φακέλους στα πεδία αυτού του διαλόγου, " -"τότε αυτό το κουμπί θα ενεργοποιηθεί και πατώντας το θα ξεκινήσει η σύγκριση " -"αυτών των αρχείων ή φακέλων. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Στέργιος Δράμης,Ανδρέας Βλάχος,Τούσης Μανώλης" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -455,25 +132,52 @@ msgstr "Ανάμειξη αυτού του αρχείου ή φακέλου με #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Αν εισάγατε ένα αρχείο ή όνομα φακέλου και ένα αρχείο που περιέχει έξοδο " -"διαφορών στα πεδία σε αυτόν το διάλογο τότε αυτό το κουμπί θα ενεργοποιηθεί και " -"πατώντας το θα ανοίξει η κύρια προβολή του kompare όπου η έξοδος των αρχείων " -"που έγινε εισαγωγή από τον φάκελο έχει αναμειχθεί με την έξοδο διαφορών έτσι " -"ώστε να μπορείτε έπειτα να εφαρμόσετε τις διαφορές σε κάποιο αρχείο ή αρχεία. " +"διαφορών στα πεδία σε αυτόν το διάλογο τότε αυτό το κουμπί θα ενεργοποιηθεί " +"και πατώντας το θα ανοίξει η κύρια προβολή του kompare όπου η έξοδος των " +"αρχείων που έγινε εισαγωγή από τον φάκελο έχει αναμειχθεί με την έξοδο " +"διαφορών έτσι ώστε να μπορείτε έπειτα να εφαρμόσετε τις διαφορές σε κάποιο " +"αρχείο ή αρχεία. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Σύγκριση αυτών των αρχείων ή φακέλων" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Σύγκριση αρχείων ή φακέλων" -#: kompare_shell.cpp:439 -msgid "Text View" -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 "Σύγκριση" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Σύγκριση αυτών των αρχείων ή φακέλων" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"Αν έχετε δώσει 2 ονόματα αρχείων ή 2 φακέλους στα πεδία αυτού του διαλόγου, " +"τότε αυτό το κουμπί θα ενεργοποιηθεί και πατώντας το θα ξεκινήσει η σύγκριση " +"αυτών των αρχείων ή φακέλων. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Προβολή κειμένου" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -566,18 +270,230 @@ msgstr "Άγνωστο" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Εδώ μπορείτε να εισάγετε τα αρχεία του θέλετε να συγκρίνετε." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Αποθήκευση ό&λων" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Αποθήκευση .&diff..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "Το URL %1 είναι αδύνατο να ανακτηθεί." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Το URL %1 δεν υπάρχει στο σύστημά σας." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Επιλογές diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Αρχεία patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Αποθήκευση .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 "Το αρχείο υπάρχει" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Εκτέλεση diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Ανάλυση εξόδου diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Σύγκριση αρχείου %1 με αρχείο %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Σύγκριση αρχείων στο %1 με τα αρχεία στο %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Εμφάνιση εξόδου diff από %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Ανάμειξη εξόδου diff από %1 στο αρχείο %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Ανάμειξη εξόδου diff από %1 στο φάκελο %2" + +#: 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 "" +"Κάνατε αλλαγές στο αρχείο(α) προορισμού.\n" +"Θέλετε να τις αποθηκεύσετε;" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Δεν υπάρχει αρχείο diff ή δεν έχει γίνει diff 2 αρχείων. Έτσι δεν υπάρχουν " +"διαθέσιμα στατιστικά." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Στατιστικά diff" + +#: 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 "" +"Στατιστικά:\n" +"\n" +"Παλιό αρχείο: %1\n" +"Νέο αρχείο: %2\n" +"\n" +"Μορφή: %3\n" +"Αριθμός hunks: %4\n" +"Αριθμός διαφορών: %5" + +#: 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 "" +"Στατιστικά:\n" +"\n" +"Αριθμός αρχείων στο αρχείο diff: %1\n" +"Μορφή: %2\n" +"\n" +"Τρέχον παλιό αρχείο: %3\n" +"Τρέχον νέο αρχείο: %4\n" +"\n" +"Αριθμός hunks: %5\n" +"Αριθμός διαφορών: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Προβολή κειμένου" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Ρυθμίσεις προβολής" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Ρυθμίσεις diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Αρχεία" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Εδώ μπορείτε να εισάγετε τα αρχεία του θέλετε να συγκρίνετε." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Εδώ μπορείτε να αλλάξετε τις επιλογές για τη σύγκριση των αρχείων." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Εμ&φάνιση" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Εδώ μπορείτε να αλλάξετε τις επιλογές της προβολής." @@ -592,9 +508,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Μπορείτε να επιλέξετε εδώ ένα διαφορετικό πρόγραμμα diff. Στο Solaris ή τυπική " -"έκδοση diff δεν υποστηρίζει όλες τις επιλογές που υποστηρίζει η έκδοση GNU. Με " -"αυτήν τη λειτουργία μπορείτε να επιλέξετε αυτή την έκδοση." +"Μπορείτε να επιλέξετε εδώ ένα διαφορετικό πρόγραμμα diff. Στο Solaris ή " +"τυπική έκδοση diff δεν υποστηρίζει όλες τις επιλογές που υποστηρίζει η " +"έκδοση GNU. Με αυτήν τη λειτουργία μπορείτε να επιλέξετε αυτή την έκδοση." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -606,19 +522,24 @@ msgstr "Μορφή εξόδου" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Επιλέξτε τη μορφή της εξόδου του diff. Η ενοποιημένη είναι αυτή που " -"χρησιμοποιείται πιο συχνά επειδή είναι πολύ ευανάγνωστη. Οι προγραμματιστές TDE " -"προτιμούν αυτήν τη μορφή, οπότε χρησιμοποιήστε την για την αποστολή " +"χρησιμοποιείται πιο συχνά επειδή είναι πολύ ευανάγνωστη. Οι προγραμματιστές " +"TDE προτιμούν αυτήν τη μορφή, οπότε χρησιμοποιήστε την για την αποστολή " "επιδιορθώσεων." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Σχετιζόμενες γραμμές" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Αριθμός σχετιζόμενων γραμμών:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -743,19 +664,19 @@ msgstr "Μοτίβο αρχείου για εξαίρεση" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Αν αυτό ενεργοποιηθεί μπορείτε να εισάγετε ένα μοτίβο κελύφους στο πλαίσιο " "κειμένου στα δεξιά ή να επιλέξετε καταχωρήσεις από τη λίστα." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Εδώ μπορείτε να εισάγετε ή να αφαιρέσετε ένα μοτίβο κελύφους ή να επιλέξετε ένα " -"ή περισσότερες καταχωρήσεις από τη λίστα." +"Εδώ μπορείτε να εισάγετε ή να αφαιρέσετε ένα μοτίβο κελύφους ή να επιλέξετε " +"ένα ή περισσότερες καταχωρήσεις από τη λίστα." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -770,19 +691,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Εδώ μπορείτε να εισάγετε μια URL ενός αρχείου με μοτίβα κελύφους για παράβλεψη " -"κατά τη σύγκριση των φακέλων." +"Εδώ μπορείτε να εισάγετε μια URL ενός αρχείου με μοτίβα κελύφους για " +"παράβλεψη κατά τη σύγκριση των φακέλων." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Κάθε αρχείο που επιλέγετε στο διάλογο που εμφανίζεται όταν κάνετε κλικ σε αυτό " -"θα τοποθετηθεί στο διάλογο στα αριστερά αυτού του κουμπιού." +"Κάθε αρχείο που επιλέγετε στο διάλογο που εμφανίζεται όταν κάνετε κλικ σε " +"αυτό θα τοποθετηθεί στο διάλογο στα αριστερά αυτού του κουμπιού." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -848,168 +769,278 @@ msgstr "Γραμματοσειρά:" msgid "Size:" msgstr "Μέγεθος:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Προτιμήσεις" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Γραμματοσειρά:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Ρυθμίσεις προβολής" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Εφαρμογή διαφοράς" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Ρυθμίσεις diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Αν&αίρεση εφαρμογής διαφοράς" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Αποθήκευση ό&λων" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ε&φαρμογή όλων" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Αποθήκευση .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +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 "The URL %1 cannot be downloaded." -msgstr "Το URL %1 είναι αδύνατο να ανακτηθεί." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Το URL %1 δεν υπάρχει στο σύστημά σας." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Π&ροηγούμενο αρχείο" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Επιλογές diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Ε&πόμενο αρχείο" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Αρχεία patch" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Πρ&οηγούμενη διαφορά" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Αποθήκευση .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Επό&μενη διαφορά" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Το αρχείο υπάρχει ή έχει προστασία εγγραφής. Θέλετε να το αντικαταστήσετε;" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Το αρχείο υπάρχει" +"Χωρίς μοντέλα ή χωρίς διαφορές, το αρχείο: %1, δεν είναι ένα " +"έγκυρο αρχείο διαφορών." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Αντικατάσταση" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Να μη γίνει αντικατάσταση" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Υπήρξαν προβλήματα εφαρμογής του diff %1 στο αρχείο %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Υπήρξαν προβλήματα εφαρμογής του diff %1 στο φάκελο %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Εκτέλεση diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Αδύνατο το άνοιγμα ενός προσωρινού αρχείου." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Ανάλυση εξόδου diff..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Αδύνατη η εγγραφή στο προσωρινό αρχείο %1, το διαγράφω." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Σύγκριση αρχείου %1 με αρχείο %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Αδύνατη η δημιουργία του καταλόγου προορισμού %1.\n" +"Το αρχείο δεν αποθηκεύτηκε." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Σύγκριση αρχείων στο %1 με τα αρχεία στο %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Αδυναμία αποστολής του προσωρινού αρχείου στην τοποθεσία προορισμού " +"%1. Το προσωρινό αρχείο είναι ακόμη διαθέσιμο κάτω από το: %2. " +"Μπορείτε να το αντιγράψετε χειροκίνητα στη σωστή θέση." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Εμφάνιση εξόδου diff από %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Δεν ήταν δυνατή η επεξεργασία της εξόδου του diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Ανάμειξη εξόδου diff από %1 στο αρχείο %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Τα αρχεία είναι όμοια." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Ανάμειξη εξόδου diff από %1 στο φάκελο %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Αδύνατο η εγγραφή στο προσωρινό αρχείο." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Κάνατε αλλαγές στο αρχείο(α) προορισμού.\n" -"Θέλετε να τις αποθηκεύσετε;" +"Ένα πρόγραμμα για την προβολή των διαφορών μεταξύ αρχείων και προαιρετικά τη " +"δημιουργία diff (αρχείου διαφορών)" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Αποθήκευση αλλαγών;" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Αυτό θα συγκρίνει το URL1 με το URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Δεν υπάρχει αρχείο diff ή δεν έχει γίνει diff 2 αρχείων. Έτσι δεν υπάρχουν " -"διαθέσιμα στατιστικά." +"Αυτό θα ανοίξει το URL1 και θα αναμένει την έξοδο διαφορών. Το URL1 μπορεί " +"επίσης να είναι ένα '-' που σημαίνει ότι θα διαβάσει από την κανονική " +"είσοδο. Μπορεί να χρησιμοποιηθεί για παράδειγμα ως diff cvs | kompare -o -. " +"Το Kompare θα κάνει έναν έλεγχο αν μπορεί να εντοπίσει τα αρχικά αρχεία και " +"έπειτα θα αναμείξει τα αρχικά αρχεία με την έξοδο διαφορών και θα την " +"εμφανίσει στην προβολή. Το -n απενεργοποιεί αυτόν τον έλεγχο." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Στατιστικά diff" +#: 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 "" +"Αυτό θα αναμείξει το URL2 μέσα στο URL1, Το URL2 αναμένεται ως έξοδο " +"διαφορών και το URL1 ως αρχείο ή φάκελο στον οποίο θα αναμειχθεί η έξοδος " +"διαφορών. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Στατιστικά:\n" -"\n" -"Παλιό αρχείο: %1\n" -"Νέο αρχείο: %2\n" -"\n" -"Μορφή: %3\n" -"Αριθμός hunks: %4\n" -"Αριθμός διαφορών: %5" +"Απενεργοποιεί τον έλεγχο αυτόματης εύρεσης του αρχικού αρχείου(ων) κατά τη " +"χρήση του '-' ως URL με την επιλογή -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 και Otto Bruggeman " + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Συγγραφέας" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Καλλιτέχνης εικονιδίων Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Πολλές καλές συμβουλές" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Προβολέας diff του Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Σύγκριση αυτών των αρχείων ή φακέλων" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Αρχεία" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Διαφορά" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Ρυθμίσεις προβολής" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Εκτέλεση diff στο" + +#: 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 "cd dir && diff -udHprNa -- πηγή προορισμός" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Στατιστικά:\n" -"\n" -"Αριθμός αρχείων στο αρχείο diff: %1\n" -"Μορφή: %2\n" -"\n" -"Τρέχον παλιό αρχείο: %3\n" -"Τρέχον νέο αρχείο: %4\n" -"\n" -"Αριθμός hunks: %5\n" -"Αριθμός διαφορών: %6" diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po index ca75936eb70..0ef1a687862 100644 --- a/tde-i18n-en_GB/messages/tdesdk/kompare.po +++ b/tde-i18n-en_GB/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2014-09-29 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2005-11-07 01:06+0000\n" "Last-Translator: Malcolm Hunter \n" "Language-Team: British English \n" @@ -17,333 +17,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Apply Difference" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Un&apply Difference" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "App&ly All" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Unapply All" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "P&revious File" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "N&ext File" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Previous Difference" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Next Difference" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"No models or no differences, this file: %1" -", is not a valid diff file." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"There were problems applying the diff %1 to the file %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"There were problems applying the diff %1 to the folder %2" -"." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Could not open a temporary file." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Could not write to the temporary file %1, deleting it." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Could not create destination directory %1.\n" -"The file has not been saved." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Could not parse diff output." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "The files are identical." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Could not write to the temporary file." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Difference" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Run Diff In" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Command Line" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- source destination" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Look for smaller changes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimise for large files" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignore changes in case" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expand tabs to spaces" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignore added or removed empty lines" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignore changes in whitespace" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Show function names" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Compare folders recursively" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Treat new files as empty" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Context" - -#. 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 "`Ed" - -#. 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 "Normal" - -#. 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 "Unified" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Side-by-side" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Number of context lines:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"A program to view the differences between files and optionally generate a diff" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "This will compare URL1 with URL2" - -#: main.cpp:40 -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." -msgstr "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." - -#: main.cpp:41 -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " -msgstr "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Author" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare icon artist" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "A lot of good advice" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff viewer" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Compare Files or Folders" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Source" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destination" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Compare" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Compare these files or folder" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" -"If you have entered 2 filenames or 2 folders in the fields in this dialogue " -"then this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "John Knight" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -449,25 +129,51 @@ msgstr "Blend this file or folder with the diff output" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialogue then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialogue then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Compare Files or Folders" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Source" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destination" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Compare" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Compare these files or folders" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Text View" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"If you have entered 2 filenames or 2 folders in the fields in this dialogue " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Text View" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -560,18 +266,229 @@ msgstr "Unknown" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Save &All" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Save .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Swap Source with Destination" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Show Statistics" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "The URL %1 cannot be downloaded." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "The URL %1 does not exist on your system." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff Options" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch Files" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Save .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "The file exists or is write-protected; do you want to overwrite it?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "File Exists" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Overwrite" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Do Not Overwrite" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Running diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Parsing diff output..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Comparing file %1 with file %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Comparing files in %1 with files in %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Viewing diff output from %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Blending diff output from %1 into file %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Blending diff output from %1 into folder %2" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Save Changes?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unified" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Context" + +#: 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 "`Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff Statistics" + +#: komparepart/kompare_part.cpp:673 +msgid "" +"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 "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" + +#: 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 "" +"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" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferences" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Text View" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "View Settings" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff Settings" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Files" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Here you can enter the files you want to compare." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Here you can change the options for comparing the files." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "A&ppearance" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Here you can change the options for the view." @@ -600,18 +517,23 @@ msgstr "Output Format" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Lines of Context" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Number of context lines:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -736,19 +658,19 @@ msgstr "File Pattern to Exclude" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"If this is ticked you can enter a shell pattern in the text box on the right or " -"select entries from the list." +"If this is ticked you can enter a shell pattern in the text box on the right " +"or select entries from the list." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -762,19 +684,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Any file you select in the dialogue that pops up when you click it will be put " -"in the dialogue to the left of this button." +"Any file you select in the dialogue that pops up when you click it will be " +"put in the dialogue to the left of this button." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -840,166 +762,274 @@ msgstr "Font:" msgid "Size:" msgstr "Size:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferences" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "View Settings" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff Settings" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Save &All" - -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Save .&diff..." - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Swap Source with Destination" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Font:" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Show Statistics" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Apply Difference" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "The URL %1 cannot be downloaded." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Un&apply Difference" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "The URL %1 does not exist on your system." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "App&ly All" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff Options" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Unapply All" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "P&revious File" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Save .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "N&ext File" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Previous Difference" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "File Exists" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Next Difference" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Overwrite" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"No models or no differences, this file: %1, is not a valid diff " +"file." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"There were problems applying the diff %1 to the file %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"There were problems applying the diff %1 to the folder %2." +"" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Running diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Could not open a temporary file." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Could not write to the temporary file %1, deleting it." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Comparing file %1 with file %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Could not create destination directory %1.\n" +"The file has not been saved." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Comparing files in %1 with files in %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Viewing diff output from %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Could not parse diff output." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Blending diff output from %1 into file %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "The files are identical." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Blending diff output from %1 into folder %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Could not write to the temporary file." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Save Changes?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "This will compare URL1 with URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff Statistics" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Author" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare icon artist" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "A lot of good advice" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff viewer" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Compare these files or folder" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Files" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Difference" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "View Settings" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Run Diff In" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Command Line" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&ptions" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Look for smaller changes" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimise for large files" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignore changes in case" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expand tabs to spaces" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignore added or removed empty lines" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignore changes in whitespace" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Show function names" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Compare folders recursively" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Treat new files as empty" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Side-by-side" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" diff --git a/tde-i18n-es/messages/tdesdk/kompare.po b/tde-i18n-es/messages/tdesdk/kompare.po index 2e2691b1f0e..644f64fae3d 100644 --- a/tde-i18n-es/messages/tdesdk/kompare.po +++ b/tde-i18n-es/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "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: 2007-08-16 16:26+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -17,336 +17,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplicar la diferencia" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Desh&acer diferencia" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&licar todo" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Ignorar todo" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "A&rchivo anterior" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Sigui&ente archivo" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Anterior di&ferencia" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Siguie&nte diferencia" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"No hay modelos o diferencias, este archivo: %1" -", no es un archivo diff válido." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Se produjeron problemas aplicando el diff %1 al archivo %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Se produjeron problemas aplicando el diff %1 a la carpeta%2" -"." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "No se pudo abrir un archivo temporal." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Imposible escribir en el archivo temporal %1, borrandolo." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Imposible crear carpeta de destino%1.\n" -"El archivo no ha sido guardado." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Imposible cargar el archivo temporal a la ubicación de destino. %1" -". El archivo temporal está todavía disponible en: %2" -". Puede copiarlo manualmente al lugar correcto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "No pude analizar la salida de diff" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Los archivos son idénticos" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "No se pudo escribir al archivo temporal." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Diferencia" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Ejecutar «diff» en" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Línea de órdenes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- origen destino" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Buscar cambios menores" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizar para archivos grandes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorar cambios de mayúsculas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expandir tabuladores a espacios" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorar lineas vacías añadidas o eliminadas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorar cambios en espacios en blanco" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostrar nombres de las funciones" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Comparar carpetas recursivamente" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratar archivos nuevos como vacíos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formato" - -#. 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 "Contexto" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unificado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Cara-por-cara" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Número de líneas de contexto" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Un programa para ver las diferencias entre archivos y opcionalmente generar un " -"diff" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Esto realizará una comparación entre la URL1 y la URL2" - -#: 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 "" -"Esto abrirá la URL1 y esperará ser la salida de diff. URL1 también puede ser un " -"«-» y entonces leerá de la entrada estandar. Puede ser usado para órdenes cvs " -"diff | kompare -o-. Kompare comprobará si puede encontrar el archivo(s) " -"original(es) y entonces fusionar el/los archivo(s) original(es) en la salida de " -"diff y mostrarlos en el visor. -n desactiva la comprobación." - -#: 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 "" -"Esto fusionará URL2 con URL1, URL2 deberá ser una salida diff y URL1 el archivo " -"o carpeta en la cual será fusionada la salida diff" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Desactiva la comprobación para buscar automáticamente el/los archivo(s) " -"original(es) cuando se use «-» como URL con la opción -o" - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" -"Use esto para especificar la codificación cuando lo llame desde la línea de " -"órdenes. Por omisión utilizará la codificación local." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, John Firebaugh y Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Arte de íconos Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Un montón de buenos consejos" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visor diff de Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Comparar archivos o carpetas" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Origen" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destino" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Comparar" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Comparar estos archivos o carpetas" - -#: 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 "" -"Si ha introducido 2 nombres de archivos o 2 carpetas en los campos de este " -"diálogo, se habilitará este botón. Si lo pulsa, comenzará a realizarse una " -"comparación entre los archivos o carpetas introducidos." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Pablo de Vicente" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,27 +129,54 @@ msgstr "Fusionar este archivo o carpeta con la salida diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Si ha introducido un nombre de archivo o carpeta y un archivo que contenga una " -"salida diff en los campos de este diálogo, entonces se activará este botón y " -"presionándolo se abrirá la vista principal de kompare en donde la salida del " -"archivo o archivos introducidos desde la carpeta serán mezclados con la salida " -"diff, así podrá aplica la(s) diferencia(s) a un archivo o a los archivos." +"Si ha introducido un nombre de archivo o carpeta y un archivo que contenga " +"una salida diff en los campos de este diálogo, entonces se activará este " +"botón y presionándolo se abrirá la vista principal de kompare en donde la " +"salida del archivo o archivos introducidos desde la carpeta serán mezclados " +"con la salida diff, así podrá aplica la(s) diferencia(s) a un archivo o a " +"los archivos." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Comparar estos archivos o carpetas" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Comparar archivos o carpetas" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Vista de texto" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Origen" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destino" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Comparar" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Comparar estos archivos o carpetas" + +#: 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 "" +"Si ha introducido 2 nombres de archivos o 2 carpetas en los campos de este " +"diálogo, se habilitará este botón. Si lo pulsa, comenzará a realizarse una " +"comparación entre los archivos o carpetas introducidos." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Vista de texto" + +#: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" msgstr "Carpeta de origen" @@ -563,18 +267,231 @@ msgstr "Desconocido" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Aquí usted puede ingresar los archivos que desea comparar" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Guardar &Todo" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Guardar .&diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Intercambiar origen y destino" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostrar estadísticas" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "La URL %1 no se pudo descargar." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "La URL %1 no existe en su sistema." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opciones de diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Archivos de parche" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Guardar diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"El archivo existe o se encuentra protegido contra escritura; desea " +"sobrescribirlo?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "El archivo ya existe" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sobrescribir" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "No sobrescribir" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Corriendo diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Analizando salida diff...." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Comparando archivo %1 con archivo %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Comparando archivos en %1 con archivos en %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Viendo salida de diff de %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Fusionando salida diff de %1 en el archivo %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Fusionando salida diff de %1 en la carpeta %2" + +#: 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 "" +"Has hecho cambios a el/los archivo(s) de destino.\n" +"¿Quiere guardarlo(s)?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "¿Guardar cambios?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificado" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contexto" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Lo siento, no hay archivo diff o no se han comparado 2 archivos, así que no " +"hay estadísticas disponibles" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Estadísticas de diff" + +#: 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 "" +"Estadísticas:\n" +"\n" +"Archivo antiguo : %1\n" +"Nuevo archivo : %2\n" +"\n" +"Formato : %3\n" +"Número de bloques : %4\n" +"Número de diferencias : %5" + +#: 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 "" +"Estadísticas:\n" +"\n" +"Número de archivos en el archivo diff: %1\n" +"Formato : %2\n" +"\n" +"Archivo antiguo actual: %3\n" +"Archivo nuevo actual : %4\n" +"\n" +"Número de bloques : %5\n" +"Número de diferencias : %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferencias" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Vista de texto" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Preferencias de la vista" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Preferencias de «diff»" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Archivos" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Aquí usted puede ingresar los archivos que desea comparar" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Aquí usted puede cambiar las opciones para la comparación de archivos" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Aparencia" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Aquí usted puede cambiar las opciones de visualización" @@ -590,8 +507,8 @@ msgid "" "you can select that version." msgstr "" "Puede aquí seleccionar un programa diff diferente. En Solares el programa " -"estandar para diff no soporta todas las opciones que la versión GNU posee. De " -"esta forma puede seleccionar esa versión." +"estandar para diff no soporta todas las opciones que la versión GNU posee. " +"De esta forma puede seleccionar esa versión." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -603,19 +520,24 @@ msgstr "Formato de salida" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Seleccione el formato de la salida generada por «diff». Unificada es la " -"utilizada más frecuentemente debido a que es la de más fácil lectura. Es la de " -"mayor agrado para los desarrolladores de TDE, por lo que es recomendable " +"utilizada más frecuentemente debido a que es la de más fácil lectura. Es la " +"de mayor agrado para los desarrolladores de TDE, por lo que es recomendable " "utilizarla para enviar parches." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Líneas de contexto" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Número de líneas de contexto" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -623,8 +545,8 @@ msgid "" "unnecessarily." msgstr "" "El número de líneas de contexto es normalmente de 2 o 3. Esto hace al diff " -"legible y aplicable en la mayoría de los casos. Más de 3 líneas complicará el " -"diff innecesariamente" +"legible y aplicable en la mayoría de los casos. Más de 3 líneas complicará " +"el diff innecesariamente" #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -740,16 +662,16 @@ msgstr "Patron de archivo a excluir" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Si está marcada, podrá introducir un patrón de línea de órdenes en el campo de " -"texto de la derecha, o seleccionar entradas de la lista." +"Si está marcada, podrá introducir un patrón de línea de órdenes en el campo " +"de texto de la derecha, o seleccionar entradas de la lista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Aquí usted puede ingresar o eliminar un patrón para la línea de órdenes o " "seleccionar uno o más de las entradas que aparecen en la lista" @@ -762,21 +684,21 @@ msgstr "Archivo con nombres de archivo a excluir" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Si ésta se encuentra conmutada usted puede ingresar un nombre de archivo en el " -"casillero de la derecha" +"Si ésta se encuentra conmutada usted puede ingresar un nombre de archivo en " +"el casillero de la derecha" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Aquí usted puede introducir el URL de un archivo con patrones de la línea de " "órdenes que serán ignorados durante la comparación de carpetas." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Cualquier archivo que seleccione en el diálogo que aparece al pulsar este " "botón, será colocado a la izquierda del mismo." @@ -845,169 +767,275 @@ msgstr "Tipo de letra:" msgid "Size:" msgstr "Tamaño:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferencias" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Tipo de letra:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Preferencias de la vista" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplicar la diferencia" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Preferencias de «diff»" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Desh&acer diferencia" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Guardar &Todo" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&licar todo" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Guardar .&diff" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Ignorar todo" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Intercambiar origen y destino" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostrar estadísticas" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "La URL %1 no se pudo descargar." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "La URL %1 no existe en su sistema." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "A&rchivo anterior" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opciones de diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Sigui&ente archivo" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Archivos de parche" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Anterior di&ferencia" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Guardar diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Siguie&nte diferencia" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"El archivo existe o se encuentra protegido contra escritura; desea " -"sobrescribirlo?" +"No hay modelos o diferencias, este archivo: %1, no es un archivo " +"diff válido." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "El archivo ya existe" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sobrescribir" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "No sobrescribir" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Se produjeron problemas aplicando el diff %1 al archivo %2." +"" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Se produjeron problemas aplicando el diff %1 a la carpeta%2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Corriendo diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "No se pudo abrir un archivo temporal." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Analizando salida diff...." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Imposible escribir en el archivo temporal %1, borrandolo." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Comparando archivo %1 con archivo %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Imposible crear carpeta de destino%1.\n" +"El archivo no ha sido guardado." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Comparando archivos en %1 con archivos en %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Imposible cargar el archivo temporal a la ubicación de destino. %1. El archivo temporal está todavía disponible en: %2. Puede " +"copiarlo manualmente al lugar correcto." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Viendo salida de diff de %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "No pude analizar la salida de diff" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Fusionando salida diff de %1 en el archivo %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Los archivos son idénticos" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Fusionando salida diff de %1 en la carpeta %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "No se pudo escribir al archivo temporal." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Has hecho cambios a el/los archivo(s) de destino.\n" -"¿Quiere guardarlo(s)?" +"Un programa para ver las diferencias entre archivos y opcionalmente generar " +"un diff" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "¿Guardar cambios?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Esto realizará una comparación entre la URL1 y la URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Lo siento, no hay archivo diff o no se han comparado 2 archivos, así que no hay " -"estadísticas disponibles" +"Esto abrirá la URL1 y esperará ser la salida de diff. URL1 también puede ser " +"un «-» y entonces leerá de la entrada estandar. Puede ser usado para órdenes " +"cvs diff | kompare -o-. Kompare comprobará si puede encontrar el archivo(s) " +"original(es) y entonces fusionar el/los archivo(s) original(es) en la salida " +"de diff y mostrarlos en el visor. -n desactiva la comprobación." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Estadísticas de diff" +#: 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 "" +"Esto fusionará URL2 con URL1, URL2 deberá ser una salida diff y URL1 el " +"archivo o carpeta en la cual será fusionada la salida diff" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estadísticas:\n" -"\n" -"Archivo antiguo : %1\n" -"Nuevo archivo : %2\n" -"\n" -"Formato : %3\n" -"Número de bloques : %4\n" -"Número de diferencias : %5" +"Desactiva la comprobación para buscar automáticamente el/los archivo(s) " +"original(es) cuando se use «-» como URL con la opción -o" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Use esto para especificar la codificación cuando lo llame desde la línea de " +"órdenes. Por omisión utilizará la codificación local." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, John Firebaugh y Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Arte de íconos Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Un montón de buenos consejos" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visor diff de Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Comparar estos archivos o carpetas" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Archivos" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Diferencia" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Preferencias de la vista" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Ejecutar «diff» en" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Línea de órdenes" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- origen destino" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pciones" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Buscar cambios menores" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizar para archivos grandes" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorar cambios de mayúsculas" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expandir tabuladores a espacios" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorar lineas vacías añadidas o eliminadas" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorar cambios en espacios en blanco" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostrar nombres de las funciones" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Comparar carpetas recursivamente" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratar archivos nuevos como vacíos" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formato" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Cara-por-cara" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estadísticas:\n" -"\n" -"Número de archivos en el archivo diff: %1\n" -"Formato : %2\n" -"\n" -"Archivo antiguo actual: %3\n" -"Archivo nuevo actual : %4\n" -"\n" -"Número de bloques : %5\n" -"Número de diferencias : %6" diff --git a/tde-i18n-et/messages/tdesdk/kompare.po b/tde-i18n-et/messages/tdesdk/kompare.po index c58acfa5c63..72a14150665 100644 --- a/tde-i18n-et/messages/tdesdk/kompare.po +++ b/tde-i18n-et/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2007-04-29 14:29+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -16,334 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Rakenda erinevus" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Eemalda erinevus" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "&Rakenda kõik" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Eemalda rakendus kõigilt" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Eelmine fail" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Järgmine fail" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Ee&lmine erinevus" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Jär&gmine erinevus" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ei ole mudelit ega erinevusi, sest fail %1 " -"ei ole mitte korralik diff-fail." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Diff-faili %1 rakendamisel failile %2 tekkis probleeme." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Diff-faili %1 rakendamisel kataloogile %2 " -"tekkis probleeme." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Ajutise faili avamine ei õnnestunud." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Ajutisse faili %1 kirjutamine ei õnnestunud, see kustutatakse." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Sihtkataloogi %1 loomine ebaõnnestus.\n" -"Faili ei salvestatud." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Ajutise faili laadimine sihtkohta %1 ebaõnnestus. Ajutine fail on " -"endiselt kättesaadav (%2). Kui soovid, võid selle käsitsi õigesse kohta " -"kopeerida." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Võrdlemise väljundi parsimine ei õnnestunud." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Failid on identsed." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Ajutisse faili kirjutamine ei õnnestunud." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Erinevus" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "diff käivitatakse kataloogis" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Käsurida" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- lähteasukoht" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Otsitakse väiksemaid muudatusi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimeeritakse suurte failide jaoks" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Tõstutundetu" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Tabeldusmärgid muudetakse tühikuteks" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoreeritakse lisatud või eemaldatud tühje ridu" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoreeritakse muudatusi tühimärkides" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Näidatakse funktsioonide nimesid" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Katalooge võrreldakse rekursiivselt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Uusi faile koheldakse tühjana" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Vorming" - -#. 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 "Kontekst" - -#. 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 "Ed" - -#. 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 "Tavaline" - -#. 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 "Unifitseeritud" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Kõrvuti" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Kontekstiridade arv:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Failidevaheliste erinevuste vaatlemise ja .diff-failide genereerimise rakendus" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Võrdleb URL1 ja URL2" - -#: 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 "" -"See avab URL1 ja eeldab, et tegemist on võrdlemise väljundiga. URL1 võib olla " -"ka '-', millisel juhul loetakse see standardsisendist. Seda võib kasutada " -"näiteks cvs diff | kompare -o- jaoks. Kompare uurib, kas suudab leida " -"originaalfaili(d) ning seejärel liidab originaalfaili(d) võrdlemise väljundiga " -"ja näidab tulemust. Võti -n keelab uurimise." - -#: 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 "" -"See liidab URL2 URL1 sisse, kus eeldatakse, et URL2 on võrdlemise väljund ja " -"URL1 fail või kataloog, millesse võrdlemise väljund tuleb liita. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Keelab uurimise originaalfaili(de) automaatseks leidmiseks, kui URL on antud " -"kujul '-' koos võtmega -o." - -#: 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 "" -"Sellega saab määrata kodeeringu väljakutsumisel käsurealt. Vaikimisi kohalik " -"kodeering, kui ei ole teisiti määratud." - -#: 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 ja Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare ikooni looja" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Palju häid nõuandeid" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff-failide vaatleja" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Failide või kataloogide võrdlemine" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Lähtefail" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Sihtfail" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Võrdle" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Võrdle neid faile või katalooge" - -#: 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 "" -"Kui sisestasid selle dialoogi väljadesse kahe faili või kataloogi nime, siis " -"see nupp aktiveerub ning sellele klõpsates käivitub failide või kataloogide " -"võrdlemine. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Peeter Russak" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -449,24 +128,51 @@ msgstr "Liidab selle faili või kataloogi võrdlemise väljundiga" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Kui oled määranud faili või kataloogi ja võrdlemise väljundit sisaldava faili, " -"siis muutub see nupp kasutatavaks ning sellele vajutades ilmub Kompare peaaken, " -"kus sisestatud faili või kataloogi failide väljund on liidetud võrdlemise " -"väljundiga, misjärel on võimalik erinevus(ed) failile/failidele rakendada. " +"Kui oled määranud faili või kataloogi ja võrdlemise väljundit sisaldava " +"faili, siis muutub see nupp kasutatavaks ning sellele vajutades ilmub " +"Kompare peaaken, kus sisestatud faili või kataloogi failide väljund on " +"liidetud võrdlemise väljundiga, misjärel on võimalik erinevus(ed) failile/" +"failidele rakendada. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Võrdle neid faile või katalooge" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Failide või kataloogide võrdlemine" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstivaade" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Lähtefail" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Sihtfail" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Võrdle" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Võrdle neid faile või katalooge" + +#: 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 "" +"Kui sisestasid selle dialoogi väljadesse kahe faili või kataloogi nime, siis " +"see nupp aktiveerub ning sellele klõpsates käivitub failide või kataloogide " +"võrdlemine. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstivaade" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -559,18 +265,227 @@ msgstr "Tundmatu" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Siin saab anda failid, mida soovid võrrelda." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "S&alvesta kõik" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Salvesta .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Vaheta lähtefail sihtfailiga" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Näita statistikat" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URLi %1 allalaadimine ebaõnnestus." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URLi %1 ei ole sinu süsteemis olemas." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diffi valikud" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Paigafailid" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Salvesta .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Fail on olemas või kirjutuskaitsega. Kas soovid selle üle kirjutada?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Fail on olemas" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Kirjuta üle" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ära kirjuta üle" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Diffi täitmine..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Diffi väljundi parsimine..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Faili %1 võrdlemine failiga %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1 ja %2 sisu võrdlemine" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 võrdlemise väljundi vaatamine" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "%1 võrdlemise väljundi liitmine faili %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "%1 võrdlemise väljundi liitmine kataloogi %2" + +#: 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 "" +"Sa oled teinud sihtfaili(desse) muudatusi.\n" +"Kas soovid need salvestada?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Kas salvestada muudatused?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unifitseeritud" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Tavaline" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "DIFF-fail puudub või ei võrreldud kahte faili, seega statistikat pole." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Võrdlemise statistika" + +#: 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 "" +"Statistika:\n" +"\n" +"Vana fail: %1\n" +"Uus fail: %2\n" +"\n" +"Vorming: %3\n" +"Tükke: %4\n" +"Erinevusi: %5" + +#: 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 "" +"Statistika:\n" +"\n" +"Failide arv diff-failis: %1\n" +"Vorming: %2\n" +"\n" +"Aktiivne vana fail: %3\n" +"Aktiivne uus fail: %4\n" +"\n" +"Tükke: %5\n" +"Erinevusi: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Seadistused" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstivaade" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Vaatamise seadistused" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Võrdlemise seadistused" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Failid" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Siin saab anda failid, mida soovid võrrelda." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Siin saab muuta failide võrdlemise valikuid." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Välimus" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Siin saab muuta vaatamise valikuid." @@ -585,9 +500,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Siin saab valida mõne muu võrdlemisrakenduse. Solarisel ei tunnista standardsed " -"võrdlemisrakendused kõiki võtmeid, küll teeb seda GNU versioon, nii et igati " -"mõttekas oleks just see valida." +"Siin saab valida mõne muu võrdlemisrakenduse. Solarisel ei tunnista " +"standardsed võrdlemisrakendused kõiki võtmeid, küll teeb seda GNU versioon, " +"nii et igati mõttekas oleks just see valida." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -599,18 +514,23 @@ msgstr "Väljundvorming" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Vali võrdlemise väljundi vorming. Unifitseeritud on kõige levinum, sest seda on " -"väga hea jälgida. TDE arendajatele meeldib see ka, nii et just seda oleks " +"Vali võrdlemise väljundi vorming. Unifitseeritud on kõige levinum, sest seda " +"on väga hea jälgida. TDE arendajatele meeldib see ka, nii et just seda oleks " "mõttekas kasutada paikade saatmisel." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Kontekstiread" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Kontekstiridade arv:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -618,8 +538,8 @@ msgid "" "unnecessarily." msgstr "" "Kontekstiridade arv on tavaliselt 2 või 3, mis muudab väljundi enamasti " -"loetavaks ja kasutatavaks. Rohkem kui kolme rea korral läheb asi ainult asjata " -"kirjuks." +"loetavaks ja kasutatavaks. Rohkem kui kolme rea korral läheb asi ainult " +"asjata kirjuks." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -735,19 +655,19 @@ msgstr "Väljajäetavad failimustrid" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Selle sisselülitamisel saab sisestada shellimustri paremal asuvasse tekstikasti " -"või valida mõne kirje nimekirjast." +"Selle sisselülitamisel saab sisestada shellimustri paremal asuvasse " +"tekstikasti või valida mõne kirje nimekirjast." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Siin saab sisestada või eemaldada shellimustri või valida nimekirjast ühe või " -"rohkem kirje." +"Siin saab sisestada või eemaldada shellimustri või valida nimekirjast ühe " +"või rohkem kirje." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -760,19 +680,19 @@ msgstr "Sisselülitamisel saab failinime sisestada paremal asuvasse liitkasti." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Siia saab sisestada faili URL-i shellimustriga, mida ignoreeritakse kataloogide " -"võrdlemisel." +"Siia saab sisestada faili URL-i shellimustriga, mida ignoreeritakse " +"kataloogide võrdlemisel." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Kõik klõpsu järel ilmuvas dialoogis valitud failid asetatakse dialoogi sellest " -"nupust vasakul pool." +"Kõik klõpsu järel ilmuvas dialoogis valitud failid asetatakse dialoogi " +"sellest nupust vasakul pool." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -838,165 +758,276 @@ msgstr "Font:" msgid "Size:" msgstr "Suurus:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Seadistused" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Vaatamise seadistused" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Font:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Võrdlemise seadistused" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Rakenda erinevus" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "S&alvesta kõik" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Eemalda erinevus" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Salvesta .&diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "&Rakenda kõik" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Vaheta lähtefail sihtfailiga" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Eemalda rakendus kõigilt" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Näita statistikat" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URLi %1 allalaadimine ebaõnnestus." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URLi %1 ei ole sinu süsteemis olemas." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diffi valikud" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Paigafailid" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Eelmine fail" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Salvesta .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Järgmine fail" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Fail on olemas või kirjutuskaitsega. Kas soovid selle üle kirjutada?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Ee&lmine erinevus" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fail on olemas" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Jär&gmine erinevus" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Kirjuta üle" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Ei ole mudelit ega erinevusi, sest fail %1 ei ole mitte korralik " +"diff-fail." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ära kirjuta üle" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Diff-faili %1 rakendamisel failile %2 tekkis probleeme." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Diff-faili %1 rakendamisel kataloogile %2 tekkis probleeme." +"" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Diffi täitmine..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Ajutise faili avamine ei õnnestunud." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Diffi väljundi parsimine..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Ajutisse faili %1 kirjutamine ei õnnestunud, see kustutatakse." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Faili %1 võrdlemine failiga %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Sihtkataloogi %1 loomine ebaõnnestus.\n" +"Faili ei salvestatud." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1 ja %2 sisu võrdlemine" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Ajutise faili laadimine sihtkohta %1 ebaõnnestus. Ajutine fail on " +"endiselt kättesaadav (%2). Kui soovid, võid selle käsitsi õigesse " +"kohta kopeerida." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 võrdlemise väljundi vaatamine" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Võrdlemise väljundi parsimine ei õnnestunud." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "%1 võrdlemise väljundi liitmine faili %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Failid on identsed." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "%1 võrdlemise väljundi liitmine kataloogi %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ajutisse faili kirjutamine ei õnnestunud." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Sa oled teinud sihtfaili(desse) muudatusi.\n" -"Kas soovid need salvestada?" +"Failidevaheliste erinevuste vaatlemise ja .diff-failide genereerimise " +"rakendus" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Kas salvestada muudatused?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Võrdleb URL1 ja URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "DIFF-fail puudub või ei võrreldud kahte faili, seega statistikat pole." +"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 "" +"See avab URL1 ja eeldab, et tegemist on võrdlemise väljundiga. URL1 võib " +"olla ka '-', millisel juhul loetakse see standardsisendist. Seda võib " +"kasutada näiteks cvs diff | kompare -o- jaoks. Kompare uurib, kas suudab " +"leida originaalfaili(d) ning seejärel liidab originaalfaili(d) võrdlemise " +"väljundiga ja näidab tulemust. Võti -n keelab uurimise." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Võrdlemise statistika" +#: 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 "" +"See liidab URL2 URL1 sisse, kus eeldatakse, et URL2 on võrdlemise väljund ja " +"URL1 fail või kataloog, millesse võrdlemise väljund tuleb liita. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistika:\n" -"\n" -"Vana fail: %1\n" -"Uus fail: %2\n" -"\n" -"Vorming: %3\n" -"Tükke: %4\n" -"Erinevusi: %5" +"Keelab uurimise originaalfaili(de) automaatseks leidmiseks, kui URL on antud " +"kujul '-' koos võtmega -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Sellega saab määrata kodeeringu väljakutsumisel käsurealt. Vaikimisi kohalik " +"kodeering, kui ei ole teisiti määratud." + +#: 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 ja Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare ikooni looja" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Palju häid nõuandeid" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff-failide vaatleja" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Võrdle neid faile või katalooge" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Failid" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Erinevus" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Vaatamise seadistused" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "diff käivitatakse kataloogis" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Käsurida" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- lähteasukoht" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Valikud" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Otsitakse väiksemaid muudatusi" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimeeritakse suurte failide jaoks" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Tõstutundetu" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Tabeldusmärgid muudetakse tühikuteks" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoreeritakse lisatud või eemaldatud tühje ridu" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoreeritakse muudatusi tühimärkides" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Näidatakse funktsioonide nimesid" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Katalooge võrreldakse rekursiivselt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Uusi faile koheldakse tühjana" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Vorming" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Kõrvuti" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Failide arv diff-failis: %1\n" -"Vorming: %2\n" -"\n" -"Aktiivne vana fail: %3\n" -"Aktiivne uus fail: %4\n" -"\n" -"Tükke: %5\n" -"Erinevusi: %6" diff --git a/tde-i18n-eu/messages/tdesdk/kompare.po b/tde-i18n-eu/messages/tdesdk/kompare.po index 09127fd9a27..03211cd02fa 100644 --- a/tde-i18n-eu/messages/tdesdk/kompare.po +++ b/tde-i18n-eu/messages/tdesdk/kompare.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "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: 2005-08-23 20:32+0200\n" "Last-Translator: Ion Gaztañaga \n" "Language-Team: Basque \n" @@ -19,334 +19,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplikatu desberdintasunak" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Desberdintasunaren &aplikazioa desegin" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&likatu dena" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Desegin dena" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Au&rreko fitxategia" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Hurr&engo fitxategia" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "A&urreko desberdintasuna" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Hurre&ngo desberdintasuna" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ez dago eredu edo desberdintasunik, fitxategi hau: %1" -", ez da baliozko diff fitxategia." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Arazoak %1 diff fitxategia %2 fitxategiari aplikatzean." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "Arazoak %1 diff-a %2 direktorioari aplikatzean." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Ezin izan da behin-behineko fitxategirik ireki." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Ezin izan da %1 behin behineko fitxategian idatzi, ezabatzen." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Ezin izan da %1 helburu direktorioa sortu.\n" -"Fitxategia ez da gorde." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Ezin izan da behin behineko fitxategia helburu %1 " -"kokalekura kargatu. Behin behineko fitxategia oraindik eskuragarri dago hemen: " -"%2. Eskuz kopia dezakezu kokaleku zuzenera." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Ezin izan da diff irteera analizatu." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Fitxategiak berdinak dira." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Ezin izan da behin behineko fitxategian idatzi." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Desberdintasuna" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Abiatu diff hemen:" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Komando lerroa" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- iturburuaren helburua" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Bilatu aldaketa txikiak" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizat fitxategi handientzat" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ez ikusi maiuskula/minuskula aldaketak" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Zabaldu tabulatzaileak espaziotara" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ez ikusi gehitutako edo kendutako lerro hutsak" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ez ikusi zurigune aldaketak" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Erakutsi funtzioen izenak" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Konparatu direktorioak errekurtsiboki" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratatu fitxategi berriak hutsak bezala" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formatua" - -#. 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 "Testuingurua" - -#. 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 "Ed" - -#. 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 "Normala" - -#. 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 "Bateratua" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Aalboz albo" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Testuinguru lerro kopurua:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Fitxategien arteko desberdintasunak ikusteko eta diff fitxategiak sortzeko " -"gaitasuna duen programa bat." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "URL1 eta URL2 konparatuko ditu" - -#: 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 "" -"Honek URL1 irekiko du eta konparaketaren irteera izatea espero du. URL1 '-' ere " -"izan daiteke eta orduan irteera estandarretik irakurriko da. Adibidez, \"cvs " -"diff | konpare -o - \" aginduan erabil daiteke. Konpare-k jartorrizko " -"fitxategiak aurki ditzakeen egiaztatuko du eta orduan jatorrizko fitxategiak " -"konparaketa irteerara fusionatu xeta ikustailean bistaratuko dituss. \"-n\"-k " -"egiaztapena ezgaituko du.s" - -#: 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 "" -"Honek URL2 URL1-ean fusionatuko du URL2 konparaketa irteera izatea eta URL1 " -"konparaketa irteera fusionatuko den fitxategi edo direktorioa izatea espero da. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"'-' URL-a -o akerarekin erabiltzen denean automatikoki jatorrizko fitxategia(k) " -"aurkitzeko egiaztapena ezgaitzen du." - -#: 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 "" -"Erabili hau komando-lerrotik deitzean erabiliko den kodeketa zehazteko. Ezer " -"zehazten ez bada, lehenetsia kodeketa lokala erabiltzea da." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Konpare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh eta Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Egilea" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Konpare ikono artista" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Aholku on asko" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff ikustailea" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Konparatu fitxategiak edo direktorioak" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Iturburua" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Helburua" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Konparatu" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Konparatu fitxategi edo direktorio hauek" - -#: 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 "" -"2 fitxategi-izen edo 2 direktorio sartu badituzu elkarrizkea-koadro honetan, " -"botoi hau gaituko egingo da eta sakatzean sartutako fitxategi edo direktorioen " -"arteko konparaketa hasiko da." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Ion Gaztañaga" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,28 +131,54 @@ msgstr "Fusionatu fitxategi edo direktorio hau konparaketaren irteerarekin" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Fitxategi edo direktorio izen bat eta konparaketa irteera duen fitxategi bat " -"sartu baduzu, botoi hau gaitu egingo da eta hau sakatzean Konpare abiatuko da " -"ikuspegi nagusian. Bertan sartutako fitxategi edo direktorioko fitxategiak " -"konparaketa irteerarekin nahastuko dira. Horrela, desberdintasunak fitxategi " -"edo fitxategiei aplika diezazkiekezu." +"sartu baduzu, botoi hau gaitu egingo da eta hau sakatzean Konpare abiatuko " +"da ikuspegi nagusian. Bertan sartutako fitxategi edo direktorioko " +"fitxategiak konparaketa irteerarekin nahastuko dira. Horrela, " +"desberdintasunak fitxategi edo fitxategiei aplika diezazkiekezu." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Konparatu fitxategi edo direktorio hauek" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Konparatu fitxategiak edo direktorioak" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Testu ikuspegia" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Iturburua" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Helburua" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Konparatu" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Konparatu fitxategi edo direktorio hauek" + +#: 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 "" +"2 fitxategi-izen edo 2 direktorio sartu badituzu elkarrizkea-koadro honetan, " +"botoi hau gaituko egingo da eta sakatzean sartutako fitxategi edo " +"direktorioen arteko konparaketa hasiko da." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Testu ikuspegia" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "Iturburu direktorioa" #: komparenavtreepart/komparenavtreepart.cpp:66 @@ -563,18 +268,231 @@ msgstr "Ezezaguna" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Hemen konparatu nahi dituzun fitxategiak sar ditzakezu." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Gorde &dena" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Gorde .&diff-a..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Trukatu iturburua helburuarekin" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Erakutsi estatistikak" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "%1 URL-a ezin da deskargatu." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "%1 URL-a ez da zure sisteman existitzen." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff aukerak" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Adabaki fitxategiak" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Gorde .diff-a" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Fitxategia dagoeneko existitzen da eta idazketa aurka babesturik dago; " +"gainidatzi nahi al duzu?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Fitxategia existitzen da" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Gainidatzi" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ez gainidatzi" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KonparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Diff martxan..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Diff irteera analizatzen..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "%1 fitxategia %2 fitxategiarekin konparatzen" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1-(e)ko fitxategia %2-(e)ko fitxategiarekin konparatzen" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1-(r)en diff irteera ikusten" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "%1-(r)en diff irteera %2 fitxategian fusionatzen" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "%1-(r)en diff irteera %2 direktorioan fusionatzen" + +#: 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 "" +"Helburu fitxategietan aldaketak egin dituzu.\n" +"Gorde nahi al dituzu?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Gorde aldaketak?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Bateratua" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Testuingurua" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normala" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Ez dago diff fitxategirik, edo ez da 2 fitxategirik konparatu. Beraz, ez " +"estatistikarik egongo eskuragarri." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff estatistikak" + +#: 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 "" +"Estatistikak:\n" +"\n" +"Fitxategi zaharra:%1\n" +"Fitxategi berria:%2\n" +"\n" +"Formatua:%3\n" +"Zati kopurua:%4\n" +"Desberdintasun kopurua:%5" + +#: 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 "" +"Estatistikak:\n" +"\n" +"Diff fitxategiko fitxategi kopurua: %1\n" +"Formatua:%2\n" +"\n" +"Uneko fitxategi zaharra:%3\n" +"Uneko fitxategi berria:%4\n" +"\n" +"Zati kopurua:%5\n" +"Desberdintasun kopurua:%6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Hobespenak" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Testu ikuspegia" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Ikusi ezarpenak" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff ezarpenak" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Fitxategiak" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Hemen konparatu nahi dituzun fitxategiak sar ditzakezu." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Hemen fitxategi konparaketaren aukerak alda ditzakezu." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "I&txura" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Hemen ikuspegiaren aukerak alda ditzakezu." @@ -590,8 +508,8 @@ msgid "" "you can select that version." msgstr "" "Hemen diff programa ezberdin bat hauta dezakezu. Solaris-en konparaketa " -"programa estandarrak ez ditu GNU bertsioaren aukera guztiak onartzen. Honela, " -"bertsio hura hauta dezakezu." +"programa estandarrak ez ditu GNU bertsioaren aukera guztiak onartzen. " +"Honela, bertsio hura hauta dezakezu." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -603,18 +521,23 @@ msgstr "Irteeraren formatua" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Hautatu diff programak sortuko duen irteeraren formatua. Bateratua, gehien " -"erabiltzen den formatua da, oso irakurterreza delako. TDE garatzaileek formatu " -"hau dute gustoko adabakiak bidaltzeko garaian." +"erabiltzen den formatua da, oso irakurterreza delako. TDE garatzaileek " +"formatu hau dute gustoko adabakiak bidaltzeko garaian." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Testuinguru lerroak" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Testuinguru lerro kopurua:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -739,16 +662,16 @@ msgstr "Baztertzeko fitxategi eredua" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Hau hautatzen bada, shell eredu bat sar dezakezu testu-koadroan edo zerrenda " "sarrerak hauta ditzakezu." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Hemen shell eredu bat sar edo kendu dezakezu edo zerrendako sarrera bat edo " "gehiago hauta dezakezu." @@ -761,21 +684,21 @@ msgstr "Baztertzeko fitxategi-izenak dituen fitxategia" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Hau hautatzen bada, fitxategi-izen bat sar dezakezu eskuineko " -"konbinazio-koadroan" +"Hau hautatzen bada, fitxategi-izen bat sar dezakezu eskuineko konbinazio-" +"koadroan" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Hemen direktorioen konparaketetan baztertuko diren shell eredudun fitxategi " "baten URL-a sar dezakezu." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Hemen hautatzen duzun eta klik egitean agertzen den edozein fitxategi, botoi " "honen ezkerrean dagoen elkarrizketa-koadroan jarriko da." @@ -844,169 +767,275 @@ msgstr "Letra-tipoa:" msgid "Size:" msgstr "Tamaina:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Hobespenak" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Letra-tipoa:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Ikusi ezarpenak" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplikatu desberdintasunak" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff ezarpenak" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Desberdintasunaren &aplikazioa desegin" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Gorde &dena" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&likatu dena" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Gorde .&diff-a..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Desegin dena" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Trukatu iturburua helburuarekin" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Erakutsi estatistikak" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "%1 URL-a ezin da deskargatu." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "%1 URL-a ez da zure sisteman existitzen." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Au&rreko fitxategia" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff aukerak" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Hurr&engo fitxategia" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Adabaki fitxategiak" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "A&urreko desberdintasuna" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Gorde .diff-a" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Hurre&ngo desberdintasuna" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Fitxategia dagoeneko existitzen da eta idazketa aurka babesturik dago; " -"gainidatzi nahi al duzu?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fitxategia existitzen da" +"Ez dago eredu edo desberdintasunik, fitxategi hau: %1, ez da " +"baliozko diff fitxategia." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Gainidatzi" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ez gainidatzi" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Arazoak %1 diff fitxategia %2 fitxategiari aplikatzean." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KonparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "Arazoak %1 diff-a %2 direktorioari aplikatzean." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Diff martxan..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Ezin izan da behin-behineko fitxategirik ireki." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Diff irteera analizatzen..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Ezin izan da %1 behin behineko fitxategian idatzi, ezabatzen." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "%1 fitxategia %2 fitxategiarekin konparatzen" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Ezin izan da %1 helburu direktorioa sortu.\n" +"Fitxategia ez da gorde." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1-(e)ko fitxategia %2-(e)ko fitxategiarekin konparatzen" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Ezin izan da behin behineko fitxategia helburu %1 kokalekura " +"kargatu. Behin behineko fitxategia oraindik eskuragarri dago hemen: %2. Eskuz kopia dezakezu kokaleku zuzenera." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1-(r)en diff irteera ikusten" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Ezin izan da diff irteera analizatu." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "%1-(r)en diff irteera %2 fitxategian fusionatzen" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Fitxategiak berdinak dira." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "%1-(r)en diff irteera %2 direktorioan fusionatzen" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ezin izan da behin behineko fitxategian idatzi." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Helburu fitxategietan aldaketak egin dituzu.\n" -"Gorde nahi al dituzu?" +"Fitxategien arteko desberdintasunak ikusteko eta diff fitxategiak sortzeko " +"gaitasuna duen programa bat." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Gorde aldaketak?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "URL1 eta URL2 konparatuko ditu" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Ez dago diff fitxategirik, edo ez da 2 fitxategirik konparatu. Beraz, ez " -"estatistikarik egongo eskuragarri." +"Honek URL1 irekiko du eta konparaketaren irteera izatea espero du. URL1 '-' " +"ere izan daiteke eta orduan irteera estandarretik irakurriko da. Adibidez, " +"\"cvs diff | konpare -o - \" aginduan erabil daiteke. Konpare-k jartorrizko " +"fitxategiak aurki ditzakeen egiaztatuko du eta orduan jatorrizko fitxategiak " +"konparaketa irteerara fusionatu xeta ikustailean bistaratuko dituss. \"-n\"-" +"k egiaztapena ezgaituko du.s" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff estatistikak" +#: 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 "" +"Honek URL2 URL1-ean fusionatuko du URL2 konparaketa irteera izatea eta URL1 " +"konparaketa irteera fusionatuko den fitxategi edo direktorioa izatea espero " +"da. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estatistikak:\n" -"\n" -"Fitxategi zaharra:%1\n" -"Fitxategi berria:%2\n" -"\n" -"Formatua:%3\n" -"Zati kopurua:%4\n" -"Desberdintasun kopurua:%5" +"'-' URL-a -o akerarekin erabiltzen denean automatikoki jatorrizko " +"fitxategia(k) aurkitzeko egiaztapena ezgaitzen du." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Erabili hau komando-lerrotik deitzean erabiliko den kodeketa zehazteko. Ezer " +"zehazten ez bada, lehenetsia kodeketa lokala erabiltzea da." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Konpare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh eta Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Egilea" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Konpare ikono artista" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Aholku on asko" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff ikustailea" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Konparatu fitxategi edo direktorio hauek" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Fitxategiak" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Desberdintasuna" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Ikusi ezarpenak" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Abiatu diff hemen:" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Komando lerroa" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- iturburuaren helburua" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "A&ukerak" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Bilatu aldaketa txikiak" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizat fitxategi handientzat" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ez ikusi maiuskula/minuskula aldaketak" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Zabaldu tabulatzaileak espaziotara" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ez ikusi gehitutako edo kendutako lerro hutsak" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ez ikusi zurigune aldaketak" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Erakutsi funtzioen izenak" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Konparatu direktorioak errekurtsiboki" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratatu fitxategi berriak hutsak bezala" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formatua" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Aalboz albo" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estatistikak:\n" -"\n" -"Diff fitxategiko fitxategi kopurua: %1\n" -"Formatua:%2\n" -"\n" -"Uneko fitxategi zaharra:%3\n" -"Uneko fitxategi berria:%4\n" -"\n" -"Zati kopurua:%5\n" -"Desberdintasun kopurua:%6" diff --git a/tde-i18n-fa/messages/tdesdk/kompare.po b/tde-i18n-fa/messages/tdesdk/kompare.po index bd6677d33b8..c30f7adc132 100644 --- a/tde-i18n-fa/messages/tdesdk/kompare.po +++ b/tde-i18n-fa/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2006-12-30 11:02+0330\n" "Last-Translator: \n" "Language-Team: \n" @@ -16,329 +16,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&اعمال تفاوت‌" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "تفاوت &اعمال نشود‌" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "&اعمال همه‌" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "همه &اعمال نشود‌" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "پروندۀ &قبلی‌" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "پروندۀ &بعدی‌" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "تفاوت &قبلی‌" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "تفاوت &بعدی‌" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"هیچ مدل یا تفاوتی وجود ندارد، این پرونده %1" -"،یک پروندۀ تفاوت معتبر نیست." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "مسائلی در اعمال تفاوت وجود دارد%1به پروندۀ%2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "مسائلی در اعمال تفاوت وجود دارد %1به پوشۀ%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "نتوانست پروندۀ موقت را باز کند." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "نتوانست در پروندۀ موقت بنویسد %1، حذف آن." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"نتوانست فهرست راهنمای مقصد را ایجاد کند%1.\n" -"این پرونده ذخیره نشده است." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"نتوانست پروندۀ موقت را در محل مقصد بارگذاری کند%1" -". پروندۀ موقت هنوز در دسترس است تحت :%2. می‌توانید به طور دستی آن را در " -"مکان درست رونوشت کنید. " - -#: 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 "cd dir && diff -udHprNa --مبدأ مقصد" - -#. 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 "" -"نشانی وب۱ را باز می‌کند و انتظار دارد که خروجی تفاوت باشد. همچنین، نشانی وب ۱ " -"می‌تواند یک »ـ« باشد، و از یک ورودی استاندارد خوانده شود. می‌تواند به عنوان " -"مثال برای cvs diff | kompare -o - استفاده شود. Kompare یک بررسی را برای این که " -"ببیند آیا می‌تواند پرونده)های( اصلی را پیدا کند انجام می‌دهد، و پرونده)های( " -"اصلی را در خروجی تفاوت ترکیب می‌کند و در مشاهده‌گر نمایش می‌دهد. -n بررسی را " -"غیرفعال می‌کند." - -#: 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 "" -"زمانی که با گزینۀ -o، از »-« عنوان نشانی وب استفاده می‌شود، بررسی برای یافتن " -"خودکار پرونده)های( اصلی غیرفعال می‌شو‌د." - -#: 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 "هنرمند شمایل Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr " نظرهای خوب بسیار" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "مشاهده‌گر تفاوت Cervisia" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "نوشین آسیایی" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -436,28 +120,53 @@ msgstr "ترکیب این پرونده یا پوشه با خروجی تفاوت" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "اگر نام یک پرونده یا پوشه و یک پرونده‌ای که حاوی خروجی تفاوت است را در حوزۀ " "محاوره وارد کرده باشید، این دکمه فعال خواهد شد، و فشار دادن آن باعث باز شدن " -"نمای اصلی kompare خواهد شد، که در آن خروجی پرونده یا پرونده‌ها از پوشه با خروجی " -"تفاوت آمیخته می‌شود؛ بنابراین، بعداً می‌توانید تفاوت)ها( را در پرونده یا " +"نمای اصلی kompare خواهد شد، که در آن خروجی پرونده یا پرونده‌ها از پوشه با " +"خروجی تفاوت آمیخته می‌شود؛ بنابراین، بعداً می‌توانید تفاوت)ها( را در پرونده یا " "پرونده‌ها به کار ببرید." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "مقایسۀ این پرونده‌ها یا پوشه‌ها" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "مقایسۀ پرونده‌ها یا پوشه‌ها" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "نمای متن" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "مبدأ" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "مقصد" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "مقایسه‌ کردن" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "مقایسۀ این پرونده‌ها یا پوشه‌ها" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"اگر نام ۲ پرونده یا پوشه را در حوزه‌های محاوره وارد کنید، این دکمه فعال " +"خواهد شد، و فشار دادن آن موجب شروع مقایسۀ پرونده‌ها و پوشه‌های وارد شده می‌شود." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "نمای متن" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "پوشۀ مبدأ" #: komparenavtreepart/komparenavtreepart.cpp:66 @@ -535,19 +244,229 @@ msgstr "ناشناخته" msgid "KompareNavTreePart" msgstr "بخش درخت ناوشگر Kompare" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: 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 "The URL %1 cannot be downloaded." +msgstr "نشانی وب%1 نمی‌تواند بارگذاری رو به پایین شود." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "نشانی وب %1 روی سیستم شما وجود ندارد." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "گزینه‌های تفاوت" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|پرونده‌های کژنه" + +#: 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 "جزء Kompare" + +#: 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 "مقایسۀ پروندۀ %1 با پروندۀ %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "مقایسۀ پرونده‌ها در %1 با پرونده‌ها در %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "مشاهدۀ خروجی تفاوت از %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "ترکیب خروجی تفاوت از %1 در پروندۀ %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "ترکیب خروجی تفاوت از %1 در پوشۀ %2" + +#: 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 "" +" تغییراتی را در پرونده)های( مقصد ایجاد کرده‌اید.‌\n" +"مایل به ذخیرۀ آنها هستید؟" + +#: 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 "" +"آمار:\n" +"‌ \n" +"پروندۀ قدیمی: %1\n" +"‌ پروندۀ جدید: %2\n" +"\n" +"قالب: %3\n" +"تعداد کمینگاهها: %4\n" +"تعداد تفاوتها: %5" + +#: 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 "" -"در اینجا می‌توانید پرونده‌هایی را که می‌خواهید مقایسه شوند را وارد کنید." +"آمار:\n" +"‌ \n" +"تعداد پرونده‌ها در پروندۀ تفاوت: %1\n" +"قالب: %2\n" +"\n" +"پروندۀ قدیمی جاری: %3\n" +"پروندۀ جدید جاری: %4\n" +"\n" +"تعداد کمینگاهها: %5\n" +"تعداد تفاوتها: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "تنظیمات" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "نمای متن" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "تنظیمات نما" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "تفاوت" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "تنظیمات تفاوت" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&پرونده‌ها‌" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "در اینجا می‌توانید پرونده‌هایی را که می‌خواهید مقایسه شوند را وارد کنید." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "در اینجا می‌توانید گزینه‌ها را برای مقایسۀ پرونده‌ها تغییر دهید." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&ظاهر‌" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "در اینجا می‌توانید گزینه‌های نما را تغییر دهید." @@ -576,9 +495,9 @@ msgstr "قالب خروجی" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "قالب خروجی تولیدشده توسط تفاوت را برگزینید. یکی‌شده یکی از قالبهایی است که به " "دلیل قابل خواندن بودن بیشتر استفاده می‌شود. توسعه‌دهندگانTDE این قالب را به " @@ -589,14 +508,20 @@ msgstr "" msgid "Lines of Context" msgstr "خطوط متن" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "تعداد خطوط متن:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"تعداد خطوط متن به طور عادی ۲ یا ۳ است. این موجب قابل خواندن و کاربردی شدن تفاوت " -"در بسیاری از حالات خواهد شد. فقط بیش از ۳ خطط باعث بیهوده شدن تفاوت خواهد شد." +"تعداد خطوط متن به طور عادی ۲ یا ۳ است. این موجب قابل خواندن و کاربردی شدن " +"تفاوت در بسیاری از حالات خواهد شد. فقط بیش از ۳ خطط باعث بیهوده شدن تفاوت " +"خواهد شد." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -643,8 +568,8 @@ msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" -"عبارت منظمی که برای چشم‌پوشی از خطوطی که با آن تطابق دارند و استفاده خواهید کرد " -"را اینجا اضافه کنید." +"عبارت منظمی که برای چشم‌پوشی از خطوطی که با آن تطابق دارند و استفاده خواهید " +"کرد را اینجا اضافه کنید." #: libdialogpages/diffpage.cpp:294 msgid "&Edit..." @@ -712,16 +637,16 @@ msgstr "الگوی پرونده برای مستثنی کردن" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"اگر این علامت زده شود، می‌توانید الگوی پوسته را در جعبۀ متن سمت راست وارد کنید، " -"یا مدخلها را از فهرست برگزینید." +"اگر این علامت زده شود، می‌توانید الگوی پوسته را در جعبۀ متن سمت راست وارد " +"کنید، یا مدخلها را از فهرست برگزینید." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "اینجا می‌توانید یک الگوی پوسته را وارد یا حذف کنید، یا یک مدخل یا بیشتر را از " "فهرست برگزینید." @@ -739,16 +664,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "اینجا می‌توانید نشانی وب‌ یک پرونده با الگوی پوسته‌ها را برای چشم‌پوشی، هنگام " "مقایسۀ پوشه‌ها وارد کنید." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "هر پرونده‌ای که در محاوره انتخاب می‌کنید، و زمانی که آن را فشار می‌دهید، بالا " "پرانده می‌شود و در محاورۀ سمت چپ این دکمه قرار خواهد گرفت." @@ -817,167 +742,269 @@ msgstr "قلم:" msgid "Size:" msgstr "اندازه‌:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "تنظیمات" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "قلم:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "تنظیمات نما" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&اعمال تفاوت‌" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "تنظیمات تفاوت" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "تفاوت &اعمال نشود‌" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "ذخیرۀ &همه‌" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "&اعمال همه‌" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "ذخیرۀ &تفاوت...‌" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "همه &اعمال نشود‌" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "مبادلۀ مبدأ با مقصد" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "پروندۀ &قبلی‌" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "نمایش آمار" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "نشانی وب%1 نمی‌تواند بارگذاری رو به پایین شود." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "نشانی وب %1 روی سیستم شما وجود ندارد." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "پروندۀ &بعدی‌" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "گزینه‌های تفاوت" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "تفاوت &قبلی‌" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|پرونده‌های کژنه" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "تفاوت &بعدی‌" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "ذخیرۀ تفاوت" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"هیچ مدل یا تفاوتی وجود ندارد، این پرونده %1،یک پروندۀ تفاوت معتبر " +"نیست." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "پرونده وجود دارد یا غیرقابل نوشتن است؛ می‌خواهید آن را جای‌نوشت کنید؟" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "مسائلی در اعمال تفاوت وجود دارد%1به پروندۀ%2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "پرونده وجود دارد" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "مسائلی در اعمال تفاوت وجود دارد %1به پوشۀ%2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "جای‌نوشت" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "نتوانست پروندۀ موقت را باز کند." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "جای‌نوشت نشود" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "نتوانست در پروندۀ موقت بنویسد %1، حذف آن." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "جزء Kompare" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"نتوانست فهرست راهنمای مقصد را ایجاد کند%1.\n" +"این پرونده ذخیره نشده است." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "اجرای تفاوت..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"نتوانست پروندۀ موقت را در محل مقصد بارگذاری کند%1. پروندۀ موقت " +"هنوز در دسترس است تحت :%2. می‌توانید به طور دستی آن را در مکان درست " +"رونوشت کنید. " -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "تجزیۀ خروجی تفاوت..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "نتوانست خروجی تفاوت را تجزیه کند." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "مقایسۀ پروندۀ %1 با پروندۀ %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "پرونده‌ها یکسانند." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "مقایسۀ پرونده‌ها در %1 با پرونده‌ها در %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "نتوانست در پروندۀ موقت بنویسد." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "مشاهدۀ خروجی تفاوت از %1" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "برنامه‌ای برای نمایش تفاوتهای بین پرونده‌ها و تولید یک تفاوت اختیاری" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "ترکیب خروجی تفاوت از %1 در پروندۀ %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "نشانی وب ۱ را با نشانی وب ۲ مقایسه می‌کند" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "ترکیب خروجی تفاوت از %1 در پوشۀ %2" +#: 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 "" +"نشانی وب۱ را باز می‌کند و انتظار دارد که خروجی تفاوت باشد. همچنین، نشانی وب ۱ " +"می‌تواند یک »ـ« باشد، و از یک ورودی استاندارد خوانده شود. می‌تواند به عنوان " +"مثال برای cvs diff | kompare -o - استفاده شود. Kompare یک بررسی را برای این " +"که ببیند آیا می‌تواند پرونده)های( اصلی را پیدا کند انجام می‌دهد، و " +"پرونده)های( اصلی را در خروجی تفاوت ترکیب می‌کند و در مشاهده‌گر نمایش می‌دهد. -n " +"بررسی را غیرفعال می‌کند." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -" تغییراتی را در پرونده)های( مقصد ایجاد کرده‌اید.‌\n" -"مایل به ذخیرۀ آنها هستید؟" +"نشانی وب ۱ را در ۲ ترکیب می‌کند، انتظار می‌رود نشانی وب ۲ خروجی تفاوت و نشانی " +"وب ۱ پرونده یا پوشه‌ای که احتیاج است در آن ترکیب شود، باشد." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr " تغییرات ذخیره شود؟" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"زمانی که با گزینۀ -o، از »-« عنوان نشانی وب استفاده می‌شود، بررسی برای یافتن " +"خودکار پرونده)های( اصلی غیرفعال می‌شو‌د." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"هیچ پروندۀ تفاوتی نیست، یا هیچ ۲ پرونده‌ای متفاوت نیستند. بنابراین، هیچ آماری " -"موجود نیست." +"از این برای مشخص کردن کدبندی در زمان فراخوانی آن از سطر فرمان استفاده می‌شود. " +"اگر مشخص نشود به طور پیش‌فرض کدبندی محلی خواهد بود." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "آمار تفاوت" +#: main.cpp:52 +msgid "Kompare" +msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -"آمار:\n" -"‌ \n" -"پروندۀ قدیمی: %1\n" -"‌ پروندۀ جدید: %2\n" -"\n" -"قالب: %3\n" -"تعداد کمینگاهها: %4\n" -"تعداد تفاوتها: %5" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "نویسنده" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "هنرمند شمایل Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr " نظرهای خوب بسیار" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "مشاهده‌گر تفاوت Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "مقایسۀ این پرونده‌ها یا پوشه" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&پرونده‌ها‌" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&تفاوت‌" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, 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 "cd dir && diff -udHprNa --مبدأ مقصد" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"آمار:\n" -"‌ \n" -"تعداد پرونده‌ها در پروندۀ تفاوت: %1\n" -"قالب: %2\n" -"\n" -"پروندۀ قدیمی جاری: %3\n" -"پروندۀ جدید جاری: %4\n" -"\n" -"تعداد کمینگاهها: %5\n" -"تعداد تفاوتها: %6" diff --git a/tde-i18n-fi/messages/tdesdk/kompare.po b/tde-i18n-fi/messages/tdesdk/kompare.po index 015159217b4..da75bec3072 100644 --- a/tde-i18n-fi/messages/tdesdk/kompare.po +++ b/tde-i18n-fi/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "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: 2006-09-15 11:51+0300\n" "Last-Translator: Ilpo Kantonen \n" "Language-Team: finnish \n" @@ -18,335 +18,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Ota käyttöön muutokset" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Kumoa muutokset" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "O&ta käyttöön kaikki" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "K&umoa kaikki" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Edellinen tiedosto" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Seuraava tiedosto" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "E&dellinen ero" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Seu&raava ero" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ei malleja tai ei eroja, tässä tiedostossa: %1" -", ei ole kelvollinen diff-tiedosto." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Diff-tiedoston %1 muutosten yhdistämisessä tiedostoon %2 " -"oli ongelmia." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Diff-tiedoston %1 muutosten yhdistämisessä kansioon %2 " -"oli ongelmia." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Väliaikaistiedostoa ei voi avata." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Väliaikaistiedostoon %1 ei voitu kirjoittaa. Poistetaan se." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Ei voitu luoda kohdekansiota %1.\n" -"Tiedostoa ei ole talletettu." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Väliaikaistiedostoa ei voi kopioida kohteeseen %1" -". Väliaikaistiedosto on edelleen käytettävissä: %2" -". Voit kopioida sen oikeaan paikkaan käsin." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Diff-tulostetta ei voi jäsentää." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Tiedostot ovat identtisiä." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Väliaikaistiedostoon ei voi kirjoittaa." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Erot" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Suorita Diff kansiossa" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Komentorivi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- lähde kohde" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Etsi pienempiä muutoksia" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimoi suuria tiedostoja varten" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Älä vertaa kirjainkokoa" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Muuta sarkainmerkit välilyönneiksi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Älä huomioi lisättyjä tai poistettuja tyhjiä rivejä" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Älä huomioi muutoksia tyhjeissä" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Näytä funktionimet" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Vertaa kansioita rekursiivisesti" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Kohtele uusia tiedostoja tyhjinä" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Muoto" - -#. 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 "Konteksti" - -#. 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 "Ed-komentotiedosto" - -#. 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 "Normaali" - -#. 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 "Diff-yhtenäismuoto" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Vierekkäin" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Kontekstirivien määrä:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Ohjelma tiedostojen välisten erojen tarkastelemiseen ja diff-tiedoston " -"luomiseen." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Tämä vertaa URL1:ä URL2:een." - -#: 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 "" -"Tämä avaa URL1:n odottaen diff-tulostetta. URL1 voi olla myös '-', jolloin se " -"luetaan standardisyötevirrasta. Voidaan käyttää cvs:lle diff | kompare -o -. " -"Kompare tarkastaa, löytyvätkö alkuperäiset tiedostot ja yhdistää ne " -"diff-tulosteeseen sekä näyttää lopputuloksen. -n poistaa tarkastuksen käytöstä." - -#: 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 "" -"Tämä yhdistää URL2:n URL1:een, URL2:n oletetaan olevan diff-tuloste ja URL1:n " -"tiedosto tai kansio, johon diff-tuloste yhdistetään." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Poistaa käytöstä tarkastuksen automaattiselle alkuperäisten tiedostojen " -"etsinnälle käytettäessä parametria '-' URL:na yhdessä -o parametrin kanssa." - -#: 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 "" -"Käytä tätä määritelläksesi koodauksen kun sitä kutsutaan komentoriviltä. Se on " -"oletuksena paikallinen koodaus, jos ei ole määritelty." - -#: 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 ja Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Tekijä" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Komparen kuvaketaiteilija" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Runsaasti hyviä neuvoja" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff-katseluohjelma" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Vertaa tiedostoja tai kansioita" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Lähde" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Kohde" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Vertaa" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Vertaa näitä tiedostoja tai kansioita" - -#: 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 "" -"Painike on käytettävissä, kun kaksi tiedosto- tai kansionimeä on syötetty tämän " -"valintaikkunan kenttiin. Painaminen aloittaa annettujen tiedostojen tai " -"kansioiden vertaamisen." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Teemu Rytilahti,Juha J. Kari" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,27 +130,53 @@ msgstr "Yhdistä tämä tiedosto tai kansio diff-tulosteen kanssa" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Painike on käytettävissä, kun tiedosto- tai kansionimi ja diff-tiedosto on " "syötetty tämän valintaikkunan kenttiin. Painaminen avaa Kompare-ohjelman " "pääikkunan, jossa tiedostot näytetään yhdessä diff-tulosteen kanssa, jolloin " "erot voidaan liittää tiedostoihin." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Vertaa näitä tiedostoja tai kansioita" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Vertaa tiedostoja tai kansioita" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstinäkymä" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Lähde" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Kohde" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Vertaa" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Vertaa näitä tiedostoja tai kansioita" + +#: 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 "" +"Painike on käytettävissä, kun kaksi tiedosto- tai kansionimeä on syötetty " +"tämän valintaikkunan kenttiin. Painaminen aloittaa annettujen tiedostojen " +"tai kansioiden vertaamisen." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstinäkymä" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "Lähdekansio" #: komparenavtreepart/komparenavtreepart.cpp:66 @@ -562,18 +266,231 @@ msgstr "Tuntematon" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Tässä voit antaa tiedostot, joita haluat vertailla." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Tallenna &kaikki" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Tallenna .&diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Vaihda lähdetiedosto kohdetiedostoksi" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Näytä tilastot" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URLia %1 ei voida ladata." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URLia %1 ei ole järjestelmässäsi." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff-asetukset" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Korjaustiedostot" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Tallenna .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Tiedosto on jo olemassa tai se on kirjoitussuojattu; haluatko ylikirjoittaa " +"sen?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Tiedosto on jo olemassa" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Korvaa" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Älä korvaa" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Ajetaan diff-ohjelmaa..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Jäsennetään diff-ohjelman tulosteet..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Verrataan tiedostoa %1 tiedostoon %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Verrataan kansion %1 tiedostoja kansion %2 tiedostoihin" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Näytetään diff-ohjelman tulosteet tiedostosta %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Yhdistetään diff-ohjelman tulosteet tiedostosta %1 tiedostoon %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Yhdistetään diff-ohjelman tulosteet kansiosta %1 kansioon %2" + +#: 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 "" +"Kohdetiedostoon/tiedostoihin on tehty muutoksia.\n" +"Tallennetaanko muutokset?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Tallennetaanko muutokset?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Diff-yhtenäismuoto" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Konteksti" + +#: 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 "Ed-komentotiedosto" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normaali" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Tilastot eivät ole käytettävissä, koska diff-tiedostoa ei ole annettu tai " +"kahta tiedostoa ei ole verrattu." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-tilastot" + +#: 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 "" +"Tilastot:\n" +"\n" +"Vanha tiedosto: %1\n" +"Uusi tiedosto: %2\n" +"\n" +"Muoto: %3\n" +"Palojen määrä: %4\n" +"Eroavuuksien määrä: %5" + +#: 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 "" +"Tilastot:\n" +"\n" +"Tiedostojen määrä diff-tiedostossa: %1\n" +"Muoto: %2\n" +"\n" +"Nykyinen vanha tiedosto: %3\n" +"Nykyinen uusi tiedosto: %4\n" +"\n" +"Palojen määrä: %5\n" +"Eroavuuksien määrä: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Asetukset" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstinäkymä" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Diff-asetukset" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff-asetukset" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Tiedostot" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Tässä voit antaa tiedostot, joita haluat vertailla." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Tässä voit muuttaa tiedostojen vertailun valintoja." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Ulkoasu" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Tässä voit muuttaa näytön asetuksia." @@ -588,8 +505,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Voit valita tässä eri diff-ohjelman. Solaris-järjestelmissä standardi " -"diff-ohjelma ei tue kaikkia GNU-version ominaisuuksia. Tällä voit valita sen " +"Voit valita tässä eri diff-ohjelman. Solaris-järjestelmissä standardi diff-" +"ohjelma ei tue kaikkia GNU-version ominaisuuksia. Tällä voit valita sen " "version." #: libdialogpages/diffpage.cpp:221 @@ -602,9 +519,9 @@ msgstr "Tulostemuoto" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Valitse diffin luoman tulosteen muoto. Yhtenäistetty on useimmin käytetty, " "koska se on erittäin luettava. TDE-kehittäjät pitävät tätä muotoa parhaana. " @@ -614,6 +531,11 @@ msgstr "" msgid "Lines of Context" msgstr "Kontekstirivit" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Kontekstirivien määrä:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -738,16 +660,16 @@ msgstr "Poisjätettävät tiedostomallit" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Jos tämä on valittu, voit antaa shell-mallin oikealla olevassa laatikossa tai " -"valita kohteita luettelosta." +"Jos tämä on valittu, voit antaa shell-mallin oikealla olevassa laatikossa " +"tai valita kohteita luettelosta." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "TÄssä voit antaa tai poistaa shell-malleja tai valita yhden tai useamman " "kohteen luettelosta." @@ -760,20 +682,21 @@ msgstr "Poissuljettavan tiedosto tiedostonimineen" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Jos tämä on valittuna, voit antaa tiedostonimen yhdistelmälaatikossa oikealla." +"Jos tämä on valittuna, voit antaa tiedostonimen yhdistelmälaatikossa " +"oikealla." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Tässä voit antaa kansion poissuljettavan URLin tai tiedoston shell-mallilla " "vertailun aikana." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Keskusteluikkunan jokainen tiedosto, jonka valitset napsauttamalla asetetaan " "keskusteluikkunaan vasemmalle tästä napista." @@ -842,169 +765,274 @@ msgstr "Kirjasin:" msgid "Size:" msgstr "Koko:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Asetukset" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Kirjasin:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Diff-asetukset" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Ota käyttöön muutokset" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff-asetukset" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Kumoa muutokset" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Tallenna &kaikki" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "O&ta käyttöön kaikki" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Tallenna .&diff" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "K&umoa kaikki" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Vaihda lähdetiedosto kohdetiedostoksi" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Näytä tilastot" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URLia %1 ei voida ladata." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URLia %1 ei ole järjestelmässäsi." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Edellinen tiedosto" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff-asetukset" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Seuraava tiedosto" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Korjaustiedostot" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "E&dellinen ero" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Tallenna .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Seu&raava ero" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Tiedosto on jo olemassa tai se on kirjoitussuojattu; haluatko ylikirjoittaa " -"sen?" +"Ei malleja tai ei eroja, tässä tiedostossa: %1, ei ole " +"kelvollinen diff-tiedosto." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Tiedosto on jo olemassa" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Korvaa" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Älä korvaa" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Diff-tiedoston %1 muutosten yhdistämisessä tiedostoon %2 " +"oli ongelmia." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Diff-tiedoston %1 muutosten yhdistämisessä kansioon %2 oli " +"ongelmia." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Ajetaan diff-ohjelmaa..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Väliaikaistiedostoa ei voi avata." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Jäsennetään diff-ohjelman tulosteet..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Väliaikaistiedostoon %1 ei voitu kirjoittaa. Poistetaan se." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Verrataan tiedostoa %1 tiedostoon %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Ei voitu luoda kohdekansiota %1.\n" +"Tiedostoa ei ole talletettu." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Verrataan kansion %1 tiedostoja kansion %2 tiedostoihin" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Väliaikaistiedostoa ei voi kopioida kohteeseen %1. " +"Väliaikaistiedosto on edelleen käytettävissä: %2. Voit kopioida sen " +"oikeaan paikkaan käsin." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Näytetään diff-ohjelman tulosteet tiedostosta %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Diff-tulostetta ei voi jäsentää." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Yhdistetään diff-ohjelman tulosteet tiedostosta %1 tiedostoon %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Tiedostot ovat identtisiä." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Yhdistetään diff-ohjelman tulosteet kansiosta %1 kansioon %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Väliaikaistiedostoon ei voi kirjoittaa." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Kohdetiedostoon/tiedostoihin on tehty muutoksia.\n" -"Tallennetaanko muutokset?" +"Ohjelma tiedostojen välisten erojen tarkastelemiseen ja diff-tiedoston " +"luomiseen." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Tallennetaanko muutokset?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Tämä vertaa URL1:ä URL2:een." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Tilastot eivät ole käytettävissä, koska diff-tiedostoa ei ole annettu tai kahta " -"tiedostoa ei ole verrattu." +"Tämä avaa URL1:n odottaen diff-tulostetta. URL1 voi olla myös '-', jolloin " +"se luetaan standardisyötevirrasta. Voidaan käyttää cvs:lle diff | kompare -o " +"-. Kompare tarkastaa, löytyvätkö alkuperäiset tiedostot ja yhdistää ne diff-" +"tulosteeseen sekä näyttää lopputuloksen. -n poistaa tarkastuksen käytöstä." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-tilastot" +#: 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 "" +"Tämä yhdistää URL2:n URL1:een, URL2:n oletetaan olevan diff-tuloste ja URL1:" +"n tiedosto tai kansio, johon diff-tuloste yhdistetään." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Tilastot:\n" -"\n" -"Vanha tiedosto: %1\n" -"Uusi tiedosto: %2\n" -"\n" -"Muoto: %3\n" -"Palojen määrä: %4\n" -"Eroavuuksien määrä: %5" +"Poistaa käytöstä tarkastuksen automaattiselle alkuperäisten tiedostojen " +"etsinnälle käytettäessä parametria '-' URL:na yhdessä -o parametrin kanssa." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Käytä tätä määritelläksesi koodauksen kun sitä kutsutaan komentoriviltä. Se " +"on oletuksena paikallinen koodaus, jos ei ole määritelty." + +#: 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 ja Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Tekijä" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Komparen kuvaketaiteilija" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Runsaasti hyviä neuvoja" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff-katseluohjelma" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Vertaa näitä tiedostoja tai kansioita" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Tiedostot" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Erot" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Diff-asetukset" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Suorita Diff kansiossa" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Komentorivi" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- lähde kohde" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Asetukset" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Etsi pienempiä muutoksia" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimoi suuria tiedostoja varten" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Älä vertaa kirjainkokoa" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Muuta sarkainmerkit välilyönneiksi" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Älä huomioi lisättyjä tai poistettuja tyhjiä rivejä" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Älä huomioi muutoksia tyhjeissä" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Näytä funktionimet" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Vertaa kansioita rekursiivisesti" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Kohtele uusia tiedostoja tyhjinä" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Muoto" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Vierekkäin" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Tilastot:\n" -"\n" -"Tiedostojen määrä diff-tiedostossa: %1\n" -"Muoto: %2\n" -"\n" -"Nykyinen vanha tiedosto: %3\n" -"Nykyinen uusi tiedosto: %4\n" -"\n" -"Palojen määrä: %5\n" -"Eroavuuksien määrä: %6" diff --git a/tde-i18n-fr/messages/tdesdk/kompare.po b/tde-i18n-fr/messages/tdesdk/kompare.po index 3876ec63ef0..ae7bee0d171 100644 --- a/tde-i18n-fr/messages/tdesdk/kompare.po +++ b/tde-i18n-fr/messages/tdesdk/kompare.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "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: 2005-07-30 04:37+0200\n" "Last-Translator: Matthieu Robin \n" "Language-Team: \n" @@ -28,341 +28,13 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Appli&quer les différences" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Annuler l'application des différence&s" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "App&liquer tout" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Annuler &toutes les modifications" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fichier &précédent" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Fichier &suivant" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Différence p&récédente" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Différence s&uivante" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Aucun modèle ou aucune différence. Le fichier %1 " -"n'est pas un fichier contenant les résultats d'une analyse de différences." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Des problèmes sont apparus lors de l'application du fichier de différences " -"%2 sur le fichier %1." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Des problèmes sont apparus lors de l'application du fichier de différences " -"%1 sur le dossier %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Impossible d'ouvrir un fichier temporaire." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Impossible d'écrire dans le fichier temporaire %1" -", on le supprime." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Impossible de créer le dossier de destination %1.\n" -"Le fichier n'a pu être enregistré." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Impossible d'écraser %1 par le fichier temporaire. Le fichier " -"temporaire reste disponible dans %2 pour une copie manuelle." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Impossible d'analyser les différences." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Les fichiers sont identiques." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Impossible d'écrire dans le fichier temporaire." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Différence" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Exécuter l'analyse des différences dans" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Ligne de commande" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- source destination" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Chercher des modifications moins importantes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimiser pour les grands fichiers" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorer les différences de casse" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Changer les tabulations en espaces" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorer les lignes vides qui ont été ajoutées ou supprimées" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorer les espaces qui ont été ajoutées ou supprimées" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Afficher le nom des fonctions" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Comparer les dossiers récursivement" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Considérer les nouveaux fichiers comme vides" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Contexte" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unifié" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Côte-à-côte" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Nombre de lignes du contexte :" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Kompare est un logiciel permettant de mettre en évidence les différences entre " -"deux fichiers et de générer un fichier correctif (.diff)" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Cette option permet de comparer URL1 avec URL2" - -#: 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 "" -"Cette option permet d'ouvrir URL1 et d'utiliser URL2 pour contenir les " -"résultats de l'analyse des différences. URL1 peut aussi être le caractère « - » " -"afin d'utiliser l'entrée standard. On peut par exemple utiliser cette " -"caractéristique avec la ligne de commande suivante : « cvs diff | kompare -o " -"- ». Kompare vérifie l'existence du fichier original puis fusionne celui-ci " -"avec les résultats de l'analyse des différences. Les résultats sont ensuite " -"affichés à l'écran. L'option « -n » désactive la vérification." - -#: 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 "" -"Cette option permet de fusionner le contenu de URL2 dans URL1. URL2 doit " -"contenir les résultats de l'analyse des différences et URL1 le fichier ou le " -"dossier dans lequel fusionner les données. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Cette option permet de désactiver la vérification de l'existence du ou des " -"fichiers originaux quand on utilise l'option « - » comme URL avec l'option " -"« -o »." - -#: 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 "" -"Cette option permet d'indiquer l'encodage quand vous lancez Kompare. Par " -"défaut, c'est l'encodage local qui est utilisé." - -#: 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 et Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Auteur" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Dessin des icônes de Kompare " - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Quelques bons conseils" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Afficheur de différences pour Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Comparer des fichiers ou des dossiers" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Source" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destination" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Comparer" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Comparer ces fichiers ou dossiers" - -#: 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 "" -"Si vous avez saisi deux noms de fichiers ou deux noms de dossiers dans les " -"champs de cette boîte de dialogue, alors ce bouton sera activé. Lorsque vous " -"cliquerez dessus, il lancera une comparaison des fichiers ou des dossiers qui " -"ont été saisis. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Gilles Caulier,Thibaut Cousin,Yann Verley" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -470,25 +142,52 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Si vous avez saisi dans les champs de cette boîte de dialogue un nom de fichier " -"ou de dossier ainsi que le nom du fichier qui contiendra les résultats de " -"l'analyse des différences, alors ce bouton sera activé. Lorsque vous cliquerez " -"dessus, il ouvrira la fenêtre principale de Kompare, à l'emplacement où le ou " -"les fichiers indiqués doivent être fusionnés avec le résultat de l'analyse des " -"différences. Vous pourrez alors appliquer les différences sur un ou plusieurs " -"de ces fichiers. " - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Comparer ces fichiers ou dossiers" +"Si vous avez saisi dans les champs de cette boîte de dialogue un nom de " +"fichier ou de dossier ainsi que le nom du fichier qui contiendra les " +"résultats de l'analyse des différences, alors ce bouton sera activé. Lorsque " +"vous cliquerez dessus, il ouvrira la fenêtre principale de Kompare, à " +"l'emplacement où le ou les fichiers indiqués doivent être fusionnés avec le " +"résultat de l'analyse des différences. Vous pourrez alors appliquer les " +"différences sur un ou plusieurs de ces fichiers. " -#: kompare_shell.cpp:439 +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Comparer des fichiers ou des dossiers" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Source" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destination" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Comparer" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Comparer ces fichiers ou dossiers" + +#: 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 "" +"Si vous avez saisi deux noms de fichiers ou deux noms de dossiers dans les " +"champs de cette boîte de dialogue, alors ce bouton sera activé. Lorsque vous " +"cliquerez dessus, il lancera une comparaison des fichiers ou des dossiers " +"qui ont été saisis. " + +#: kompare_shell.cpp:439 msgid "Text View" msgstr "Afficher le texte" @@ -583,18 +282,234 @@ msgstr "Inconnu" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Ici vous pouvez saisir les noms des fichiers que vous voulez comparer." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Enre&gistrer tout" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Enregistrer dans un fichier correctif .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Échanger la source et la destination" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Afficher les statistiques" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Impossible de récupérer l'URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Le fichier %1 n'existe pas sur votre système." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Options de comparaison" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Fichiers correctifs" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Enregistrer le fichier correctif « .diff »" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Le fichier existe déjà ou est protégé en écriture ; voulez-vous l'écraser ?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Le fichier existe déjà" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Écraser" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ne pas écraser" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Recherche des différences en cours..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Analyse des différences en cours..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Comparaison du fichier « %1 » avec le fichier « %2 »" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Comparaison des fichiers dans « %1 » avec ceux dans « %2 »" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Affichage de l'analyse des différences de « %1 »" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" +"Fusionner les résultats de l'analyse des différences de « %1 » dans le " +"fichier « %2 »" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "" +"Fusionner les résultats de l'analyse des différences de « %1 » dans le " +"dossier « %2 »" + +#: 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 "" +"Vous avez modifié le(s) fichier(s) de destination.\n" +"Voulez-vous enregistrer ces modifications ?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Enregistrer les modifications ?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unifié" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contexte" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Aucun fichier correctif n'a été choisi, ou alors vous n'avez pas spécifié " +"les deux fichiers à comparer. Aucune statistique n'est disponible." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistiques de comparaison" + +#: 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 "" +"Statistiques :\n" +"\n" +"Ancien fichier : %1\n" +"Nouveau fichier : %2\n" +"\n" +"Format : %3\n" +"Nombre de différences majeures : %4\n" +"Nombre de différences : %5" + +#: 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 "" +"Statistiques :\n" +"\n" +"Nombre de fichiers dans le fichier correctif : %1\n" +"Format : %2\n" +"\n" +"Ancien fichier courant : %3\n" +"Nouveau fichier courant : %4\n" +"\n" +"Nombre de blocs de différences : %5\n" +"Nombre de différences : %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Préférences" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Afficher le texte" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Options d'affichage" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Analyse des différences" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Options de comparaison" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "Fichier&s" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Ici vous pouvez saisir les noms des fichiers que vous voulez comparer." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Ici vous pouvez changer les options de comparaison des fichiers." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Appa&rence" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Ici vous pouvez changer les options d'affichage." @@ -609,9 +524,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Ici, vous pouvez sélectionner un autre utilitaire de différence. Par exemple, " -"sur Solaris, le programme standard diff n'accepte pas toutes les options de la " -"version GNU, et ici, vous pouvez sélectionner le bon programme." +"Ici, vous pouvez sélectionner un autre utilitaire de différence. Par " +"exemple, sur Solaris, le programme standard diff n'accepte pas toutes les " +"options de la version GNU, et ici, vous pouvez sélectionner le bon programme." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -623,9 +538,9 @@ msgstr "Format de sortie" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Sélectionnez le format de sortie généré par diff. Le format unifié est celui " "qui est le plus fréquent, car il est le plus lisible. Les développeurs TDE " @@ -635,6 +550,11 @@ msgstr "" msgid "Lines of Context" msgstr "Lignes du contexte" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Nombre de lignes du contexte :" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -691,8 +611,8 @@ msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" -"Ajoutez ici l'expression rationnelle que vous voulez utiliser pour ignorer les " -"lignes correspondantes." +"Ajoutez ici l'expression rationnelle que vous voulez utiliser pour ignorer " +"les lignes correspondantes." #: libdialogpages/diffpage.cpp:294 msgid "&Edit..." @@ -760,19 +680,19 @@ msgstr "Filtre des fichiers à exclure" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Si ceci est sélectionné, vous pouvez saisir un filtre dans la boîte d'édition à " -"droite ou sélectionner des entrées dans la liste." +"Si ceci est sélectionné, vous pouvez saisir un filtre dans la boîte " +"d'édition à droite ou sélectionner des entrées dans la liste." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Ici vous pouvez ajouter ou enlever un filtre, ou sélectionner une ou plusieurs " -"entrées de la liste." +"Ici vous pouvez ajouter ou enlever un filtre, ou sélectionner une ou " +"plusieurs entrées de la liste." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -787,16 +707,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Les URL ou noms de fichiers rentrés ici seront ignorés lors de la comparaison " -"des dossiers." +"Les URL ou noms de fichiers rentrés ici seront ignorés lors de la " +"comparaison des dossiers." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Tous les fichiers sélectionnés dans la boîte de dialogue qui s'affiche quand " "vous cliquez seront mis dans la boîte de dialogue à gauche de ce bouton." @@ -865,172 +785,279 @@ msgstr "Police :" msgid "Size:" msgstr "Taille :" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Préférences" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Options d'affichage" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Police :" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Options de comparaison" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Appli&quer les différences" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Enre&gistrer tout" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Annuler l'application des différence&s" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Enregistrer dans un fichier correctif .&diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "App&liquer tout" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Échanger la source et la destination" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Annuler &toutes les modifications" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Afficher les statistiques" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fichier &précédent" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Impossible de récupérer l'URL %1." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Fichier &suivant" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Le fichier %1 n'existe pas sur votre système." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Différence p&récédente" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Options de comparaison" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Différence s&uivante" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Fichiers correctifs" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Aucun modèle ou aucune différence. Le fichier %1 n'est pas un " +"fichier contenant les résultats d'une analyse de différences." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Enregistrer le fichier correctif « .diff »" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Des problèmes sont apparus lors de l'application du fichier de " +"différences %2 sur le fichier %1." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -"Le fichier existe déjà ou est protégé en écriture ; voulez-vous l'écraser ?" +"Des problèmes sont apparus lors de l'application du fichier de " +"différences %1 sur le dossier %2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Le fichier existe déjà" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Impossible d'ouvrir un fichier temporaire." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Écraser" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Impossible d'écrire dans le fichier temporaire %1, on le supprime." +"" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ne pas écraser" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Impossible de créer le dossier de destination %1.\n" +"Le fichier n'a pu être enregistré." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Impossible d'écraser %1 par le fichier temporaire. Le fichier " +"temporaire reste disponible dans %2 pour une copie manuelle." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Recherche des différences en cours..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Impossible d'analyser les différences." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Analyse des différences en cours..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Les fichiers sont identiques." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Comparaison du fichier « %1 » avec le fichier « %2 »" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Impossible d'écrire dans le fichier temporaire." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Comparaison des fichiers dans « %1 » avec ceux dans « %2 »" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Kompare est un logiciel permettant de mettre en évidence les différences " +"entre deux fichiers et de générer un fichier correctif (.diff)" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Affichage de l'analyse des différences de « %1 »" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Cette option permet de comparer URL1 avec URL2" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: 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 "" -"Fusionner les résultats de l'analyse des différences de « %1 » dans le fichier " -"« %2 »" +"Cette option permet d'ouvrir URL1 et d'utiliser URL2 pour contenir les " +"résultats de l'analyse des différences. URL1 peut aussi être le caractère « -" +" » afin d'utiliser l'entrée standard. On peut par exemple utiliser cette " +"caractéristique avec la ligne de commande suivante : « cvs diff | kompare -o " +"- ». Kompare vérifie l'existence du fichier original puis fusionne celui-ci " +"avec les résultats de l'analyse des différences. Les résultats sont ensuite " +"affichés à l'écran. L'option « -n » désactive la vérification." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -"Fusionner les résultats de l'analyse des différences de « %1 » dans le dossier " -"« %2 »" +"Cette option permet de fusionner le contenu de URL2 dans URL1. URL2 doit " +"contenir les résultats de l'analyse des différences et URL1 le fichier ou le " +"dossier dans lequel fusionner les données. " -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:42 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Vous avez modifié le(s) fichier(s) de destination.\n" -"Voulez-vous enregistrer ces modifications ?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Enregistrer les modifications ?" +"Cette option permet de désactiver la vérification de l'existence du ou des " +"fichiers originaux quand on utilise l'option « - » comme URL avec l'option " +"« -o »." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Aucun fichier correctif n'a été choisi, ou alors vous n'avez pas spécifié les " -"deux fichiers à comparer. Aucune statistique n'est disponible." +"Cette option permet d'indiquer l'encodage quand vous lancez Kompare. Par " +"défaut, c'est l'encodage local qui est utilisé." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistiques de comparaison" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: 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 "" -"Statistiques :\n" -"\n" -"Ancien fichier : %1\n" -"Nouveau fichier : %2\n" -"\n" -"Format : %3\n" -"Nombre de différences majeures : %4\n" -"Nombre de différences : %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh et Otto Bruggeman" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Auteur" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Dessin des icônes de Kompare " + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Quelques bons conseils" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Afficheur de différences pour Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Comparer ces fichiers ou dossiers" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Fichier&s" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Différence" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Options d'affichage" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Exécuter l'analyse des différences dans" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Ligne de commande" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&ptions" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Chercher des modifications moins importantes" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimiser pour les grands fichiers" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorer les différences de casse" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Changer les tabulations en espaces" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorer les lignes vides qui ont été ajoutées ou supprimées" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorer les espaces qui ont été ajoutées ou supprimées" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Afficher le nom des fonctions" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Comparer les dossiers récursivement" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Considérer les nouveaux fichiers comme vides" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Côte-à-côte" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistiques :\n" -"\n" -"Nombre de fichiers dans le fichier correctif : %1\n" -"Format : %2\n" -"\n" -"Ancien fichier courant : %3\n" -"Nouveau fichier courant : %4\n" -"\n" -"Nombre de blocs de différences : %5\n" -"Nombre de différences : %6" diff --git a/tde-i18n-ga/messages/tdesdk/kompare.po b/tde-i18n-ga/messages/tdesdk/kompare.po index fcf86f462ee..7692f058018 100644 --- a/tde-i18n-ga/messages/tdesdk/kompare.po +++ b/tde-i18n-ga/messages/tdesdk/kompare.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 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-12-03 14:52-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: ga \n" @@ -10,308 +10,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Cuir Difríocht i bh&Feidhm" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "&Cuir Gach Ceann i bhFeidhm" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "An Comhad &Roimhe Seo" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "An Chéad Chomhad &Eile" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "An Difríocht Roimhe &Seo" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "An &Chéad Difríocht Eile" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Ní féidir comhad sealadach a oscailt." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Ní féidir an t-aschur diff a pharsáil." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Is ionann iad na comhaid seo." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Níorbh fhéidir scríobh sa chomhad sealadach." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Difríocht" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Rith Diff I" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Ainm Orduithe" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- foinse sprioc" - -#. 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 "Optamaigh le haghaidh comhad mór" - -#. 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 "Taispeáin ainmneacha feidhme" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Cuir comhadlanna i gcomparáid go hathchúrsach" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Caith le comhaid nua mar chomhaid fholmha" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formáid" - -#. 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 "Comhthéacs" - -#. 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 "Ed" - -#. 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 "Gnách" - -#. 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 "Aontaithe" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Taobh le taobh" - -#. 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 "Cuir URL1 i gcomparáid le URL2" - -#: 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 "© 2001-2004, John Firebaugh agus Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Údar" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Go leor comhairle maith" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Amharcán diff Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Cuir Comhaid nó Comhadlanna i gcomparáid le chéile" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Foinse" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Ceann Scríbe" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Cuir i gComparáid" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Cuir na comhaid seo, nó na comhadlanna seo, i gcomparáid le chéile" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Séamus Ó Ciardhuáin,Kevin Scannell" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -429,17 +134,40 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Cuir Comhaid nó Comhadlanna i gcomparáid le chéile" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Foinse" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Ceann Scríbe" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Cuir i gComparáid" + #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Cuir na comhaid/comhadlanna i gcomparáid le chéile" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Amharc Téacs" @@ -538,18 +266,228 @@ msgstr "Anaithnid" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "" - +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Sábháil Uile" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Sábháil .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Malartaigh Foinse agus Sprioc" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Taispeáin Staitisticí" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Ní féidir URL %1 a íosluchtú." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Níor aimsíodh URL %1 ar do chóras." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Roghanna Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Comhaid Phaiste" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Sábháil .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Tá an comhad ann cheana, nó is scríobh-bhactha é; an mian leat scríobh air?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Tá an comhad ann" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Forscríobh" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ná Forscríobh" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "diff á rith..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Aschur diff á pharsáil..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ag cur comhad %1 i gcomparáid le comhad %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ag cur na gcomhad i %1 leis na comhaid i %2" + +#: 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 "" +"Athraíodh an/na sprioc-chomha(i)d.\n" +"Ar mhaith leat do chuid athruithe a shábháil?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Sábháil Athruithe?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Aontaithe" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Comhthéacs" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Gnách" + +#: 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 "Staitistic Diff" + +#: 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 "" +"Staitistic:\n" +"\n" +"Seanchomhad: %1\n" +"Comhad nua: %2\n" +"\n" +"Formáid: %3\n" +"Líon na gcantaí: %4\n" +"Líon na ndifríochtaí: %5" + +#: 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 "" +"Staitistic:\n" +"\n" +"Líon na gcomhad i gcomhad diff: %1\n" +"Formáid: %2\n" +"\n" +"Seanchomhad reatha: %3\n" +"Comhad nua reatha: %4\n" +"\n" +"Líon na gcantaí: %5\n" +"Líon na ndifríochtaí: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Sainroghanna" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Amharc Téacs" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Socruithe Amhairc" + #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Socruithe Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Comhaid" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "C&uma" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -575,15 +513,20 @@ msgstr "Formáid an Aschuir" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -701,14 +644,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -722,14 +665,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -796,166 +739,250 @@ msgstr "Cló:" msgid "Size:" msgstr "Méid:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Sainroghanna" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Socruithe Amhairc" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Cló:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Socruithe Diff" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Cuir Difríocht i bh&Feidhm" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Sábháil Uile" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Sábháil .&diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "&Cuir Gach Ceann i bhFeidhm" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Malartaigh Foinse agus Sprioc" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Taispeáin Staitisticí" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "An Comhad &Roimhe Seo" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Ní féidir URL %1 a íosluchtú." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "An Chéad Chomhad &Eile" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Níor aimsíodh URL %1 ar do chóras." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "An Difríocht Roimhe &Seo" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Roghanna Diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "An &Chéad Difríocht Eile" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Comhaid Phaiste" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Sábháil .diff" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -"Tá an comhad ann cheana, nó is scríobh-bhactha é; an mian leat scríobh air?" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Tá an comhad ann" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Ní féidir comhad sealadach a oscailt." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Forscríobh" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ná Forscríobh" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "diff á rith..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Ní féidir an t-aschur diff a pharsáil." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Aschur diff á pharsáil..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Is ionann iad na comhaid seo." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Ag cur comhad %1 i gcomparáid le comhad %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Níorbh fhéidir scríobh sa chomhad sealadach." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Ag cur na gcomhad i %1 leis na comhaid i %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Cuir URL1 i gcomparáid le URL2" + +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Athraíodh an/na sprioc-chomha(i)d.\n" -"Ar mhaith leat do chuid athruithe a shábháil?" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Sábháil Athruithe?" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "© 2001-2004, John Firebaugh agus Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Údar" + +#: main.cpp:57 +msgid "Kompare icon artist" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Staitistic Diff" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Go leor comhairle maith" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Amharcán diff Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Cuir na comhaid seo, nó na comhadlanna seo, i gcomparáid le chéile" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Comhaid" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Difríocht" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Socruithe Amhairc" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Rith Diff I" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Ainm Orduithe" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- foinse sprioc" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "R&oghanna" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" msgstr "" -"Staitistic:\n" -"\n" -"Seanchomhad: %1\n" -"Comhad nua: %2\n" -"\n" -"Formáid: %3\n" -"Líon na gcantaí: %4\n" -"Líon na ndifríochtaí: %5" -#: 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" +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optamaigh le haghaidh comhad mór" + +#: 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 "Taispeáin ainmneacha feidhme" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Cuir comhadlanna i gcomparáid go hathchúrsach" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Caith le comhaid nua mar chomhaid fholmha" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formáid" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Taobh le taobh" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Staitistic:\n" -"\n" -"Líon na gcomhad i gcomhad diff: %1\n" -"Formáid: %2\n" -"\n" -"Seanchomhad reatha: %3\n" -"Comhad nua reatha: %4\n" -"\n" -"Líon na gcantaí: %5\n" -"Líon na ndifríochtaí: %6" diff --git a/tde-i18n-gl/messages/tdesdk/kompare.po b/tde-i18n-gl/messages/tdesdk/kompare.po index 1b0fcfb4191..9ab3b9fe402 100644 --- a/tde-i18n-gl/messages/tdesdk/kompare.po +++ b/tde-i18n-gl/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "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: 2007-02-11 18:46+0100\n" "Last-Translator: mvillarino \n" "Language-Team: Galician \n" @@ -14,336 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplicar a diferenza" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "I&gnorar a diferenza" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&licar todo" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Ignorar t&odo" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fichei&ro anterior" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Seguinte ficheiro" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Diferenza &anterior" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Seguinte diferenza" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Non existen modelos nen diferenzas, este ficheiro: %1" -", non é un ficheiro de \"diff\" válido." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Aconteceron problemas ao aplicar as diferenzas %1 ao ficheiro " -"%2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Aconteceron problemas ao aplicar as diferenzas %1 ao cartafol " -"%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Non foi posíbel aceder a un ficheiro temporal." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Non foi posíbel guardar no ficheiro temporal %1, a borralo." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Non foi posíbel criar o cartafol de destino %1.\n" -"O ficheiro non foi guardado." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Non foi posíbel enviar o ficheiro temporal para a localización de destino " -"%1. O ficheiro temporal aínda está disponíbel en: %2" -". Pode copialo manualmente para a localización correcta." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Non foi posíbel procesar a saída de diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Os ficheiros son idénticos." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Non foi posíbel escribir no ficheiro temporal." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Diferenza" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Executar diff en" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Liña de comandos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- orixinal destino" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Procurar modificacións menores" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizar para ficheiros grandes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorar as mudanzas de capitalización" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expandir as tabulacións como espazos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorar as liñas en branco engadidas ou eliminadas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorar as modificacións de espazos en branco" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostrar os nomes das funcións" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Comparar recursivamente os cartafoles" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratar os ficheiros novos como vacíos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formato" - -#. 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 "Contexto" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unificado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Lado-a-lado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Número de liñas de contexto:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Un programa para ver as diferenzas entre ficheiros e para xerar opcionalmente " -"un ficheiro \"diff\"" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Isto comparará URL1 con URL2" - -#: 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 "" -"Isto abrirá URL1 como se fose a saída de \"diff\". URL1 támen pode ser un " -"\"-\", nese caso lerá a entrada estándar. Pode ser usado, por exemplo, para cvs " -"diff | kompare -o -. Kompare fará unha verificación para confirmar se pode " -"atopar os ficheiros orixinais e entón fusionará os mesmos no resultado de " -"\"diff\" e mostrará o resultado no visor. A opción -n desactiva a verificación." - -#: 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 "" -"Isto fusionará URL2 en URL1. URL2 deber ser unha saída de \"diff\" e URL1 o " -"ficheiro ou cartafol onde debe ser fundida a saída de \"diff\". " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Desactiva a verificación para procurar automaticamente os ficheiros orixinais " -"ao usar \"-\" como URL coa opción -o." - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" -"Use isto para seleccionar a codificación cando o invoca desde a liña de " -"comandos. Usará a codificación local por omisión." - -#: 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 e Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Artista dos ícones de Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Moitos bons consellos" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visor de \"diff\" de Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Comparar ficheiros ou cartafoles" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Orixe" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destino" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Comparar" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Comparar estes ficheiros ou cartafoles" - -#: 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 "" -"Se indicou 2 ficheiros ou 2 cartafoles nos campos deste diálogo, entón este " -"botón estará activo e, se preme nel iniciará unha comparación dos ficheiros ou " -"cartafoles indicados. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "mvillarino" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -449,25 +126,51 @@ msgstr "Fusionar este ficheiro ou cartafol coa saída de \"diff\"" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Se indicou nos campos deste diálogo un ficheiro ou un cartafol, ademais dun " -"ficheiro que contén a saída de \"diff\", entón este botón estará activado e, se " -"preme nel abrira a fiestra principal de Kompare, onde será misturada a saída do " -"ficheiro ou ficheiros introducidos co resultado de \"diff\", para que poda " -"entón aplicar as diferenzas a un ficheiro ou aos ficheiros. " - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Comparar estes ficheiros ou cartafoles" +"ficheiro que contén a saída de \"diff\", entón este botón estará activado e, " +"se preme nel abrira a fiestra principal de Kompare, onde será misturada a " +"saída do ficheiro ou ficheiros introducidos co resultado de \"diff\", para " +"que poda entón aplicar as diferenzas a un ficheiro ou aos ficheiros. " -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Vista de texto" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Comparar ficheiros ou cartafoles" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Orixe" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destino" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Comparar" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Comparar estes ficheiros ou cartafoles" + +#: 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 "" +"Se indicou 2 ficheiros ou 2 cartafoles nos campos deste diálogo, entón este " +"botón estará activo e, se preme nel iniciará unha comparación dos ficheiros " +"ou cartafoles indicados. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Vista de texto" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -560,18 +263,230 @@ msgstr "Descoñecido" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Aquí pode indicar os ficheiros que desexa comparar." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Gu&ardar todo" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Guardar o .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Trocar a orixe e o destino" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostrar as estatísticas" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Non foi posíbel obter o URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "O URL %1 non existe no seu sistema." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opcións de Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Ficheiros de parches" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Guardar o .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"O ficheiro xa existe ou está protexido contra escrita; desexa sobrescrebelo?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "O ficheiro xa existe" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sobrescreber" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Non sobrescreber" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "A executar diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "A procesar o resultado de diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "A comparar o ficheiro %1 con %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "A comparar os ficheiros en %1 cos de %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "A ver o resultado de diff de %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "A fusionar o resultado de diff de %1 no ficheiro %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "A fusionar o resultado de diff de %1 no cartafol %2" + +#: 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 "" +"Fixo cambios no(s) ficheiro(s) de destino.\n" +"Desexa guardalos?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Guardar os cambios?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificado" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contexto" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Non existe o ficheiro \"diff\" ou non foron comparados 2 ficheiros. Polo " +"tanto non hai estatísticas disponíbeis." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Estatísticas de Diff" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Ficheiro antigo: %1\n" +"Ficheiro novo: %2\n" +"\n" +"Formato: %3\n" +"Número de bloques: %4\n" +"Número de diferenzas: %5" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Número de ficheiros no ficheiro diff: %1\n" +"Formato: %2\n" +"\n" +"Ficheiro antigo: %3\n" +"Ficheiro novo: %4\n" +"\n" +"Número de bloques: %5\n" +"Número de diferenzas: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferencias" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Vista de texto" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Configuración da vista" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diferenzas" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Configuración de Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Ficheiros" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Aquí pode indicar os ficheiros que desexa comparar." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Aquí pode modificar as opcións para comparar os ficheiros." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "A&parencia" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Aquí pode modificar as opcións para a vista." @@ -600,9 +515,9 @@ msgstr "Formato de saída" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Escolla o formato do resultado de \"diff\". \"Unificado\" é o máis usado por " "ser bastante lexíbel. Os programadores de TDE gostan deste formato por ser o " @@ -612,6 +527,11 @@ msgstr "" msgid "Lines of Context" msgstr "Liñas de contexto" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Número de liñas de contexto:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -736,16 +656,16 @@ msgstr "Padrón de ficheiros a excluír" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Se esta opción estivese sinala, poderá indicar un padrón no campo de texto á " "dereita ou seleccionar os itens da lista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Aquí pode introducir ou borrar un padrón ou seleccionar un ou máis itens da " "lista." @@ -762,19 +682,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Aquí pode introducir o URL dun ficheiro con padróns de nomes a ignorar durante " -"a comparación de cartafoles." +"Aquí pode introducir o URL dun ficheiro con padróns de nomes a ignorar " +"durante a comparación de cartafoles." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Todos os ficheiros que seleccione no diálogo que aparece cando preme nela serán " -"postos no diálogo á esquerda deste botón." +"Todos os ficheiros que seleccione no diálogo que aparece cando preme nela " +"serán postos no diálogo á esquerda deste botón." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -840,168 +760,276 @@ msgstr "Tipo de letra:" msgid "Size:" msgstr "Tamaño:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferencias" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Tipo de letra:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Configuración da vista" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplicar a diferenza" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Configuración de Diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "I&gnorar a diferenza" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Gu&ardar todo" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&licar todo" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Guardar o .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Ignorar t&odo" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Trocar a orixe e o destino" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostrar as estatísticas" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Non foi posíbel obter o URL %1." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "O URL %1 non existe no seu sistema." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fichei&ro anterior" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opcións de Diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Seguinte ficheiro" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Ficheiros de parches" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Diferenza &anterior" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Guardar o .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Seguinte diferenza" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"O ficheiro xa existe ou está protexido contra escrita; desexa sobrescrebelo?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "O ficheiro xa existe" +"Non existen modelos nen diferenzas, este ficheiro: %1, non é un " +"ficheiro de \"diff\" válido." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sobrescreber" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Non sobrescreber" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Aconteceron problemas ao aplicar as diferenzas %1 ao ficheiro " +"%2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Aconteceron problemas ao aplicar as diferenzas %1 ao cartafol " +"%2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "A executar diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Non foi posíbel aceder a un ficheiro temporal." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "A procesar o resultado de diff..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Non foi posíbel guardar no ficheiro temporal %1, a borralo." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "A comparar o ficheiro %1 con %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Non foi posíbel criar o cartafol de destino %1.\n" +"O ficheiro non foi guardado." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "A comparar os ficheiros en %1 cos de %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Non foi posíbel enviar o ficheiro temporal para a localización de " +"destino %1. O ficheiro temporal aínda está disponíbel en: %2. " +"Pode copialo manualmente para a localización correcta." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "A ver o resultado de diff de %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Non foi posíbel procesar a saída de diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "A fusionar o resultado de diff de %1 no ficheiro %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Os ficheiros son idénticos." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "A fusionar o resultado de diff de %1 no cartafol %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Non foi posíbel escribir no ficheiro temporal." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Fixo cambios no(s) ficheiro(s) de destino.\n" -"Desexa guardalos?" +"Un programa para ver as diferenzas entre ficheiros e para xerar " +"opcionalmente un ficheiro \"diff\"" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Guardar os cambios?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Isto comparará URL1 con URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Non existe o ficheiro \"diff\" ou non foron comparados 2 ficheiros. Polo tanto " -"non hai estatísticas disponíbeis." +"Isto abrirá URL1 como se fose a saída de \"diff\". URL1 támen pode ser un \"-" +"\", nese caso lerá a entrada estándar. Pode ser usado, por exemplo, para cvs " +"diff | kompare -o -. Kompare fará unha verificación para confirmar se pode " +"atopar os ficheiros orixinais e entón fusionará os mesmos no resultado de " +"\"diff\" e mostrará o resultado no visor. A opción -n desactiva a " +"verificación." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Estatísticas de Diff" +#: 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 "" +"Isto fusionará URL2 en URL1. URL2 deber ser unha saída de \"diff\" e URL1 o " +"ficheiro ou cartafol onde debe ser fundida a saída de \"diff\". " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estatísticas:\n" -"\n" -"Ficheiro antigo: %1\n" -"Ficheiro novo: %2\n" -"\n" -"Formato: %3\n" -"Número de bloques: %4\n" -"Número de diferenzas: %5" +"Desactiva a verificación para procurar automaticamente os ficheiros " +"orixinais ao usar \"-\" como URL coa opción -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Use isto para seleccionar a codificación cando o invoca desde a liña de " +"comandos. Usará a codificación local por omisión." + +#: 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 e Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Artista dos ícones de Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Moitos bons consellos" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visor de \"diff\" de Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Comparar estes ficheiros ou cartafoles" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Ficheiros" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Diferenza" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Configuración da vista" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Executar diff en" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Liña de comandos" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- orixinal destino" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pcións" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Procurar modificacións menores" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizar para ficheiros grandes" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorar as mudanzas de capitalización" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expandir as tabulacións como espazos" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorar as liñas en branco engadidas ou eliminadas" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorar as modificacións de espazos en branco" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostrar os nomes das funcións" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Comparar recursivamente os cartafoles" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratar os ficheiros novos como vacíos" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formato" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Lado-a-lado" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estatísticas:\n" -"\n" -"Número de ficheiros no ficheiro diff: %1\n" -"Formato: %2\n" -"\n" -"Ficheiro antigo: %3\n" -"Ficheiro novo: %4\n" -"\n" -"Número de bloques: %5\n" -"Número de diferenzas: %6" diff --git a/tde-i18n-hi/messages/tdesdk/kompare.po b/tde-i18n-hi/messages/tdesdk/kompare.po index 3fbad46dc09..afc12b3df46 100644 --- a/tde-i18n-hi/messages/tdesdk/kompare.po +++ b/tde-i18n-hi/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "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: 2004-08-24 13:32+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: Hindi \n" @@ -14,320 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "भिन्नताएँ लागू करें (&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "भिन्नताएँ लागू नहीं करें (&a)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "सभी लागू करें (&l)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "सभी लागू नहीं करें (&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "पिछली फ़ाइल (&r)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "अगली फ़ाइल (&e)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "पिछली भिन्नता (&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "अगली भिन्नता (&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"कोई मॉडल नहीं या कोई भिन्नता नहीं, यह फ़ाइल: %1, एक वैध डिफ़ फ़ाइल नहीं है" - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "डिफ़ (%1) को फ़ाइल (%2) पर लागू करने में समस्या आई." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "डिफ़ (%1) को फ़ोल्डर (%2) पर लागू करने में समस्या आई." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "अस्थायी फ़ाइल खोल नहीं सकते." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." - -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "डिफ़ आउटपुट पार्से नहीं कर सका." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "फ़ाइलें एक जैसी हैं." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "भिन्नता (&D)" - -#. 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 "cd dir && diff -udHprNa -- स्रोत गंतव्य" - -#. 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 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"एक प्रोग्राम जो फ़ाइलों के बीच भिन्नताओं को देखता है तथा वैकल्पिक रूप से डिफ़ " -"तैयार करता है." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "यह यूआरएल1 को यूआरएल2 के साथ तुलना करता है." - -#: 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 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, जॉन फायरबॉग तथा ओटो ब्रगमेन" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "लेखक" - -#: main.cpp:57 -#, fuzzy -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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "रविशंकर श्रीवास्तव" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -439,24 +132,47 @@ msgstr "इस फ़ाइल या फ़ोल्डर को डिफ़ #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "इन फ़ाइलों या फ़ोल्डरों की तुलना करें" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "फ़ाइलों या फ़ोल्डरों में तुलना करें" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "पाठ दृश्य" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "स्रोत" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "स्रोत फ़ोल्डर" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "गंतव्य" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "तुलना करें" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "इन फ़ाइलों या फ़ोल्डरों की तुलना करें" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "पाठ दृश्य" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "स्रोत फ़ोल्डर" #: komparenavtreepart/komparenavtreepart.cpp:66 msgid "Destination Folder" @@ -539,18 +255,232 @@ msgstr "अज्ञात" msgid "KompareNavTreePart" msgstr "कॉम्पेयर-नेव-ट्री-पार्ट" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "सभी सहेजें (&A)" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "सहेजें .&diff" + +#: 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 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr "यूआरएल %1 डाउनलोड नहीं किया जा सकता." + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "The URL %1 does not exist on your system." +msgstr "यूआरएल %1 आपके तंत्र पर मौज़ूद नहीं है." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "डिफ विकल्प" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|पैच फ़ाइलें" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "सहेजें .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 "" + +#: 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 "फ़ाइल %1 को फ़ाइल %2 से तुलना किया जा रहा है" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "फ़ाइलों को %1 में से %2 की फ़ाइलों से तुलना किया जा रहा है" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 से डिफ़ आउटपुट देख रहे" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "डिफ़ आउटपुट %1 से फ़ाइल %2 में ब्लैंड किया जा रहा है" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "डिफ़ आउटपुट %1 से फ़ोल्डर %2 में ब्लैंड किया जा रहा है" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"आपने गंतव्य में परिवर्तन किए हैं.\n" +"क्या आप इसे सहेजना चाहते हैं?" + +#: 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 "कोई डिफ़ फ़ाइल नहीं, या कोई 2 फ़ाइलें डिफ़्ड नहीं. अतः कोई आंकड़े उपलब्ध नहीं." + +#: 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 "" +"आंकड़े:\n" +"\n" +"पुरानी फ़ाइल: %1\n" +"नई फ़ाइल: %2\n" +"\n" +"फ़ार्मेट: %3\n" +"हंक्स की संख्या: %4\n" +"भिन्नताओं की संख्या: %5" + +#: 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 "" +"आंकड़े:\n" +"\n" +"डिफ़ फ़ाइल में फ़ाइलों की संख्या: %1\n" +"फ़ार्मेट: %2\n" +"\n" +"मौज़ूदा पुरानी फ़ाइल: %3\n" +"मौज़ूदा नई फ़ाइल: %4\n" +"\n" +"हंक्स की संख्या: %5\n" +"भिन्नताओं की संख्या: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "प्राथमिकताएँ" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "पाठ दृश्य" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "दृश्य विन्यास" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "डिफ" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "डिफ विन्यास" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "अगली फ़ाइल (&e)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "शक्ल-सूरत (&p)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -576,15 +506,20 @@ msgstr "आउटपुट फॉर्मेट" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "कॉन्टेक्स्ट की पंक्तियाँ" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "कॉन्टेक्स्ट पंक्तियोँ की संख्याः" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -705,14 +640,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -726,14 +661,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -801,174 +736,262 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "प्राथमिकताएँ" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "दृश्य विन्यास" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "डिफ विन्यास" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "भिन्नताएँ लागू करें (&A)" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "सभी सहेजें (&A)" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "भिन्नताएँ लागू नहीं करें (&a)" -#: komparepart/kompare_part.cpp:168 -#, fuzzy -msgid "Save .&diff..." -msgstr "सहेजें .&diff" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "सभी लागू करें (&l)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "स्रोत तथा गंतव्य अदला-बदली करें" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "सभी लागू नहीं करें (&U)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "आंकड़े दिखाएँ" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "पिछली फ़ाइल (&r)" -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "अगली फ़ाइल (&e)" + +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "पिछली भिन्नता (&P)" + +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "अगली भिन्नता (&N)" + +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 #, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr "यूआरएल %1 डाउनलोड नहीं किया जा सकता." +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "कोई मॉडल नहीं या कोई भिन्नता नहीं, यह फ़ाइल: %1, एक वैध डिफ़ फ़ाइल नहीं है" -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:246 #, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr "यूआरएल %1 आपके तंत्र पर मौज़ूद नहीं है." +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "डिफ़ (%1) को फ़ाइल (%2) पर लागू करने में समस्या आई." -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "डिफ विकल्प" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "डिफ़ (%1) को फ़ोल्डर (%2) पर लागू करने में समस्या आई." -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "अस्थायी फ़ाइल खोल नहीं सकते." + +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|पैच फ़ाइलें" +msgid "Could not write to the temporary file %1, deleting it." +msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "सहेजें .diff" +#: libdiff2/komparemodellist.cpp:368 +#, fuzzy +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: 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 "अस्थायी फ़ाइल पर लिख नहीं सका." + +#: main.cpp:33 +#, fuzzy +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" +"एक प्रोग्राम जो फ़ाइलों के बीच भिन्नताओं को देखता है तथा वैकल्पिक रूप से डिफ़ तैयार करता है." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "यह यूआरएल1 को यूआरएल2 के साथ तुलना करता है." + +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: 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 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, जॉन फायरबॉग तथा ओटो ब्रगमेन" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "लेखक" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" msgstr "काम्पेयर-पार्ट" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "डिफ चला रहे..." +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "बहुत से अच्छे परामर्श" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "डिफ़ आउटपुट पारसिंग कर रहे..." +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "सर्विसिया डिफ़ प्रदर्शक" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "फ़ाइल %1 को फ़ाइल %2 से तुलना किया जा रहा है" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "इन फ़ाइलों या फ़ोल्डर में तुलना करें" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "फ़ाइलों को %1 में से %2 की फ़ाइलों से तुलना किया जा रहा है" +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "अगली फ़ाइल (&e)" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 से डिफ़ आउटपुट देख रहे" +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "भिन्नता (&D)" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "डिफ़ आउटपुट %1 से फ़ाइल %2 में ब्लैंड किया जा रहा है" +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "दृश्य विन्यास" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "डिफ़ आउटपुट %1 से फ़ोल्डर %2 में ब्लैंड किया जा रहा है" +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "डिफ़ इसमें चलाएँ" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy -msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"आपने गंतव्य में परिवर्तन किए हैं.\n" -"क्या आप इसे सहेजना चाहते हैं?" +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "कमांड लाइन" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "परिवर्तन सहेजें?" +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- स्रोत गंतव्य" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"कोई डिफ़ फ़ाइल नहीं, या कोई 2 फ़ाइलें डिफ़्ड नहीं. अतः कोई आंकड़े उपलब्ध नहीं." +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "विकल्प (&p)" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "डिफ आंकड़े" +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +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 "" -"आंकड़े:\n" -"\n" -"पुरानी फ़ाइल: %1\n" -"नई फ़ाइल: %2\n" -"\n" -"फ़ार्मेट: %3\n" -"हंक्स की संख्या: %4\n" -"भिन्नताओं की संख्या: %5" +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +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" +#: 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 "" -"आंकड़े:\n" -"\n" -"डिफ़ फ़ाइल में फ़ाइलों की संख्या: %1\n" -"फ़ार्मेट: %2\n" -"\n" -"मौज़ूदा पुरानी फ़ाइल: %3\n" -"मौज़ूदा नई फ़ाइल: %4\n" -"\n" -"हंक्स की संख्या: %5\n" -"भिन्नताओं की संख्या: %6" #~ msgid "%1" #~ msgstr "%1" diff --git a/tde-i18n-hr/messages/tdesdk/kompare.po b/tde-i18n-hr/messages/tdesdk/kompare.po index b16cf4b6d92..42db0c25017 100644 --- a/tde-i18n-hr/messages/tdesdk/kompare.po +++ b/tde-i18n-hr/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 0\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-04-20 13:26+CEST\n" "Last-Translator: auto\n" "Language-Team: Croatian \n" @@ -12,595 +12,515 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n" "X-Generator: TransDict server\n" -#: libdiff2/komparemodellist.cpp:61 -#, fuzzy -msgid "&Apply Difference" -msgstr "&Priizbornik razliku" +#: _translatorinfo:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Diana Ćorluka, Robert Pezer" -#: libdiff2/komparemodellist.cpp:64 -#, fuzzy -msgid "Un&apply Difference" -msgstr "&Poništi primenjenu razliku" +#: _translatorinfo:2 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "lokalizacija@linux.hr" -#: libdiff2/komparemodellist.cpp:67 -#, fuzzy -msgid "App&ly All" -msgstr "Prime&ni sve" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." +msgstr "" -#: libdiff2/komparemodellist.cpp:70 +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." +msgstr "" + +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "" + +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "" + +#: kompare_shell.cpp:233 #, fuzzy -msgid "&Unapply All" -msgstr "&Poništi sve primenjeno" +msgid "&Open Diff..." +msgstr "&Otvori diff..." -#: libdiff2/komparemodellist.cpp:73 +#: kompare_shell.cpp:234 #, fuzzy -msgid "P&revious File" -msgstr "P&rethodni datoteka" +msgid "&Compare Files..." +msgstr "&Uporedi datotekaove..." -#: libdiff2/komparemodellist.cpp:76 +#: kompare_shell.cpp:237 #, fuzzy -msgid "N&ext File" -msgstr "S&ledeći datoteka" +msgid "&Blend URL with Diff..." +msgstr "&Stopi URL sa diff-om..." -#: libdiff2/komparemodellist.cpp:79 +#: kompare_shell.cpp:246 #, fuzzy -msgid "&Previous Difference" -msgstr "&Prethodna razlika" +msgid "Show T&ext View" +msgstr "Pokaži te&kstualni pogled" -#: libdiff2/komparemodellist.cpp:82 +#: kompare_shell.cpp:248 #, fuzzy -msgid "&Next Difference" -msgstr "&Sljedeća razlika" +msgid "Hide T&ext View" +msgstr "Pogled teksta" -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "0 od 0 razlike" -#: libdiff2/komparemodellist.cpp:246 +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr "0 od 0 datoteke" + +#: kompare_shell.cpp:273 msgid "" -"There were problems applying the diff %1 to the file %2." +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" +" %1 od %n datoteka \n" +" %1 od %n datotekaa \n" +" %1 od %n datotekaova " -#: libdiff2/komparemodellist.cpp:271 +#: kompare_shell.cpp:275 +#, fuzzy, c-format msgid "" -"There were problems applying the diff %1 to the folder %2" -"." +"_n: %n file \n" +" %n files " msgstr "" +" %n datoteka \n" +" %n datotekaa \n" +" %n datotekaova " -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -#, fuzzy -msgid "Could not open a temporary file." -msgstr "Nisam mogao otvoriti privreizbornik datoteka." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Nisam mogao da pišem u privreizbornik datoteka." - -#: libdiff2/komparemodellist.cpp:368 +#: kompare_shell.cpp:278 #, fuzzy msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "Nisam mogao da pišem u privreizbornik datoteka." +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +" %1 od %n razlika, %2 primenjena \n" +" %1 od %n razlike, %2 primenjene \n" +" %1 od %n razlika, %2 primenjeno " -#: libdiff2/komparemodellist.cpp:383 +#: kompare_shell.cpp:281 +#, fuzzy, c-format msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +"_n: %n difference \n" +" %n differences " msgstr "" +" %n razlika \n" +" %n razlike \n" +" %n razlika " -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +#: kompare_shell.cpp:369 #, fuzzy -msgid "Could not parse diff output." -msgstr "Nisam mogao da analiziram diff izlaz." +msgid "Blend File/Folder with diff Output" +msgstr "Stopi datoteka/direktorij sa diff izlazom" -#: libdiff2/komparemodellist.cpp:451 +#: kompare_shell.cpp:370 #, fuzzy -msgid "The files are identical." -msgstr "Datoteke su identični." +msgid "File/Folder" +msgstr "Datoteka/direktorij" -#: libdiff2/komparemodellist.cpp:613 +#: kompare_shell.cpp:371 #, fuzzy -msgid "Could not write to the temporary file." -msgstr "Nisam mogao da pišem u privreizbornik datoteka." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Razlika" +msgid "Diff Output" +msgstr "Diff izlaz" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Run Diff In" -msgstr "Pokreni diff u" +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "Miješanje" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Ime domene" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend this file or folder with the diff output" +msgstr "Stopi ovaj datoteka ili direktorij sa diff izlazom" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- izvor odredište" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "" +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" +"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff " +"izlaz u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim " +"pritiskanjem će se otvoriti glavni pogled kompare-a gdje su izlazi unetog " +"datotekaa ili datotekaova iz direktorija pomešani sa diff izlazom tako da " +"možete priizbornikti razlike na datoteka ili datotekaove." -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, fuzzy, no-c-format -msgid "Look for smaller changes" -msgstr "Izgled za manje izmjene" +#: kompare_shell.cpp:398 main.cpp:185 +#, fuzzy +msgid "Compare Files or Folders" +msgstr "Uporedi datotekaove ili direktorije" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, fuzzy, no-c-format -msgid "Optimize for large files" -msgstr "Optimizuj za velike datotekaove" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Izvor" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, fuzzy, no-c-format -msgid "Ignore changes in case" -msgstr "Ignoriši izmjene koje se odnose na veličinu slova" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Odredište" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Proširi tabulatore u razmake" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Usporedba" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, fuzzy, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoriši dodate ili uklonjene prazne linije" +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Uporedi ove datotekaove ili direktorije" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, fuzzy, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoriši izmjene u praznom prostoru" +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom " +"prozoru, ovo gumb će biti uključeno i njegovim pritiskanjem će započeti " +"upoređivanje unijetih datotekaova ili direktorija. " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, fuzzy, no-c-format -msgid "Show function names" -msgstr "Pokaži imena funkcija" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Pogled teksta" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Uporedi direktorije rekurzivno" +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Izvorni direktorij" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, fuzzy, no-c-format -msgid "Treat new files as empty" -msgstr "Tretiraj nove datotekaove kao prazne" +#: komparenavtreepart/komparenavtreepart.cpp:66 +#, fuzzy +msgid "Destination Folder" +msgstr "Odredišni direktorij" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Oblikovanje" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Izvorna datoteka" -#. 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 "Kontekst" +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Odredišni datoteka" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, fuzzy, no-c-format -msgid "Ed" -msgstr "Ed" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Izvorna linija" -#. 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 "Obično" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Odredišna linija" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, fuzzy, no-c-format -msgid "RCS" -msgstr "RCS" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Razlika" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, fuzzy, no-c-format -msgid "Unified" -msgstr "Ujedinjeno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Jedno uz drugo" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, fuzzy, no-c-format -msgid "Number of context lines:" -msgstr "Broj linija konteksta:" - -#: main.cpp:33 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format msgid "" -"A program to view the differences between files and optionally generate a diff" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" msgstr "" -"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a." -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Ovo će uporediti URL1 sa URL2." +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Promijenjena je %n linija\n" +"Promijenjene su %n linije\n" +"Promijenjeno je %n linija" -#: main.cpp:40 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format 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 "" -"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može biti " -"„-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer " -"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi da " -"li može da nađe originalne datotekaove i onda će stopiti originalne datotekaove " -"u diff izlaz i to prikazati u dijelu za pregled. -n isključuje provjeru." +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" -#: main.cpp:41 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format 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. " +"_n: Inserted %n line\n" +"Inserted %n lines" msgstr "" -"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 " -"datoteka ili direktorij u koji treba stopiti diff izlaz." +"Ubačena je %n linija\n" +"Ubačene su %n linije\n" +"Ubačeno je %n linija" -#: main.cpp:42 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" msgstr "" -"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada se " -"sa opcijom -o koristi „-“ kao URL." -#: main.cpp:43 +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +"_n: Deleted %n line\n" +"Deleted %n lines" msgstr "" +"Obrisana je %n linija\n" +"Obrisane su %n linije\n" +"Obrisano je %n linija" -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Napoznato" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "" +#: komparenavtreepart/komparenavtreepart.cpp:694 +#, fuzzy +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&Spremi sve" -#: main.cpp:57 -msgid "Kompare icon artist" +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." msgstr "" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mnoštvo dobrih savjeta" - -#: main.cpp:59 +#: komparepart/kompare_part.cpp:171 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Cervisia-in dio za pregeled diff-ova" +msgid "Swap Source with Destination" +msgstr "Zaizbornik izvor odredištem" -#: kompare_shell.cpp:398 main.cpp:185 +#: komparepart/kompare_part.cpp:174 #, fuzzy -msgid "Compare Files or Folders" -msgstr "Uporedi datotekaove ili direktorije" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Izvor" +msgid "Show Statistics" +msgstr "Pokaži statistiku" -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Odredište" +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "" -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Usporedba" +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:425 #, fuzzy -msgid "Compare these files or folder" -msgstr "Uporedi ove datotekaove ili direktorije" +msgid "Diff Options" +msgstr "Diff opcije" -#: kompare_shell.cpp:402 main.cpp:189 +#: komparepart/kompare_part.cpp:443 #, fuzzy -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 "" -"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom prozoru, " -"ovo gumb će biti uključeno i njegovim pritiskanjem će započeti upoređivanje " -"unijetih datotekaova ili direktorija. " - -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "Diana Ćorluka, Robert Pezer" +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Datoteke zakrpe" -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "lokalizacija@linux.hr" +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "Save .diff" +msgstr "Snimi .diff" -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "" -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" msgstr "" -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" msgstr "" -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" msgstr "" -#: kompare_shell.cpp:233 -#, fuzzy -msgid "&Open Diff..." -msgstr "&Otvori diff..." - -#: kompare_shell.cpp:234 -#, fuzzy -msgid "&Compare Files..." -msgstr "&Uporedi datotekaove..." - -#: kompare_shell.cpp:237 +#: komparepart/kompare_part.cpp:481 #, fuzzy -msgid "&Blend URL with Diff..." -msgstr "&Stopi URL sa diff-om..." +msgid "KomparePart" +msgstr "KomparePart" -#: kompare_shell.cpp:246 +#: komparepart/kompare_part.cpp:493 #, fuzzy -msgid "Show T&ext View" -msgstr "Pokaži te&kstualni pogled" +msgid "Running diff..." +msgstr "Pokrećem diff..." -#: kompare_shell.cpp:248 +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "Hide T&ext View" -msgstr "Pogled teksta" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr "0 od 0 razlike" +msgid "Parsing diff output..." +msgstr "Raščlanjujem diff izlaz..." -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr "0 od 0 datoteke" +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Upoređujem datoteka %1 sa datotekaom %2" -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -" %1 od %n datoteka \n" -" %1 od %n datotekaa \n" -" %1 od %n datotekaova " +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Upoređujem datotekaove u %1 sa datotekema u %2" -#: kompare_shell.cpp:275 +#: komparepart/kompare_part.cpp:555 #, fuzzy, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n datoteka \n" -" %n datotekaa \n" -" %n datotekaova " +msgid "Viewing diff output from %1" +msgstr "Prikazujem diff izlaz iz %1" -#: kompare_shell.cpp:278 +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Stapam diff izlaz iz %1 u datoteka %2" + +#: komparepart/kompare_part.cpp:563 #, fuzzy -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -" %1 od %n razlika, %2 primenjena \n" -" %1 od %n razlike, %2 primenjene \n" -" %1 od %n razlika, %2 primenjeno " +msgid "Blending diff output from %1 into folder %2" +msgstr "Stapam diff izlaz iz %1 u direktorij %2" -#: kompare_shell.cpp:281 -#, fuzzy, c-format +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 msgid "" -"_n: %n difference \n" -" %n differences " +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" -" %n razlika \n" -" %n razlike \n" -" %n razlika " -#: kompare_shell.cpp:369 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Stopi datoteka/direktorij sa diff izlazom" +msgid "Save Changes?" +msgstr "Da li da snimim izmjene?" -#: kompare_shell.cpp:370 -#, fuzzy -msgid "File/Folder" -msgstr "Datoteka/direktorij" - -#: kompare_shell.cpp:371 -#, fuzzy -msgid "Diff Output" -msgstr "Diff izlaz" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "Miješanje" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend this file or folder with the diff output" -msgstr "Stopi ovaj datoteka ili direktorij sa diff izlazom" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " -msgstr "" -"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff izlaz " -"u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim " -"pritiskanjem će se otvoriti glavni pogled kompare-a gdje su izlazi unetog " -"datotekaa ili datotekaova iz direktorija pomešani sa diff izlazom tako da " -"možete priizbornikti razlike na datoteka ili datotekaove." - -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Uporedi ove datotekaove ili direktorije" +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, fuzzy, no-c-format +msgid "Unified" +msgstr "Ujedinjeno" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Pogled teksta" +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Izvorni direktorij" +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, fuzzy, no-c-format +msgid "RCS" +msgstr "RCS" -#: komparenavtreepart/komparenavtreepart.cpp:66 -#, fuzzy -msgid "Destination Folder" -msgstr "Odredišni direktorij" +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, fuzzy, no-c-format +msgid "Ed" +msgstr "Ed" -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Izvorna datoteka" +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Obično" -#: komparenavtreepart/komparenavtreepart.cpp:72 +#: komparepart/kompare_part.cpp:667 #, fuzzy -msgid "Destination File" -msgstr "Odredišni datoteka" +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije " +"dostupna statistika." -#: komparenavtreepart/komparenavtreepart.cpp:78 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 #, fuzzy -msgid "Source Line" -msgstr "Izvorna linija" +msgid "Diff Statistics" +msgstr "Diff statistika" -#: komparenavtreepart/komparenavtreepart.cpp:79 +#: komparepart/kompare_part.cpp:673 #, fuzzy -msgid "Destination Line" -msgstr "Odredišna linija" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Razlika" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, fuzzy, c-format msgid "" -"_n: Changed %n line\n" -"Changed %n lines" +"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 "" -"Promijenjena je %n linija\n" -"Promijenjene su %n linije\n" -"Promijenjeno je %n linija" +"Statistika:\n" +"\n" +"Stari datoteka: %1\n" +"Novi datoteka: %2\n" +"\n" +"Format: %3\n" +"Broj komada: %4\n" +"Broj razlika: %5" -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format +#: komparepart/kompare_part.cpp:686 +#, fuzzy msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" +"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 "" +"Statistika:\n" +"\n" +"Broj datotekaova u diff datoteku: %1\n" +"Format: %2\n" +"\n" +"Trenutni stari datoteka: %3\n" +"Trenutni novi datoteka: %4\n" +"\n" +"Broj komada: %5\n" +"Broj razlika: %6" -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, fuzzy, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"Ubačena je %n linija\n" -"Ubačene su %n linije\n" -"Ubačeno je %n linija" +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Podešenja" -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Pogled teksta" -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, fuzzy, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Obrisana je %n linija\n" -"Obrisane su %n linije\n" -"Obrisano je %n linija" +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Postavke pogleda" -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Napoznato" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Razlika" -#: komparenavtreepart/komparenavtreepart.cpp:694 +#: komparepart/kompareprefdlg.cpp:43 #, fuzzy -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" +msgid "Diff Settings" +msgstr "Diff podešavanja" #: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +msgid "Files" msgstr "" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Razlika" +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Izgled" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -628,9 +548,9 @@ msgstr "Format prosleđivanja" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 @@ -638,6 +558,11 @@ msgstr "" msgid "Lines of Context" msgstr "Linije konteksta" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, fuzzy, no-c-format +msgid "Number of context lines:" +msgstr "Broj linija konteksta:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -761,14 +686,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -782,14 +707,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -861,180 +786,281 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Podešenja" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Postavke pogleda" - -#: komparepart/kompareprefdlg.cpp:43 -#, fuzzy -msgid "Diff Settings" -msgstr "Diff podešavanja" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&Spremi sve" - -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" msgstr "" -#: komparepart/kompare_part.cpp:171 +#: libdiff2/komparemodellist.cpp:61 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Zaizbornik izvor odredištem" +msgid "&Apply Difference" +msgstr "&Priizbornik razliku" -#: komparepart/kompare_part.cpp:174 +#: libdiff2/komparemodellist.cpp:64 #, fuzzy -msgid "Show Statistics" -msgstr "Pokaži statistiku" +msgid "Un&apply Difference" +msgstr "&Poništi primenjenu razliku" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "" +#: libdiff2/komparemodellist.cpp:67 +#, fuzzy +msgid "App&ly All" +msgstr "Prime&ni sve" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "" +#: libdiff2/komparemodellist.cpp:70 +#, fuzzy +msgid "&Unapply All" +msgstr "&Poništi sve primenjeno" -#: komparepart/kompare_part.cpp:425 +#: libdiff2/komparemodellist.cpp:73 #, fuzzy -msgid "Diff Options" -msgstr "Diff opcije" +msgid "P&revious File" +msgstr "P&rethodni datoteka" -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:76 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Datoteke zakrpe" +msgid "N&ext File" +msgstr "S&ledeći datoteka" -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:79 #, fuzzy -msgid "Save .diff" -msgstr "Snimi .diff" +msgid "&Previous Difference" +msgstr "&Prethodna razlika" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "" +#: libdiff2/komparemodellist.cpp:82 +#, fuzzy +msgid "&Next Difference" +msgstr "&Sljedeća razlika" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:481 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 #, fuzzy -msgid "KomparePart" -msgstr "KomparePart" +msgid "Could not open a temporary file." +msgstr "Nisam mogao otvoriti privreizbornik datoteka." -#: komparepart/kompare_part.cpp:493 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "Running diff..." -msgstr "Pokrećem diff..." +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparepart/kompare_part.cpp:496 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "Parsing diff output..." -msgstr "Raščlanjujem diff izlaz..." - -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Upoređujem datoteka %1 sa datotekaom %2" +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Upoređujem datotekaove u %1 sa datotekema u %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazujem diff izlaz iz %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +#, fuzzy +msgid "Could not parse diff output." +msgstr "Nisam mogao da analiziram diff izlaz." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Stapam diff izlaz iz %1 u datoteka %2" +#: libdiff2/komparemodellist.cpp:451 +#, fuzzy +msgid "The files are identical." +msgstr "Datoteke su identični." -#: komparepart/kompare_part.cpp:563 +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Stapam diff izlaz iz %1 u direktorij %2" +msgid "Could not write to the temporary file." +msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 +#, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" +"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: main.cpp:39 #, fuzzy -msgid "Save Changes?" -msgstr "Da li da snimim izmjene?" +msgid "This will compare URL1 with URL2" +msgstr "Ovo će uporediti URL1 sa URL2." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 #, fuzzy msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije " -"dostupna statistika." +"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 "" +"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može " +"biti „-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer " +"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi " +"da li može da nađe originalne datotekaove i onda će stopiti originalne " +"datotekaove u diff izlaz i to prikazati u dijelu za pregled. -n isključuje " +"provjeru." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: main.cpp:41 #, fuzzy -msgid "Diff Statistics" -msgstr "Diff statistika" +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 "" +"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 " +"datoteka ili direktorij u koji treba stopiti diff izlaz." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 #, fuzzy 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistika:\n" -"\n" -"Stari datoteka: %1\n" -"Novi datoteka: %2\n" -"\n" -"Format: %3\n" -"Broj komada: %4\n" -"Broj razlika: %5" +"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada " +"se sa opcijom -o koristi „-“ kao URL." -#: komparepart/kompare_part.cpp:686 -#, fuzzy +#: main.cpp:43 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" +"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 "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mnoštvo dobrih savjeta" + +#: main.cpp:59 +#, fuzzy +msgid "Cervisia diff viewer" +msgstr "Cervisia-in dio za pregeled diff-ova" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Uporedi ove datotekaove ili direktorije" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "S&ledeći datoteka" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Razlika" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Postavke pogleda" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, fuzzy, no-c-format +msgid "Run Diff In" +msgstr "Pokreni diff u" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Ime domene" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- izvor odredište" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Podešavanje FTP-a" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, fuzzy, no-c-format +msgid "Look for smaller changes" +msgstr "Izgled za manje izmjene" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, fuzzy, no-c-format +msgid "Optimize for large files" +msgstr "Optimizuj za velike datotekaove" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, fuzzy, no-c-format +msgid "Ignore changes in case" +msgstr "Ignoriši izmjene koje se odnose na veličinu slova" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Proširi tabulatore u razmake" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, fuzzy, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoriši dodate ili uklonjene prazne linije" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, fuzzy, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoriši izmjene u praznom prostoru" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, fuzzy, no-c-format +msgid "Show function names" +msgstr "Pokaži imena funkcija" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Uporedi direktorije rekurzivno" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, fuzzy, no-c-format +msgid "Treat new files as empty" +msgstr "Tretiraj nove datotekaove kao prazne" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Oblikovanje" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Jedno uz drugo" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Broj datotekaova u diff datoteku: %1\n" -"Format: %2\n" -"\n" -"Trenutni stari datoteka: %3\n" -"Trenutni novi datoteka: %4\n" -"\n" -"Broj komada: %5\n" -"Broj razlika: %6" diff --git a/tde-i18n-hu/messages/tdesdk/kompare.po b/tde-i18n-hu/messages/tdesdk/kompare.po index 3e022863715..4516a78f5f0 100644 --- a/tde-i18n-hu/messages/tdesdk/kompare.po +++ b/tde-i18n-hu/messages/tdesdk/kompare.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: TDE 3.5\n" -"POT-Creation-Date: 2014-09-29 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2006-03-17 11:11+0100\n" "Last-Translator: Tamas Szanto \n" "Language-Team: Hungarian \n" @@ -12,337 +12,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Az eltérés al&kalmazása" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Eltérés alkalmazásának v&isszavonása" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Alkalma&zás (teljes)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Az alkalmazások &visszavonása" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Az &előző fájl" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "A következő &fájl" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Az e&lőző eltérés" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "A köve&tkező eltérés" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Nincs modell vagy különbség, a(z) %1 fájl nem diff-fájl." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Nem sikerült alkalmazni a(z) %1 diff-fájlt a(z) %2 " -"fájlra." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Nem sikerült alkalmazni a(z) %1 diff-kimenetet a(z) %2 " -"könyvtárra." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Az egyik ideiglenes fájlt nem sikerült megnyitni." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Nem sikerült írni a(z) %1 ideiglenes fájlba, ezért le lesz " -"törölve." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Nem sikerült létrehozni a célkönyvtárt: %1.\n" -"A fájl nem lett elmentve." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Nem sikerült feltölteni egy ideiglenes fájlt a távoli %1 " -"címre. Az ideiglenes fájl még található itt: %2" -". Próbálja meg átmásolni a fájlt a megfelelő helyre." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "A diff kimenet feldolgozása nem sikerült." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "A fájlok teljesen egyformák." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nem sikerült írni egy ideiglenes fájlba." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "El&térés" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "A diff futtatási könyvtára" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Parancssor" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd könyvtár && diff -udHprNa -- forrás cél" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Kisebb változások keresése" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimalizálás nagy fájlokra" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Nem nagybetűérzékeny" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "A tabulátorok szóközökké konvertálása" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "A felvett/eltávolított üres sorok figyelmen kívül hagyása" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Az üres helyek változásainak figyelmen kívül hagyása" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "A függvénynevek megjelenítése" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Könyvtárak összehasonlítása (alkönyvtárastól)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Az új fájlok üresnek tekintése" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formátum" - -#. 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 "Kontextus" - -#. 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 "Ed" - -#. 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ál" - -#. 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 "Egyesített" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Egymás mellett" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "A kontextussorok száma:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Fájlok közötti eltérések megjelenítésére és az eltérések diff formátumban " -"történő elkészítésére alkalmas program" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "URL1 és URL2 lesz összehasonlítva" - -#: 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 "" -"Megnyitja az URL1 címet diff-kimenetként. Az URL1 helyére '-' is írható - " -"ilyenkor a standard kimenetről fog a program olvasni. Használható például így: " -"cvs diff | kompare -o -. A program leellenőrzi, hogy az eredeti fájlok " -"megtalálhatók-e, összeolvasztja azokat a diff-kimenettel és az eredményt " -"megjeleníti. A -n opcióval le lehet tiltani ezt az ellenőrzést." - -#: 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 "" -"Beolvasztja az URL2 tartalmát az URL1-be. Az URL2 a feltételezés szerint " -"diff-kimenetre mutat, az URL1 pedig arra a fájlra vagy könyvtárra, amelynek " -"tartalmával össze kell olvasztani a diff fájlt. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Letiltja az ellenőrzést az eredeti fájlok automatikus megkeresésekor, ha a '-' " -"URL-ként van megadva, az -o opcióval." - -#: 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 "" -"Parancssoros indítás esetén itt lehet megadni a kívánt kódolást. Ha nem ad meg " -"semmit, a helyi kódolást használja majd a program." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) John Firebaugh és Otto Bruggeman, 2001-2004." - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Szerző" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "A Kompare ikonjainak készítője" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Sok-sok jótanács" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Diff-nézegető a Cervisiához" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Fájlok ill. könyvtárak összehasonlítása" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Forrás" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cél" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Összehasonlítás" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "A fájlok ill. könyvtár összehasonlítása" - -#: 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 "" -"Ha 2 fájlnevet vagy könyvtárnevet adott meg ebben az ablakban, akkor ez a gomb " -"lenyomhatóvá válik. Lenyomásakor a program összehasonlítja a két fájl vagy " -"könyvtár tartalmát. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Szántó Tamás" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -440,24 +116,50 @@ msgstr "Ez a fájl vagy könyvtár lesz összeolvasztva a diff-kimenettel" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Ha megadott egy fájl- vagy könyvtárnevet és egy diff-kimenetet tartalmazó fájl " -"nevét, akkor ez a gomb lenyomhatóvá válik. Lenyomásakor a program " +"Ha megadott egy fájl- vagy könyvtárnevet és egy diff-kimenetet tartalmazó " +"fájl nevét, akkor ez a gomb lenyomhatóvá válik. Lenyomásakor a program " "összeolvasztja a fájl(ok) és a diff-kimenet tartalmát, és az eredményt " "megjeleníti a program főablakában." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "A fájlok ill. könyvtárak összehasonlítása" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Fájlok ill. könyvtárak összehasonlítása" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Szöveges nézet" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Forrás" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cél" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Összehasonlítás" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "A fájlok ill. könyvtárak összehasonlítása" + +#: 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 "" +"Ha 2 fájlnevet vagy könyvtárnevet adott meg ebben az ablakban, akkor ez a " +"gomb lenyomhatóvá válik. Lenyomásakor a program összehasonlítja a két fájl " +"vagy könyvtár tartalmát. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Szöveges nézet" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -538,18 +240,229 @@ msgstr "Ismeretlen" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Itt lehet megadni az összehasonlítani kívánt fájlok neveit." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Minden m&entése" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "A .&diff fájl mentése..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "A forrás és a cél felcserélése" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Statisztika megjelenítése" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "A(z) %1 URL-t nem lehet letölteni." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "A(z) %1 URL nem létezik a rendszerben." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Összehasonlítási beállítások" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch fájlok" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "A .diff fájl mentése" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Már létezik ilyen fájl (lehet, hogy írásvédett) - felül szeretné írni?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "A fájl már létezik" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Felülírás" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nem kell felülírni" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "A diff futtatása..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "A diff kimenetének feldolgozása..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Fájlok összehasonlítása: %1 és %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Könyvtárak összehasonlítása: %1 és %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 diff kimenetének megtekintése" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "A(z) %1 diff fájl összeolvasztása a(z) %2 fájllal" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "A(z) %1 diff-kimenet összeolvasztása a(z) %2 könyvtárral" + +#: 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 "" +"Módosításokat hajtott végre a célfájl(ok)ban.\n" +"El szeretné menteni a változásokat?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "El szeretné menteni a módosításokat?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Egyesített" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontextus" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "normál" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nincs .diff fájl vagy nem 2 fájl volt összehasonlítva, ezért nem számolható " +"statisztika." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff statisztika" + +#: 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 "" +"Statisztika:\n" +"\n" +"A régi fájl: %1\n" +"Az új fájl: %2\n" +"\n" +"Formátum: %3\n" +"A blokkok száma: %4\n" +"Az eltérések száma: %5" + +#: 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 "" +"Statisztika:\n" +"\n" +"A diff fájlban található fájlok száma: %1\n" +"Formátum: %2\n" +"\n" +"Az aktuális régi fájl: %3\n" +"Az aktuális új fájl: %4\n" +"\n" +"A blokkok száma: %5\n" +"Az eltérések száma: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Beállítások" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Szöveges nézet" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Nézeti beállítások" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff-beállítások" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Fájlok" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Itt lehet megadni az összehasonlítani kívánt fájlok neveit." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Itt lehet beállítani a fájlok összehasonlítási opcióit." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Me&gjelenés" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Itt lehet megváltoztatni a nézet beállításait." @@ -578,18 +491,23 @@ msgstr "Kimeneti formátum" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Válassza ki, mi legyen a diff kimeneti formátuma. Az 'egyesített' formátumot " -"használják leggyakrabban, mert az a legolvashatóbb. A TDE fejlesztői is ezt a " -"formátumot preferálják patch-ek küldésekor." +"használják leggyakrabban, mert az a legolvashatóbb. A TDE fejlesztői is ezt " +"a formátumot preferálják patch-ek küldésekor." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Kontextussorok" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "A kontextussorok száma:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -716,16 +634,16 @@ msgstr "Kizárandó fájlminták" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Ha ez az opció be van jelölve, a jobb oldali szövegmezőben megadható egy " "névminta vagy kiválaszthatók bejegyzések a listából." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Itt lehet fájlnévmintákat felvenni vagy eltávolítani, ill. bejegyzéseket a " "listából kiválasztani." @@ -738,21 +656,22 @@ msgstr "Fájlok kizárása névminta alapján" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Ha bejelöli ezt az opciót, a jobb oldali kombinált listában meg lehet adni egy " -"fájlnevet." +"Ha bejelöli ezt az opciót, a jobb oldali kombinált listában meg lehet adni " +"egy fájlnevet." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Itt lehet megadni egy olyan fájl URL-jét, mely könyvtárak összehasonlításakor " -"figyelmen kívül hagyni kívánt fájlok névmintáit tartalmazza." +"Itt lehet megadni egy olyan fájl URL-jét, mely könyvtárak " +"összehasonlításakor figyelmen kívül hagyni kívánt fájlok névmintáit " +"tartalmazza." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Az itt kiválasztott fájlok (rákattintás után) nevei a nyomógombtól balra " "látható részre kerülnek." @@ -821,167 +740,276 @@ msgstr "Betűtípus:" msgid "Size:" msgstr "Méret:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Beállítások" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Betűtípus:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Nézeti beállítások" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Az eltérés al&kalmazása" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff-beállítások" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Eltérés alkalmazásának v&isszavonása" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Minden m&entése" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Alkalma&zás (teljes)" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "A .&diff fájl mentése..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Az alkalmazások &visszavonása" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "A forrás és a cél felcserélése" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Statisztika megjelenítése" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "A(z) %1 URL-t nem lehet letölteni." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "A(z) %1 URL nem létezik a rendszerben." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Összehasonlítási beállítások" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch fájlok" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Az &előző fájl" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "A .diff fájl mentése" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "A következő &fájl" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Már létezik ilyen fájl (lehet, hogy írásvédett) - felül szeretné írni?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Az e&lőző eltérés" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "A fájl már létezik" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "A köve&tkező eltérés" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Felülírás" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Nincs modell vagy különbség, a(z) %1 fájl nem diff-fájl." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nem kell felülírni" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Nem sikerült alkalmazni a(z) %1 diff-fájlt a(z) %2 fájlra." +"" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Nem sikerült alkalmazni a(z) %1 diff-kimenetet a(z) %2 " +"könyvtárra." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "A diff futtatása..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Az egyik ideiglenes fájlt nem sikerült megnyitni." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "A diff kimenetének feldolgozása..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Nem sikerült írni a(z) %1 ideiglenes fájlba, ezért le lesz " +"törölve." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Fájlok összehasonlítása: %1 és %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Nem sikerült létrehozni a célkönyvtárt: %1.\n" +"A fájl nem lett elmentve." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Könyvtárak összehasonlítása: %1 és %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Nem sikerült feltölteni egy ideiglenes fájlt a távoli %1 címre. " +"Az ideiglenes fájl még található itt: %2. Próbálja meg átmásolni a " +"fájlt a megfelelő helyre." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 diff kimenetének megtekintése" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "A diff kimenet feldolgozása nem sikerült." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "A(z) %1 diff fájl összeolvasztása a(z) %2 fájllal" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "A fájlok teljesen egyformák." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "A(z) %1 diff-kimenet összeolvasztása a(z) %2 könyvtárral" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nem sikerült írni egy ideiglenes fájlba." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Módosításokat hajtott végre a célfájl(ok)ban.\n" -"El szeretné menteni a változásokat?" +"Fájlok közötti eltérések megjelenítésére és az eltérések diff formátumban " +"történő elkészítésére alkalmas program" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "El szeretné menteni a módosításokat?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "URL1 és URL2 lesz összehasonlítva" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Nincs .diff fájl vagy nem 2 fájl volt összehasonlítva, ezért nem számolható " -"statisztika." +"Megnyitja az URL1 címet diff-kimenetként. Az URL1 helyére '-' is írható - " +"ilyenkor a standard kimenetről fog a program olvasni. Használható például " +"így: cvs diff | kompare -o -. A program leellenőrzi, hogy az eredeti fájlok " +"megtalálhatók-e, összeolvasztja azokat a diff-kimenettel és az eredményt " +"megjeleníti. A -n opcióval le lehet tiltani ezt az ellenőrzést." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff statisztika" +#: 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 "" +"Beolvasztja az URL2 tartalmát az URL1-be. Az URL2 a feltételezés szerint " +"diff-kimenetre mutat, az URL1 pedig arra a fájlra vagy könyvtárra, amelynek " +"tartalmával össze kell olvasztani a diff fájlt. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statisztika:\n" -"\n" -"A régi fájl: %1\n" -"Az új fájl: %2\n" -"\n" -"Formátum: %3\n" -"A blokkok száma: %4\n" -"Az eltérések száma: %5" +"Letiltja az ellenőrzést az eredeti fájlok automatikus megkeresésekor, ha a " +"'-' URL-ként van megadva, az -o opcióval." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Parancssoros indítás esetén itt lehet megadni a kívánt kódolást. Ha nem ad " +"meg semmit, a helyi kódolást használja majd a program." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) John Firebaugh és Otto Bruggeman, 2001-2004." + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Szerző" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "A Kompare ikonjainak készítője" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Sok-sok jótanács" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Diff-nézegető a Cervisiához" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "A fájlok ill. könyvtár összehasonlítása" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Fájlok" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "El&térés" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Nézeti beállítások" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "A diff futtatási könyvtára" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Parancssor" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd könyvtár && diff -udHprNa -- forrás cél" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Beá&llítások" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Kisebb változások keresése" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimalizálás nagy fájlokra" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Nem nagybetűérzékeny" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "A tabulátorok szóközökké konvertálása" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "A felvett/eltávolított üres sorok figyelmen kívül hagyása" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Az üres helyek változásainak figyelmen kívül hagyása" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "A függvénynevek megjelenítése" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Könyvtárak összehasonlítása (alkönyvtárastól)" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Az új fájlok üresnek tekintése" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formátum" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Egymás mellett" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statisztika:\n" -"\n" -"A diff fájlban található fájlok száma: %1\n" -"Formátum: %2\n" -"\n" -"Az aktuális régi fájl: %3\n" -"Az aktuális új fájl: %4\n" -"\n" -"A blokkok száma: %5\n" -"Az eltérések száma: %6" diff --git a/tde-i18n-is/messages/tdesdk/kompare.po b/tde-i18n-is/messages/tdesdk/kompare.po index 5394e4bceac..09145bde822 100644 --- a/tde-i18n-is/messages/tdesdk/kompare.po +++ b/tde-i18n-is/messages/tdesdk/kompare.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "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: 2005-12-05 23:52+0100\n" "Last-Translator: Arnar Leosson \n" "Language-Team: Icelandic \n" @@ -13,326 +13,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Virkja mismun" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Afvirkja mismun" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Virkja a&llt" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "A&fvirkja allt" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fy&rri skrá" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Næsta skrá" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Fyrra &mismunur" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Næsti m&ismunur" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Gat ekki opnað vinnuskrá." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Gat ekki skrifað í vinnuskrána." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: %1. " -"Þú getur afritað hana handvirkt á rétta staðinn." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Gat ekki þáttað diff úttak." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Skrárnar eru eins." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Gat ekki skrifað í vinnuskrána." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Mismunur" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Run Diff In" -msgstr "Keyra Diff í" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Skipanalína" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- source destination" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Leita að smærri breytingum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Besta fyrir stórar skrár" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Hunsa breytingar á há-/lágstöfum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Breyta dálkalykli í bil" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Hunsa viðbættar eða fjarlægðar tómar línur" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Hunsa breytingar í bilum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Sýna nöfn falla" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Bera saman möppur arfgengt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Fara með nýjar skrár sem tómar" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Snið" - -#. 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 "Samhengi" - -#. 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 "Ed" - -#. 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 "Venjulegt" - -#. 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 "Sameinað" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Hlið við hlið" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Fjöldi samhengislína:" - -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til diff." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Þetta mun bera slóð 1 við slóð 2." - -#: main.cpp:40 -#, fuzzy -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 "Þetta mun opna slóð 1 og búast því það að hún sé" - -#: 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 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Höfundur" - -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "KomparePart" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Fullt af góðum ráðum" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff skoðari" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Bera saman skrár eða möppur" - -#: kompare_shell.cpp:399 main.cpp:186 -#, fuzzy -msgid "Source" -msgstr "Uppruni" - -#: kompare_shell.cpp:400 main.cpp:187 -#, fuzzy -msgid "Destination" -msgstr "Áfangastaður" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Bera saman" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Bera saman þessar skrár eða möppu" - -#: 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 "" -"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður þessi " -"hnappur virkur og með því að smella á hann hefst samanburður á völdum skrám eða " -"möppum." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Björgvin Ragnarsson" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -448,27 +135,55 @@ msgstr "Blanda þessari skrá eða möppu við diff úttakið" #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak í " -"svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að smella á " -"hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða skrám úr " -"möppu eru blandaðar saman við diff úttakið svo þú getur síðan virkjað " -"mismuninní skrá eða skrárnar. " - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Bera saman þessar skrár eða möppur" +"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak " +"í svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að " +"smella á hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða " +"skrám úr möppu eru blandaðar saman við diff úttakið svo þú getur síðan " +"virkjað mismuninní skrá eða skrárnar. " -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Textasýn" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Bera saman skrár eða möppur" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:399 main.cpp:186 +#, fuzzy +msgid "Source" +msgstr "Uppruni" + +#: kompare_shell.cpp:400 main.cpp:187 +#, fuzzy +msgid "Destination" +msgstr "Áfangastaður" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Bera saman" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Bera saman þessar skrár eða möppur" + +#: 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 "" +"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður " +"þessi hnappur virkur og með því að smella á hann hefst samanburður á völdum " +"skrám eða möppum." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Textasýn" + +#: komparenavtreepart/komparenavtreepart.cpp:61 #, fuzzy msgid "Source Folder" msgstr "Upprunaleg mappa" @@ -559,18 +274,229 @@ msgstr "Óþekkt" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Vist&a Allt" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Vista .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Víxla á uppruna og áfangastað" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Sýna tölfræði" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Tókst ekki að ná í slóðina %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Slóðin %1 er ekki til á kerfinu þínu." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff valkostir" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch skrár" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Vista .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Skrá þegar til" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Skrifa yfir" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ekki skrifa yfir" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Keyri diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Þátta diff útták..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ber skrána %1 saman við skrána %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ber saman skrár í %1 við skrár í %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Sýni diff úttak frá %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Blanda diff úttaki frá %1 í skrá %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Blanda diff úttaki frá %1 í möppu %2" + +#: 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 "" +"Þú hefur gert breytingar á áfangastað.\n" +"Viltu vista þær?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Vista breytingar?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Sameinað" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Samhengi" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Venjulegt" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " +"engar tölfræðiupplýsingar tiltækar." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff tölfræði" + +#: 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 "" +"Tölfræði:\n" +"\n" +"Gamla skráin: %1\n" +"Nýja skráin: %2\n" +"\n" +"Snið: %3\n" +"Fjöldi blokka: %4\n" +"Fjöldi mismuna: %5" + +#: 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 "" +"Tölfræði:\n" +"\n" +"Fjöldi skráa í diff skrá: %1\n" +"Snið: %2\n" +"\n" +"Núverandi gamla skrá: %3\n" +"Núverandi nýja skrá: %4\n" +"\n" +"Fjöldi blokka: %5\n" +"Fjöldi mismuna: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Stillingar" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textasýn" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Stillingar sýnar" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Stillingar diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Næsta skrá" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Út&lit" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -597,15 +523,20 @@ msgstr "Úttakssnið" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Línur af samhengi" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Fjöldi samhengislína:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -729,14 +660,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -750,14 +681,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -825,170 +756,267 @@ msgstr "Letur:" msgid "Size:" msgstr "Stærð:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Stillingar" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Letur:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Stillingar sýnar" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Virkja mismun" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Stillingar diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Afvirkja mismun" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Vist&a Allt" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Virkja a&llt" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Vista .&diff..." - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Víxla á uppruna og áfangastað" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Sýna tölfræði" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "A&fvirkja allt" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Tókst ekki að ná í slóðina %1." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fy&rri skrá" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Slóðin %1 er ekki til á kerfinu þínu." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Næsta skrá" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff valkostir" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Fyrra &mismunur" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch skrár" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Næsti m&ismunur" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Vista .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Skrá þegar til" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Skrifa yfir" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Gat ekki opnað vinnuskrá." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ekki skrifa yfir" +#: libdiff2/komparemodellist.cpp:350 +#, fuzzy +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Gat ekki skrifað í vinnuskrána." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Keyri diff..." +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: " +"%1. Þú getur afritað hana handvirkt á rétta staðinn." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Þátta diff útták..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Gat ekki þáttað diff úttak." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Ber skrána %1 saman við skrána %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Skrárnar eru eins." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Ber saman skrár í %1 við skrár í %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Gat ekki skrifað í vinnuskrána." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Sýni diff úttak frá %1" +#: main.cpp:33 +#, fuzzy +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til " +"diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Blanda diff úttaki frá %1 í skrá %2" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "Þetta mun bera slóð 1 við slóð 2." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Blanda diff úttaki frá %1 í möppu %2" +#: main.cpp:40 +#, fuzzy +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 "Þetta mun opna slóð 1 og búast því það að hún sé" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Þú hefur gert breytingar á áfangastað.\n" -"Viltu vista þær?" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Vista breytingar?" - -#: komparepart/kompare_part.cpp:667 +#: main.cpp:42 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " -"engar tölfræðiupplýsingar tiltækar." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff tölfræði" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Tölfræði:\n" -"\n" -"Gamla skráin: %1\n" -"Nýja skráin: %2\n" -"\n" -"Snið: %3\n" -"Fjöldi blokka: %4\n" -"Fjöldi mismuna: %5" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Höfundur" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" +msgstr "KomparePart" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Fullt af góðum ráðum" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff skoðari" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Bera saman þessar skrár eða möppu" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Næsta skrá" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Mismunur" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Stillingar sýnar" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, fuzzy, no-c-format +msgid "Run Diff In" +msgstr "Keyra Diff í" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Skipanalína" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Valk&ostir" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Leita að smærri breytingum" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Besta fyrir stórar skrár" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Hunsa breytingar á há-/lágstöfum" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Breyta dálkalykli í bil" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Hunsa viðbættar eða fjarlægðar tómar línur" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Hunsa breytingar í bilum" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Sýna nöfn falla" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Bera saman möppur arfgengt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Fara með nýjar skrár sem tómar" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Snið" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Hlið við hlið" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Tölfræði:\n" -"\n" -"Fjöldi skráa í diff skrá: %1\n" -"Snið: %2\n" -"\n" -"Núverandi gamla skrá: %3\n" -"Núverandi nýja skrá: %4\n" -"\n" -"Fjöldi blokka: %5\n" -"Fjöldi mismuna: %6" #~ msgid "%1" #~ msgstr "%1" diff --git a/tde-i18n-it/messages/tdesdk/kompare.po b/tde-i18n-it/messages/tdesdk/kompare.po index 25bdf8ec29d..c5d0757690f 100644 --- a/tde-i18n-it/messages/tdesdk/kompare.po +++ b/tde-i18n-it/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2007-05-08 23:54+0200\n" "Last-Translator: Federico Zenith \n" "Language-Team: Italian \n" @@ -17,336 +17,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Applica differenza" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Annulla differenza" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "App&lica tutto" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "A&nnulla tutto" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "File p&recedente" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "File succ&essivo" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Differenza &precedente" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Differenza succes&siva" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Nessun modello o differenza, questo file: %1" -", non è un file di confronto valido." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Ci sono stati problemi nell'applicazione dei cambiamenti %1 " -"al file %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Ci sono stati problemi nell'applicazione dei cambiamenti %1 " -"alla cartella %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Impossibile aprire il file temporaneo." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Impossibile scrivere sul file temporaneo %1, sarà eliminato." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Impossibile creare la cartella di destinazione %1.\n" -"Il file non è stato salvato." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Impossibile inviare il file temporaneo alla posizione di destinazione " -"%1. Il file temporaneo è ancora disponibile a: %2" -". Puoi copiarlo manualmente nel posto giusto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Impossibile analizzare l'output di confronto." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "I file sono identici." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Impossibile scrivere sul file temporaneo." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Differenza" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Esegui confronto in" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Riga di comando" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- origine destinazione" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Cerca cambiamenti minori" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Ottimizza per file molto grandi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignora cambiamenti tra maiuscole e minuscole" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Espandi i tabulatori in spazi nell'output" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignora le righe vuote aggiunte o rimosse" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignora i cambiamenti in spazi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostra i nomi delle funzioni" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Confronta le cartelle ricorsivamente" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratta i nuovi file come vuoti" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formato" - -#. 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 "Contesto" - -#. 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 "Ed" - -#. 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 "Normale" - -#. 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 "Unificato" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Fianco a fianco" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Numero di righe di contesto:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Un programma per visualizzare le differenze tra file e, a scelta, generare un " -"confronto" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Questo confronterà URL1 con URL2" - -#: 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 "" -"Questo aprirà URL1 e si aspetterà che sia un output di confronto. URL1 può " -"anche essere un '-' e allora sarà letto dallo standard input. Può essere usato " -"per esempio con cvs diff | kompare -o -. Kompare controllerà se può ritrovare i " -"file originali, e poi li fonderà con l'output di confronto e lo mostrerà nel " -"visualizzatore. -n disabilita il controllo." - -#: 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 "" -"Questo fonderà URL2 in URL1, ci si attende che URL2 sia output di confronto e " -"URL1 il file o la cartella nel quale l'output di confronto deve essere fuso. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Disabilita il controllo per la ricerca automatica del file originale quando si " -"usa '-' come URL con l'opzione -o." - -#: 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 "" -"Usalo per specificare la codifica quando chiami dalla riga di comando. La " -"codifica locale sarà assunta come valore predefinito se non lo specifichi." - -#: 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 e Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autore" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Artista delle icone di Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Molti consigli utili" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visualizzatore di confronto di Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Confronta file o cartelle" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Origine" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destinazione" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Confronta" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Confronta questi file o cartelle" - -#: 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 "" -"Se hai inserito due nomi file o due cartelle nei campi in questa maschera, " -"questo pulsante sarà attivato, e premendolo si avvierà un confronto tra i file " -"o le cartelle indicate. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Federico Zenith,Daniele Medri" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,11 +129,11 @@ msgstr "Fondi questo file o cartella con l'output del confronto" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Se hai inserito il nome di un file, o di una cartella, e un file contenente " "output di confronto nei campi di questa maschera, questo pulsante sarà " @@ -464,10 +141,36 @@ msgstr "" "file o dei file della cartella inseriti sono mischiati con l'output di " "confronto, in modo che tu possa applicare le differenze a uno o più file. " +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Confronta file o cartelle" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Origine" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destinazione" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Confronta" + #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Confronta questi file o cartelle" +#: 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 "" +"Se hai inserito due nomi file o due cartelle nei campi in questa maschera, " +"questo pulsante sarà attivato, e premendolo si avvierà un confronto tra i " +"file o le cartelle indicate. " + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Vista testuale" @@ -563,18 +266,229 @@ msgstr "Sconosciuto" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Qui puoi inserire i file che vuoi confrontare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "S&alva tutto" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Salva .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Scambia origine con destinazione" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostra statistiche" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "L'URL %1 non si può scaricare." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "L'URL %1 non esiste sul tuo sistema." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opzioni di confronto" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|File patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Salva .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Il file esiste o è protetto da scrittura; vuoi sovrascriverlo?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Il file esiste" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sovrascrivi" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Non sovrascrivere" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Confronto in esecuzione..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Analisi dell'output di confronto..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Confronto del file %1 col file %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Confronto dei file in %1 con i file in %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Vista dell'output di confronto da %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Fusione dell'output di confronto da %1 nel file %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Fusione dell'output di confronto da %1 nella cartella %2" + +#: 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 "" +"Hai fatto cambiamenti sui file di destinazione.\n" +"Vuoi salvarli?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Salva cambiamenti?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificato" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contesto" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normale" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nessun file di confronto, o nessuna coppia di file è stata confrontata. " +"Quindi non ci sono statistiche disponibili." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistiche di confronto" + +#: 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 "" +"Statistiche:\n" +"\n" +"Vecchio file: %1\n" +"Nuovo file: %2\n" +"\n" +"Formato: %3\n" +"Numero di hunk: %4\n" +"Numero di differenze: %5" + +#: 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 "" +"Statistiche:\n" +"\n" +"Numero di file nel file di confronto: %1\n" +"Formato: %2\n" +"\n" +"File originale attuale: %3\n" +"File nuovo attuale: %4\n" +"\n" +"Numero di hunk: %5\n" +"Numero di differenze: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferenze" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Vista testuale" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Impostazioni di visualizzazione" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Confronto" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Impostazioni di confronto" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&File" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Qui puoi inserire i file che vuoi confrontare." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Qui puoi cambiare le opzioni per confrontare i file." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "As&petto" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Qui puoi cambiare le opzioni per la visualizzazione." @@ -589,9 +503,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Puoi selezionare qui un programma di confronto diverso. Su Solaris il programma " -"diff standard non supporta tutte le opzioni della versione GNU. In questo modo " -"puoi selezionare quella versione." +"Puoi selezionare qui un programma di confronto diverso. Su Solaris il " +"programma diff standard non supporta tutte le opzioni della versione GNU. In " +"questo modo puoi selezionare quella versione." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -603,18 +517,23 @@ msgstr "Formato di output" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Seleziona il formato di output generato da diff. L'unificato è quello usato più " -"spesso perché è molto leggibile. Questo formato è il preferito degli " +"Seleziona il formato di output generato da diff. L'unificato è quello usato " +"più spesso perché è molto leggibile. Questo formato è il preferito degli " "sviluppatori di TDE, quindi usalo per inviare le correzioni." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Righe di contesto" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Numero di righe di contesto:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -682,7 +601,8 @@ msgid "" "Clicking this will open a regular expression dialog where\n" "you can graphically create regular expressions." msgstr "" -"Facendoci clic si aprirà una finestra di dialogo per le espressioni regolari\n" +"Facendoci clic si aprirà una finestra di dialogo per le espressioni " +"regolari\n" "dove puoi creare graficamente le espressioni regolari." #: libdialogpages/diffpage.cpp:300 @@ -739,16 +659,16 @@ msgstr "Schema di file da escludere" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Se è segnato, puoi inserire uno schema shell nel riquadro di testo sulla destra " -"o selezionare delle voci dall'elenco." +"Se è segnato, puoi inserire uno schema shell nel riquadro di testo sulla " +"destra o selezionare delle voci dall'elenco." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Qui puoi inserire o rimuovere uno schema shell o selezionare una o più voci " "dall'elenco." @@ -765,16 +685,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Qui puoi inserire l'URL di un file con schemi shell da ignorare durante il " "confronto delle cartelle." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Ogni file che selezioni nel dialogo che appare quando ci fai clic sarà messo " "nella finestra di dialogo a sinistra di questo pulsante." @@ -843,170 +763,279 @@ msgstr "Tipo di carattere:" msgid "Size:" msgstr "Dimensione:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferenze" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Impostazioni di visualizzazione" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Impostazioni di confronto" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "S&alva tutto" - -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Salva .&diff..." - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Scambia origine con destinazione" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Tipo di carattere:" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostra statistiche" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Applica differenza" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "L'URL %1 non si può scaricare." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Annulla differenza" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "L'URL %1 non esiste sul tuo sistema." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "App&lica tutto" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opzioni di confronto" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "A&nnulla tutto" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|File patch" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "File p&recedente" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Salva .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "File succ&essivo" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Il file esiste o è protetto da scrittura; vuoi sovrascriverlo?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Differenza &precedente" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Il file esiste" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Differenza succes&siva" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sovrascrivi" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Nessun modello o differenza, questo file: %1, non è un file di " +"confronto valido." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Non sovrascrivere" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Ci sono stati problemi nell'applicazione dei cambiamenti %1 al " +"file %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Ci sono stati problemi nell'applicazione dei cambiamenti %1 alla " +"cartella %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Confronto in esecuzione..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Impossibile aprire il file temporaneo." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Analisi dell'output di confronto..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Impossibile scrivere sul file temporaneo %1, sarà eliminato." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Confronto del file %1 col file %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Impossibile creare la cartella di destinazione %1.\n" +"Il file non è stato salvato." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Confronto dei file in %1 con i file in %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Impossibile inviare il file temporaneo alla posizione di destinazione " +"%1. Il file temporaneo è ancora disponibile a: %2. Puoi copiarlo " +"manualmente nel posto giusto." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Vista dell'output di confronto da %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Impossibile analizzare l'output di confronto." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Fusione dell'output di confronto da %1 nel file %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "I file sono identici." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Fusione dell'output di confronto da %1 nella cartella %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Impossibile scrivere sul file temporaneo." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Hai fatto cambiamenti sui file di destinazione.\n" -"Vuoi salvarli?" +"Un programma per visualizzare le differenze tra file e, a scelta, generare " +"un confronto" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Salva cambiamenti?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Questo confronterà URL1 con URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Nessun file di confronto, o nessuna coppia di file è stata confrontata. Quindi " -"non ci sono statistiche disponibili." +"Questo aprirà URL1 e si aspetterà che sia un output di confronto. URL1 può " +"anche essere un '-' e allora sarà letto dallo standard input. Può essere " +"usato per esempio con cvs diff | kompare -o -. Kompare controllerà se può " +"ritrovare i file originali, e poi li fonderà con l'output di confronto e lo " +"mostrerà nel visualizzatore. -n disabilita il controllo." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistiche di confronto" +#: 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 "" +"Questo fonderà URL2 in URL1, ci si attende che URL2 sia output di confronto " +"e URL1 il file o la cartella nel quale l'output di confronto deve essere " +"fuso. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistiche:\n" -"\n" -"Vecchio file: %1\n" -"Nuovo file: %2\n" -"\n" -"Formato: %3\n" -"Numero di hunk: %4\n" -"Numero di differenze: %5" +"Disabilita il controllo per la ricerca automatica del file originale quando " +"si usa '-' come URL con l'opzione -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Usalo per specificare la codifica quando chiami dalla riga di comando. La " +"codifica locale sarà assunta come valore predefinito se non lo specifichi." + +#: 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 e Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autore" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Artista delle icone di Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Molti consigli utili" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visualizzatore di confronto di Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Confronta questi file o cartelle" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&File" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Differenza" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Impostazioni di visualizzazione" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Esegui confronto in" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Riga di comando" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- origine destinazione" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pzioni" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Cerca cambiamenti minori" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Ottimizza per file molto grandi" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignora cambiamenti tra maiuscole e minuscole" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Espandi i tabulatori in spazi nell'output" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignora le righe vuote aggiunte o rimosse" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignora i cambiamenti in spazi" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostra i nomi delle funzioni" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Confronta le cartelle ricorsivamente" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratta i nuovi file come vuoti" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formato" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Fianco a fianco" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistiche:\n" -"\n" -"Numero di file nel file di confronto: %1\n" -"Formato: %2\n" -"\n" -"File originale attuale: %3\n" -"File nuovo attuale: %4\n" -"\n" -"Numero di hunk: %5\n" -"Numero di differenze: %6" #~ msgid "%1" #~ msgstr "%1" @@ -1030,7 +1059,8 @@ msgstr "" #~ msgstr "File/Directory" #~ msgid "There were problems applying the diff (%1) to the directory (%2)." -#~ msgstr "Ci sono stati problemi applicando i cambiamenti (%1) alla directory (%2)." +#~ msgstr "" +#~ "Ci sono stati problemi applicando i cambiamenti (%1) alla directory (%2)." #~ msgid "Comparing %1 with %2" #~ msgstr "Comparazione di %1 con %2" diff --git a/tde-i18n-ja/messages/tdesdk/kompare.po b/tde-i18n-ja/messages/tdesdk/kompare.po index b83913fa0c8..d2327a5124d 100644 --- a/tde-i18n-ja/messages/tdesdk/kompare.po +++ b/tde-i18n-ja/messages/tdesdk/kompare.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "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: 2007-04-26 23:00+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -18,316 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "パッチを適用(&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "パッチを戻す(&A)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "すべてのパッチを適用(&L)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "すべてのパッチを戻す(&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "前のファイル(&R)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "次のファイル(&E)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "前の差異(&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "次の差異(&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "このファイルはモデルではないか、差分がありません。%1 は有効な差分ファイルではありません。" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "差分 %1 をファイル %2 に適用中に問題が発生しました。" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "差分 %1 をフォルダ %2 に適用中に問題が発生しました。" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "一時ファイルを開けませんでした。" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "一時ファイル %1 へ書き込めませんでした。削除します。" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"適用先ディレクトリ %1 を作成できませんでした。\n" -"ファイルは保存されていません。" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"一時ファイルを適用先 %1 にアップロードできませんでした。一時ファイルはまだ以下にあります:%2 " -"手作業でそれを適切な場所にコピーすることができます。" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "diff 出力を解析できません。" - -#: 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 "差異(&D)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "diff を実行する場所" - -#. 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 "cd dir && diff -udHprNa -- 比較元 比較先" - -#. 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 "Ed" - -#. 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 "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 "URL1 と URL2 を比較します。" - -#: 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 "" -"URL1 を diff 出力として開きます。URL1 に '-' を指定した場合は、標準入力を使います (例: diff | kompare -o " -"-)。Kompare はオリジナルファイルを探し、組合せを diff 出力に吐き、ビューアに表示します。-n " -"でオリジナルファイルを探さないようにすることができます。" - -#: 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 "URL2 を URL1 に適用します。URL2 は diff 出力、URL1 は diff 出力を適用するファイルまたはフォルダです。" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "-o オプションで '-' を URL として使う際にオリジナルファイルを探すのを無効にします。" - -#: 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 and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "作者" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "KomparePart アイコンの作者" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "たくさんの良きアドバイス" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff ビューア" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Tadashi Jokagi,Noboru Sinohara,SATOH Satoru,Shinya TAKEBAYASHI" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -427,19 +124,45 @@ msgstr "このファイル/フォルダに diff 出力を適用" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"このダイアログのフィールドに diff 出力を含むファイル/フォルダを入力するとこのボタンが有効になり、押すと入力 (フォルダの) ファイルへの diff " -"出力を kompare のメインビューに示します。これで差分を適用することができます。" +"このダイアログのフィールドに diff 出力を含むファイル/フォルダを入力するとこの" +"ボタンが有効になり、押すと入力 (フォルダの) ファイルへの diff 出力を kompare " +"のメインビューに示します。これで差分を適用することができます。" + +#: 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 "比較" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "これらのファイル/フォルダを比較" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"このダイアログのフィールドに二つのファイル/フォルダ名を入力するとこのボタンが" +"有効になり、押すとすべてのファイル/フォルダの比較を開始します。" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "テキストビュー" @@ -523,18 +246,229 @@ msgstr "不明" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "ここで比較するファイルを指定します。" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "すべて保存(&A)" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "差分 (.diff) を保存(&D)..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "URL %1 はダウンロードできません。" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 はシステムに存在しません。" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff のオプション" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|パッチファイル" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "差分 (.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 "ファイルは存在します" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "diff 実行中..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "diff 出力を解析中..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "ファイル %1 を %2 と比較中" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1 内のファイルと %2 内のファイルを比較中" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 からの diff 出力を表示中" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "%1 からの diff 出力をファイル %2 に適用中" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "%1 からの diff 出力をフォルダ %2 に適用中" + +#: 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 "" +"比較先に変更を加えました。\n" +"これを保存しますか？" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"diff ファイルがないか、二つのファイルの差分を取っていないため、統計は利用でき" +"ません。" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff 統計" + +#: 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 "" +"統計:\n" +"\n" +"古いファイル (比較元) : %1\n" +"新しいファイル (比較先) : %2\n" +"\n" +"フォーマット : %3\n" +"差分ブロックの数: %4\n" +"差異の件数 : %5" + +#: 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 "" +"統計:\n" +"\n" +"diff ファイル内のファイル件数: %1\n" +"フォーマット: %2\n" +"\n" +"現在の古いファイル (比較元) : %3\n" +"現在の新しいファイル (比較先) : %4\n" +"\n" +"差分ブロックの数: %5\n" +"差異の件数 : %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "設定" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "テキストビュー" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "表示設定" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff の設定" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "ファイル(&F)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "ここで比較するファイルを指定します。" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "ここでファイル比較のオプションを変更できます。" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "外観(&P)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "ここで外観のオプションを変更できます。" @@ -549,8 +483,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"ここで diff プログラムを変更することができます。Solaris の標準の diff プログラムは、GNU " -"バージョンが表現するすべてのオプションをサポートしていません。ここでそのバージョンを選択できます。" +"ここで diff プログラムを変更することができます。Solaris の標準の diff プログ" +"ラムは、GNU バージョンが表現するすべてのオプションをサポートしていません。こ" +"こでそのバージョンを選択できます。" #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -562,24 +497,31 @@ msgstr "出力フォーマット" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"diff 出力のフォーマットを選択します。Unified は非常に可読性があり、最もよく使用されています。TDE " -"開発者はこのフォーマットを一番好み、パッチ送信にも使用します。" +"diff 出力のフォーマットを選択します。Unified は非常に可読性があり、最もよく使" +"用されています。TDE 開発者はこのフォーマットを一番好み、パッチ送信にも使用し" +"ます。" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "コンテクストの行数" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "コンテクストの行数:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"コンテクストの行数は、通常 2 行か 3 行です。たいていの場合、これが読みやすい行数です。3 行より多くすると、差分を不必要に膨らますだけです。" +"コンテクストの行数は、通常 2 行か 3 行です。たいていの場合、これが読みやすい" +"行数です。3 行より多くすると、差分を不必要に膨らますだけです。" #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -625,7 +567,9 @@ msgstr "このオプションは diff オプション -I に相当します。" msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." -msgstr "正規表現にマッチした行を無視して比較する場合、ここにその正規表現を追加します。" +msgstr "" +"正規表現にマッチした行を無視して比較する場合、ここにその正規表現を追加しま" +"す。" #: libdialogpages/diffpage.cpp:294 msgid "&Edit..." @@ -693,14 +637,16 @@ msgstr "除外するファイルパターン" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." -msgstr "これをチェックすると、右のテキストボックスにシェルパターンを入力したり、一覧からエントリを選ぶことができます。" +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." +msgstr "" +"これをチェックすると、右のテキストボックスにシェルパターンを入力したり、一覧" +"からエントリを選ぶことができます。" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "ここでシェルパターンの追加と削除を行います。" #: libdialogpages/diffpage.cpp:338 @@ -710,19 +656,25 @@ msgstr "除外するファイルパターンを含むファイル" #: libdialogpages/diffpage.cpp:340 msgid "" "If this is checked you can enter a filename in the combo box on the right." -msgstr "これをチェックすると、右のコンボボックスにファイル名を入力することができます。" +msgstr "" +"これをチェックすると、右のコンボボックスにファイル名を入力することができま" +"す。" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." -msgstr "フォルダを比較するときに無視するファイルパターンが記述されているファイルの URL をここに入力します。" +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." +msgstr "" +"フォルダを比較するときに無視するファイルパターンが記述されているファイルの " +"URL をここに入力します。" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." -msgstr "クリックしたときにポップアップするダイアログで選択するすべてのファイルが、このボタンの左側のダイアログに入れられます。" +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." +msgstr "" +"クリックしたときにポップアップするダイアログで選択するすべてのファイルが、こ" +"のボタンの左側のダイアログに入れられます。" # ACCELERATOR changed by translator #: libdialogpages/diffpage.cpp:352 @@ -789,165 +741,269 @@ msgstr "フォント:" msgid "Size:" msgstr "サイズ:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "設定" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "フォント:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "表示設定" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "パッチを適用(&A)" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff の設定" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "パッチを戻す(&A)" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "すべて保存(&A)" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "すべてのパッチを適用(&L)" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "差分 (.diff) を保存(&D)..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "すべてのパッチを戻す(&U)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "比較元と比較先を入れ替え" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "前のファイル(&R)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "統計を表示" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "次のファイル(&E)" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 はダウンロードできません。" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "前の差異(&P)" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 はシステムに存在しません。" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "次の差異(&N)" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff のオプション" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"このファイルはモデルではないか、差分がありません。%1 は有効な差分" +"ファイルではありません。" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|パッチファイル" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"差分 %1 をファイル %2 に適用中に問題が発生しました。" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "差分 (.diff) を保存" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"差分 %1 をフォルダ %2 に適用中に問題が発生しました。" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "ファイルは既に存在するか、書き込み禁止です。本当に上書きしますか？" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "一時ファイルを開けませんでした。" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "ファイルは存在します" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "一時ファイル %1 へ書き込めませんでした。削除します。" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "上書き" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"適用先ディレクトリ %1 を作成できませんでした。\n" +"ファイルは保存されていません。" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "上書きしない" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"一時ファイルを適用先 %1 にアップロードできませんでした。一時ファイルはま" +"だ以下にあります:%2 手作業でそれを適切な場所にコピーすることができま" +"す。" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "diff 出力を解析できません。" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "diff 実行中..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "これらファイルは同じです。" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "diff 出力を解析中..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "一時ファイルに書き込めませんでした。" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "ファイル %1 を %2 と比較中" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "ファイル間の差を表示し、差分も生成できるプログラムです。" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1 内のファイルと %2 内のファイルを比較中" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "URL1 と URL2 を比較します。" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 からの diff 出力を表示中" +#: 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 "" +"URL1 を diff 出力として開きます。URL1 に '-' を指定した場合は、標準入力を使い" +"ます (例: diff | kompare -o -)。Kompare はオリジナルファイルを探し、組合せを " +"diff 出力に吐き、ビューアに表示します。-n でオリジナルファイルを探さないよう" +"にすることができます。" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "%1 からの diff 出力をファイル %2 に適用中" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "" +"URL2 を URL1 に適用します。URL2 は diff 出力、URL1 は diff 出力を適用するファ" +"イルまたはフォルダです。" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "%1 からの diff 出力をフォルダ %2 に適用中" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"-o オプションで '-' を URL として使う際にオリジナルファイルを探すのを無効にし" +"ます。" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"比較先に変更を加えました。\n" -"これを保存しますか？" +"コマンドラインから呼ぶ場合にエンコーディングを指定します。指定がない場合は、" +"自動的にローカルのエンコーディングになります。" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "変更を保存しますか？" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "diff ファイルがないか、二つのファイルの差分を取っていないため、統計は利用できません。" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff 統計" +#: main.cpp:55 main.cpp:56 +msgid "Author" +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 "" -"統計:\n" -"\n" -"古いファイル (比較元) : %1\n" -"新しいファイル (比較先) : %2\n" -"\n" -"フォーマット : %3\n" -"差分ブロックの数: %4\n" -"差異の件数 : %5" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "KomparePart アイコンの作者" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "たくさんの良きアドバイス" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff ビューア" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "これらファイルまたはディレクトリを比較" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "ファイル(&F)" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "差異(&D)" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "表示設定" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "diff を実行する場所" + +#: 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 "cd dir && diff -udHprNa -- 比較元 比較先" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "オプション(&P)" + +#: 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 "" -"統計:\n" -"\n" -"diff ファイル内のファイル件数: %1\n" -"フォーマット: %2\n" -"\n" -"現在の古いファイル (比較元) : %3\n" -"現在の新しいファイル (比較先) : %4\n" -"\n" -"差分ブロックの数: %5\n" -"差異の件数 : %6" diff --git a/tde-i18n-ko/messages/tdesdk/kompare.po b/tde-i18n-ko/messages/tdesdk/kompare.po index deaa9292bf9..955bc643d69 100644 --- a/tde-i18n-ko/messages/tdesdk/kompare.po +++ b/tde-i18n-ko/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2007-12-04 08:46+0900\n" "Last-Translator: Sung-Jae, Cho \n" "Language-Team: Korean \n" @@ -15,328 +15,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "차이점 적용(&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "차이점 적용하지 않기(&A)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "모두 적용하기(&L)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "모두 적용하지 않기(&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "이전 파일(&R)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "다음 파일(&E)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "이전 차이점(&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "다음 차이점(&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "%1 파일은 유효하지 않은 diff 파일입니다. 모델이나 차이점이 없습니다." - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "%2 파일에 diff %1을 적용하는 중 문제가 있었습니다." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "%2 디렉터리에 diff %1를 적용하는 도중 문제가 있었습니다." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "임시 파일을 열 수 없습니다." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "임시 파일 %1에 쓸 수 없습니다. 삭제 중입니다." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"목적지 디렉터리 %1를 만들 수 없습니다.\n" -"파일이 저장되지 않았습니다." - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"대상 위치 %1에 임시 파일을 업로드 할 수 없습니다.임시 파일은 다음 위치에서 사용 가능합니다. %2 " -"올바른 위치로 수동으로 복사하십시오." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "diff 출력을 분석할 수 없습니다." - -#: 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 "차이점(&D)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "다음 파일에서 Diff 실행" - -#. 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 "cd dir && diff -udHprNa -- 원본파일 대상파일" - -#. 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 "`Ed" - -#. 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 "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 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "파일간의 차이점을 보여주기 위한 프로그램, 부가적으로 diff 파일을 생성." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "URL1 과 URL2를 비교할 것입니다." - -#: 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 "" -"이것은 URL1 을 열고 diff 출력을 기대할 것입니다.URL1은 '-'이 될 수 있고, 표준 입력으로부터 읽어들일 것입니다.예로 cvs 에 " -"대해 다음과 같이 쓸 수 있습니다. diff | kompare -o -. Kompare는 원본파일을 찾을 수 있다면 확인할 것이며 diff " -"출력에 원본 파일의 내용을 섞고 뷰어에 내용을 보여줄 수 것입니다. -n 옵션은 확인을 사용하지 않도록 합니다." - -#: 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 "" -"URL2를 URL1 에 섞을 것입니다. URL2는 diff 출력과 URL1 파일 또는 diff 출력을 섞도록 할 디렉터리를 필요로 할 " -"것입니다." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "'-'을 -o 옵션과 함께 URL로 사용할 때 원본 파일을 자동으로 찾도록 하는 것을 사용하지 않도록 합니다." - -#: 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 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, John Firebaugh and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "제작자" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare 아이콘 디자이너" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "많은 조언을 주신 분들" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff viewer" - -#: 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 "" -"대화 상자의 필드에 2개의 파일 이름이나 2개의 디렉터리를 넣게 되면 이 버튼은 활성화 되고, 그 때 버튼을 누르게 되면 입력된 파일이나 " -"디렉터리의 비교가 시작됩니다." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -"Haansoft Linux

" -"
조성재 (Sung-Jae, Cho), 박영빈 (Young Bin, Park)" +"Haansoft Linux


조성" +"재 (Sung-Jae, Cho), 박영빈 (Young Bin, Park)" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -444,19 +131,47 @@ msgstr "이 파일 또는 디렉터리를 diff 출력과 혼합" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"만약 대화상자에서 영역에 diff 출력을 포함하는 파일 혹은 디렉터리의 이름을 입력했다면, 버튼이 활성화 될 것이며 누를 경우 diff 출력과 " -"입력된 파일 혹은 디렉터리를 혼합하고 파일에 차이점을 적용할 수 있는 Kompare 주요 창이 나타날 것입니다." +"만약 대화상자에서 영역에 diff 출력을 포함하는 파일 혹은 디렉터리의 이름을 입" +"력했다면, 버튼이 활성화 될 것이며 누를 경우 diff 출력과 입력된 파일 혹은 디렉" +"터리를 혼합하고 파일에 차이점을 적용할 수 있는 Kompare 주요 창이 나타날 것입" +"니다." + +#: 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 "비교" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "파일과 디렉터리 비교" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"대화 상자의 필드에 2개의 파일 이름이나 2개의 디렉터리를 넣게 되면 이 버튼은 " +"활성화 되고, 그 때 버튼을 누르게 되면 입력된 파일이나 디렉터리의 비교가 시작" +"됩니다." + #: kompare_shell.cpp:439 msgid "Text View" msgstr "텍스트 보기" @@ -552,18 +267,230 @@ msgstr "알 수 없음" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "비교하고자 하는 파일을 여기에 입력할 수 있습니다." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "모두 저장 (&A)" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr ".diff 저장(&D)" + +#: 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 "The URL %1 cannot be downloaded." +msgstr "URL %1은 다운로드 될 수 없습니다." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1이 시스템에 존재하지 않습니다." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff 옵션" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|패치 파일" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr ".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 "파일이 존재함" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Running diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Parsing diff output..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "파일 %1과 파일 %2 비교" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1에 있는 파일과 %2에 있는 파일을 비교" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1로부터의 diff 출력 보기" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "%1으루부터의 diff 출력을 %2 파일에 섞는중" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "%1로부터의 diff 출력을 %2 디렉터리에 섞는중" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"목적 파일로 변경되었습니다.\n" +"저장하시길 원하십니까?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "`Ed" + +#: 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 "" +"diff 파일이나, 비교대상이 되었던 파일이 없습니다. 그러므로 사용 가능한 stat" +"이 필요합니다." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff 통계" + +#: 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 "" +"통계:\n" +"\n" +"이전 파일: %1\n" +"새 파일: %2\n" +"\n" +"형식: %3\n" +"불확실한 것의 수: %4\n" +"다른 것의 수: %5" + +#: 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 "" +"통계:\n" +"\n" +"diff 파일 안의 파일 수: %1\n" +"형식: %2\n" +"\n" +"현재 이전 파일: %3\n" +"현재 새 파일: %4\n" +"\n" +"불확실한 것의 수: %5\n" +"다른 것의 수: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "등록정보" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "텍스트 보기" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "보기 설정" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff 설정" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "파일(&F)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "비교하고자 하는 파일을 여기에 입력할 수 있습니다." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "파일을 비교할 때 사용할 옵션을 여기에서 변경할 수 있습니다." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "겉모양(&P)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "보기를 위한 옵션을 여기에서 변경할 수 있습니다." @@ -578,8 +505,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"여기에서 diff 프로그램을 선택할 수 있습니다. 솔라리스에서 표준 diff 프로그램은 GNU 버젼의 diff가 사용하는 모든 옵션을 지원하지 " -"않습니다. 이 방법은 당신이 버젼을 선택할 수 있습니다." +"여기에서 diff 프로그램을 선택할 수 있습니다. 솔라리스에서 표준 diff 프로그램" +"은 GNU 버젼의 diff가 사용하는 모든 옵션을 지원하지 않습니다. 이 방법은 당신" +"이 버젼을 선택할 수 있습니다." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -591,23 +519,30 @@ msgstr "출력 형식" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." -msgstr "Diff에 의해 생성된 출력 형식을 선택합니다. 통합된 것은 자주 읽었던 것이기 때문에 자주 쓰인 하나입니다." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." +msgstr "" +"Diff에 의해 생성된 출력 형식을 선택합니다. 통합된 것은 자주 읽었던 것이기 때" +"문에 자주 쓰인 하나입니다." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "내용의 줄" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "내용 줄의 수:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"Context 줄의 수는 보통 2 또는 3 입니다. 이것은 대부분의 경우에 diff를 읽을 수 있고 적용할 수 있게 합니다. 3줄 이상은 " -"diff를 쓸데없이 부풀릴 뿐입니다." +"Context 줄의 수는 보통 2 또는 3 입니다. 이것은 대부분의 경우에 diff를 읽을 " +"수 있고 적용할 수 있게 합니다. 3줄 이상은 diff를 쓸데없이 부풀릴 뿐입니다." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -723,15 +658,19 @@ msgstr "제외할 파일 패턴" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." -msgstr "여기가 체크되면 오른쪽의 텍스트 상자에 쉘 패턴을 입력하거나 목록으로부터 항목을 선택할 수 있습니다." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." +msgstr "" +"여기가 체크되면 오른쪽의 텍스트 상자에 쉘 패턴을 입력하거나 목록으로부터 항목" +"을 선택할 수 있습니다." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." -msgstr "여기에서 쉘 패턴을 입력하거나 제거할 수 있고, 목록으로부터 하나 또는 그 이상의 항목을 선택할 수 있습니다." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." +msgstr "" +"여기에서 쉘 패턴을 입력하거나 제거할 수 있고, 목록으로부터 하나 또는 그 이상" +"의 항목을 선택할 수 있습니다." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -740,19 +679,24 @@ msgstr "파일 이름으로 제외할 파일" #: libdialogpages/diffpage.cpp:340 msgid "" "If this is checked you can enter a filename in the combo box on the right." -msgstr "만약 이것이 체크되어 있다면, 오른족의 콤보 상자에 파일이름을 입력할 수 있습니다." +msgstr "" +"만약 이것이 체크되어 있다면, 오른족의 콤보 상자에 파일이름을 입력할 수 있습니" +"다." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." -msgstr "디렉터리 비교 중 무시하기 위해 쉘 패턴으로 파일의 URL을 입력할 수 있습니다." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." +msgstr "" +"디렉터리 비교 중 무시하기 위해 쉘 패턴으로 파일의 URL을 입력할 수 있습니다." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." -msgstr "클릭했을 때 나타나는 대화상자에 당신이 선택한 어떤 파일이 이 버튼의 왼쪽에 있는 대화상자에 놓일 것입니다." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." +msgstr "" +"클릭했을 때 나타나는 대화상자에 당신이 선택한 어떤 파일이 이 버튼의 왼쪽에 있" +"는 대화상자에 놓일 것입니다." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -818,166 +762,275 @@ msgstr "글꼴:" msgid "Size:" msgstr "크기:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "등록정보" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "보기 설정" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "글꼴:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff 설정" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "차이점 적용(&A)" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "모두 저장 (&A)" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "차이점 적용하지 않기(&A)" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr ".diff 저장(&D)" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "모두 적용하기(&L)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "원본과 목적지 바꾸기" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "모두 적용하지 않기(&U)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "통계 보기" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "이전 파일(&R)" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1은 다운로드 될 수 없습니다." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "다음 파일(&E)" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1이 시스템에 존재하지 않습니다." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff 옵션" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|패치 파일" - -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".diff 저장" - -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "파일이 존재하거나 쓰기 보호 되어있습니다. 겹쳐쓰시겠습니까?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "이전 차이점(&P)" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "파일이 존재함" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "다음 차이점(&N)" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "겹쳐쓰기" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"%1 파일은 유효하지 않은 diff 파일입니다. 모델이나 차이점이 없습니다." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "겹쳐쓰지 않기" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"%2 파일에 diff %1을 적용하는 중 문제가 있었습니다." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"%2 디렉터리에 diff %1를 적용하는 도중 문제가 있었습니다." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Running diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "임시 파일을 열 수 없습니다." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "임시 파일 %1에 쓸 수 없습니다. 삭제 중입니다." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "파일 %1과 파일 %2 비교" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"목적지 디렉터리 %1를 만들 수 없습니다.\n" +"파일이 저장되지 않았습니다." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1에 있는 파일과 %2에 있는 파일을 비교" +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"대상 위치 %1에 임시 파일을 업로드 할 수 없습니다.임시 파일은 다음 " +"위치에서 사용 가능합니다. %2 올바른 위치로 수동으로 복사하십시오." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1로부터의 diff 출력 보기" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "diff 출력을 분석할 수 없습니다." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "%1으루부터의 diff 출력을 %2 파일에 섞는중" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "파일이 일치합니다." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "%1로부터의 diff 출력을 %2 디렉터리에 섞는중" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "임시 파일에 쓸 수 없습니다." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 #, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"목적 파일로 변경되었습니다.\n" -"저장하시길 원하십니까?" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "파일간의 차이점을 보여주기 위한 프로그램, 부가적으로 diff 파일을 생성." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "변경 사항을 저장하시겠습니까?" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "URL1 과 URL2를 비교할 것입니다." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "diff 파일이나, 비교대상이 되었던 파일이 없습니다. 그러므로 사용 가능한 stat이 필요합니다." +"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 "" +"이것은 URL1 을 열고 diff 출력을 기대할 것입니다.URL1은 '-'이 될 수 있고, 표" +"준 입력으로부터 읽어들일 것입니다.예로 cvs 에 대해 다음과 같이 쓸 수 있습니" +"다. diff | kompare -o -. Kompare는 원본파일을 찾을 수 있다면 확인할 것이며 " +"diff 출력에 원본 파일의 내용을 섞고 뷰어에 내용을 보여줄 수 것입니다. -n 옵션" +"은 확인을 사용하지 않도록 합니다." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff 통계" +#: 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 "" +"URL2를 URL1 에 섞을 것입니다. URL2는 diff 출력과 URL1 파일 또는 diff 출력을 " +"섞도록 할 디렉터리를 필요로 할 것입니다." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"통계:\n" -"\n" -"이전 파일: %1\n" -"새 파일: %2\n" -"\n" -"형식: %3\n" -"불확실한 것의 수: %4\n" -"다른 것의 수: %5" +"'-'을 -o 옵션과 함께 URL로 사용할 때 원본 파일을 자동으로 찾도록 하는 것을 사" +"용하지 않도록 합니다." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, John Firebaugh and Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "제작자" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare 아이콘 디자이너" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "많은 조언을 주신 분들" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff viewer" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "파일 또는 디렉터리 비교" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "파일(&F)" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "차이점(&D)" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "보기 설정" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "다음 파일에서 Diff 실행" + +#: 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 "cd dir && diff -udHprNa -- 원본파일 대상파일" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "옵션(&P)" + +#: 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 "" -"통계:\n" -"\n" -"diff 파일 안의 파일 수: %1\n" -"형식: %2\n" -"\n" -"현재 이전 파일: %3\n" -"현재 새 파일: %4\n" -"\n" -"불확실한 것의 수: %5\n" -"다른 것의 수: %6" diff --git a/tde-i18n-lt/messages/tdesdk/kompare.po b/tde-i18n-lt/messages/tdesdk/kompare.po index 13afed019d6..1f45463cb8a 100644 --- a/tde-i18n-lt/messages/tdesdk/kompare.po +++ b/tde-i18n-lt/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2005-09-02 17:30+0300\n" "Last-Translator: Donatas Glodenis \n" "Language-Team: Lithuanian \n" @@ -14,326 +14,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" "(n%100<10 || n%100>=20) ? 1 : 2);\n" "(n%100<10 || n%100>=20) ? 1 : 2);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Prit&aikyti skirtumą" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Pa&naikinti skirtumo pritaikymą" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Pritaik&yti viską" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Panaikinti visko pritaikymą" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Ankstesnė byla" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "K&ita byla" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "A&nkstesnis skirtumas" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Kitas skirtumas" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "Ar tikrai norite trinti senus laiškus iš aplanko %1?" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -#, fuzzy -msgid "Could not open a temporary file." -msgstr "Nagalima atidaryti bylos." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Negalima įrašyti į bylą." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Negalima išnagrinėti diff išvesties." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Bylos yra identiškos." - -#: libdiff2/komparemodellist.cpp:613 -#, fuzzy -msgid "Could not write to the temporary file." -msgstr "Negalima įrašyti į bylą." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Skirtumai" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Paleisti diff" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Komandų eilutė" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- šaltinis paskirtis" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Žiūrėti smulkesnių pakeitimų" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizuoti didelėms byloms" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignoruoti raidžių dydžio pokyčius" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Išplėsti tab'us į tarpus" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoruoti įdėtas arba pašalintas tuščias eilutes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoruoti pokyčius tarpuose" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Rodyti funkcijų vardus" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Lyginti aplankus rekursyviniu būdu" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Naujas bylas laikyti tuščiomis" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formatas" - -#. 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 "Kontekstas" - -#. 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 "Ed" - -#. 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 "Normalus" - -#. 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 "Unifikuotas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Šonas prie šono" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Konteksto eilučių skaičius:" - -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "Programa, skirta skirtumų tarp bylų peržiūrai, gali generuoti„diff“." - -#: 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 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "© 2001-2002, John Firebaugh ir Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autorius" - -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "KomparePart" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia „diff“ skirtumų žiūriklis" - -#: kompare_shell.cpp:398 main.cpp:185 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Palyginti bylas arba aplankus" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Šaltinis" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Paskiries vieta" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Palyginti" - -#: main.cpp:189 -#, fuzzy -msgid "Compare these files or folder" -msgstr "Palyginti šias bylas arba aplankus" - -#: kompare_shell.cpp:402 main.cpp:189 -#, fuzzy -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 "" -"Jei Jūs įvedėte dviejų bylų vardus ar du aplankus šio dialogo laukuose, tada " -"šis mygtukas pasidarys prieinamu ir jį paspaudus bus pradėtas įvestų bylų ar " -"aplankų palyginimas." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Eugenijus Paulauskas,Ričardas Čepas" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -451,26 +143,54 @@ msgstr "" #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Jei Jūs įvedėte dviejų bylų vardus ar du aplankus šio dialogo laukuose, tada " "šis mygtukas pasidarys prieinamu ir jį paspaudus bus pradėtas įvestų bylų ar " "aplankų palyginimas." -#: kompare_shell.cpp:402 +#: kompare_shell.cpp:398 main.cpp:185 #, fuzzy -msgid "Compare these files or folders" -msgstr "Palyginti šias bylas arba aplankus" - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Teksto vaizdas" +msgid "Compare Files or Folders" +msgstr "Palyginti bylas arba aplankus" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Šaltinis" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Paskiries vieta" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Palyginti" + +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Palyginti šias bylas arba aplankus" + +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"Jei Jūs įvedėte dviejų bylų vardus ar du aplankus šio dialogo laukuose, tada " +"šis mygtukas pasidarys prieinamu ir jį paspaudus bus pradėtas įvestų bylų ar " +"aplankų palyginimas." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Teksto vaizdas" + +#: komparenavtreepart/komparenavtreepart.cpp:61 #, fuzzy msgid "Source Folder" msgstr "Šaltinio byla" @@ -563,18 +283,237 @@ msgstr "Nežinoma" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Į&rašyti viską" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "Įrašyti .&diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Sukeisti šaltinį su paskirtimi" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Rodyti statistiką" + +#: komparepart/kompare_part.cpp:269 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr "Naudotojo %1 sistemoje nėra." + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "The URL %1 does not exist on your system." +msgstr "Naudotojo %1 sistemoje nėra." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff parinktys" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Pataisų bylos" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Įrašyti .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 "Byla jau yra" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Perrašyti" + +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "Do Not Overwrite" +msgstr "Perrašyti" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Paleidžiamas diff..." + +#: komparepart/kompare_part.cpp:496 +#, fuzzy +msgid "Parsing diff output..." +msgstr "Nagrinėjamas diff..." + +#: komparepart/kompare_part.cpp:545 +#, fuzzy +msgid "Comparing file %1 with file %2" +msgstr "Palyginamos bylos iš %1 su bylomis iš %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Palyginamos bylos iš %1 su bylomis iš %2" + +#: 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 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"Jūs padarėte pakeitimų paskirties vietoje.\n" +"Ar norite juos išsaugoti?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Įrašyti pakeitimus?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unifikuotas" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekstas" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normalus" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nėra diff bylos arba nebuvo palyginta dviejų bylų, todėl nėra prieinamos " +"statistikos." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff statistika" + +#: 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 "" +"Statistika:\n" +"\n" +"Sena byla : %1\n" +"Nauja byla : %2\n" +"\n" +"Formatas : %3\n" +"Gabalų skaičius : %4\n" +"Skirtumų skaičius : %5" + +#: 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 "" +"Statistika:\n" +"\n" +"Bylų skaičius diff byloje: %1\n" +"Formatas: %2\n" +"\n" +"Dabartinė sena byla: %3\n" +"Dabartinė nauja byla: %4\n" +"\n" +"Gabalų skaičius: %5\n" +"Skirtumų skaičius: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Pasirinkimai" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Teksto vaizdas" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Rodymo nustatymai" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff nustatymai" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Bylos" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Iš&vaizda" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -601,15 +540,20 @@ msgstr "Išvesties formatas" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Konteksto eilutės" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Konteksto eilučių skaičius:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -731,14 +675,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -752,14 +696,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -828,175 +772,258 @@ msgstr "Šriftas:" msgid "Size:" msgstr "Dydis:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Pasirinkimai" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Šriftas:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Rodymo nustatymai" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Prit&aikyti skirtumą" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff nustatymai" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Į&rašyti viską" - -#: komparepart/kompare_part.cpp:168 -#, fuzzy -msgid "Save .&diff..." -msgstr "Įrašyti .&diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Pa&naikinti skirtumo pritaikymą" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Sukeisti šaltinį su paskirtimi" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Pritaik&yti viską" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Rodyti statistiką" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Panaikinti visko pritaikymą" -#: komparepart/kompare_part.cpp:269 -#, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr "Naudotojo %1 sistemoje nėra." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Ankstesnė byla" -#: komparepart/kompare_part.cpp:281 -#, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr "Naudotojo %1 sistemoje nėra." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "K&ita byla" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff parinktys" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "A&nkstesnis skirtumas" -#: komparepart/kompare_part.cpp:443 -#, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Pataisų bylos" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Kitas skirtumas" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Įrašyti .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Byla jau yra" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "Ar tikrai norite trinti senus laiškus iš aplanko %1?" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Perrašyti" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +#, fuzzy +msgid "Could not open a temporary file." +msgstr "Nagalima atidaryti bylos." -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "Do Not Overwrite" -msgstr "Perrašyti" +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Negalima įrašyti į bylą." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Paleidžiamas diff..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:496 -#, fuzzy -msgid "Parsing diff output..." -msgstr "Nagrinėjamas diff..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Negalima išnagrinėti diff išvesties." -#: komparepart/kompare_part.cpp:545 +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Bylos yra identiškos." + +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Palyginamos bylos iš %1 su bylomis iš %2" +msgid "Could not write to the temporary file." +msgstr "Negalima įrašyti į bylą." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Palyginamos bylos iš %1 su bylomis iš %2" +#: main.cpp:33 +#, fuzzy +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Programa, skirta skirtumų tarp bylų peržiūrai, gali generuoti„diff“." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy +#: main.cpp:42 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Jūs padarėte pakeitimų paskirties vietoje.\n" -"Ar norite juos išsaugoti?" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Įrašyti pakeitimus?" - -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Nėra diff bylos arba nebuvo palyginta dviejų bylų, todėl nėra prieinamos " -"statistikos." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff statistika" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "© 2001-2002, John Firebaugh ir Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autorius" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" +msgstr "KomparePart" + +#: main.cpp:58 +msgid "A lot of good advice" msgstr "" -"Statistika:\n" -"\n" -"Sena byla : %1\n" -"Nauja byla : %2\n" -"\n" -"Formatas : %3\n" -"Gabalų skaičius : %4\n" -"Skirtumų skaičius : %5" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia „diff“ skirtumų žiūriklis" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Palyginti šias bylas arba aplankus" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Bylos" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Skirtumai" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Rodymo nustatymai" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Paleisti diff" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Komandų eilutė" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- šaltinis paskirtis" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Parinktys" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Žiūrėti smulkesnių pakeitimų" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizuoti didelėms byloms" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignoruoti raidžių dydžio pokyčius" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Išplėsti tab'us į tarpus" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoruoti įdėtas arba pašalintas tuščias eilutes" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoruoti pokyčius tarpuose" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Rodyti funkcijų vardus" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Lyginti aplankus rekursyviniu būdu" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Naujas bylas laikyti tuščiomis" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formatas" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Šonas prie šono" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Bylų skaičius diff byloje: %1\n" -"Formatas: %2\n" -"\n" -"Dabartinė sena byla: %3\n" -"Dabartinė nauja byla: %4\n" -"\n" -"Gabalų skaičius: %5\n" -"Skirtumų skaičius: %6" diff --git a/tde-i18n-lv/messages/tdesdk/kompare.po b/tde-i18n-lv/messages/tdesdk/kompare.po index 4139a88f1f0..3fff60f5878 100644 --- a/tde-i18n-lv/messages/tdesdk/kompare.po +++ b/tde-i18n-lv/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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" "Last-Translator: Andris Maziks \n" "Language-Team: Latvian\n" @@ -15,308 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "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 "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "" - -#. 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Andris Maziks" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -416,17 +121,40 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Avots" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Mērķis" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Teksta Skatījums" @@ -503,27 +231,217 @@ msgid "" "Deleted %n lines" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Nezināms" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +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 "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" + +#: 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 -msgid "KompareNavTreePart" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" msgstr "" +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "Nāk&ošais Fails" + #: kompareurldialog.cpp:41 msgid "Here you can enter the files you want to compare." msgstr "" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" - #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Izskats" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -551,9 +469,9 @@ msgstr "Izvades formāts" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 @@ -561,6 +479,11 @@ msgstr "" msgid "Lines of Context" msgstr "Konteksts" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -678,14 +601,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -699,14 +622,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -775,148 +698,251 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Uzstādījumi" - -#: komparepart/kompareprefdlg.cpp:39 -#, fuzzy -msgid "View Settings" -msgstr "Vispārējs" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Nāk&ošais Fails" + +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" +#: main.cpp:52 +msgid "Kompare" msgstr "" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: main.cpp:55 main.cpp:56 +msgid "Author" msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:57 +msgid "Kompare icon artist" msgstr "" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "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 "" #~ msgid "%1" diff --git a/tde-i18n-mk/messages/tdesdk/kompare.po b/tde-i18n-mk/messages/tdesdk/kompare.po index 71030315dc7..bc5261a9240 100644 --- a/tde-i18n-mk/messages/tdesdk/kompare.po +++ b/tde-i18n-mk/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2006-01-26 23:14+0100\n" "Last-Translator: Bozidar Proevski \n" "Language-Team: Macedonian \n" @@ -15,319 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&ретходна датотека" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Сл&една датотека" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Претходна разлика" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "След&на разлика" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Нема модели или нема разлики, оваа датотека: %1 " -"не е валидна датотека со разлики." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Имаше проблеми при применувањето на разликата %1 на датотеката " -"%2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Имаше проблеми при применувањето на разликата %1 на папката %2" -"." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Не можев да отворам привремена датотека." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Не можев да запишам во привремената датотека %1, ја бришам." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Не можев да ја креирам одредишната папка %1.\n" -"Датотеката не беше зачувана." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Не можев да го анализирам излезот на diff." - -#: 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 "Ed" - -#. 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 "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 "Ова ќе го спореди URL1 со URL2" - -#: 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 "(c) 2001-2004, John Firebaugh и Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Автор" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Уметникот што ја изработи иконата на Kompare" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Божидар Проевски" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -437,20 +131,43 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Споредете датотеки или папки" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Извор" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Одредиште" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -549,18 +266,229 @@ msgstr "Непознат" msgid "KompareNavTreePart" msgstr "" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Тука може да ги внесете датотеките што сакате да ги споредите." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "З&ачувај ги сите" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Зачу&вај .diff..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "URL %1 не може да биде симнато." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 не постои на вашиот систем." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Опции за разлики" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Датотеки со закрпи" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Зачувајте .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 "Датотеката постои" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Извршувам diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Анализирам излез од diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ја споредувам датотеката %1 со датотеката %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ги споредувам датотеките во %1 со датотеките во %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Прегледувам излез на diff од %1" + +#: 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 "" +"Направивте измени во одредишните датотеки.\n" +"Дали сакате да ги зачувате?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Нема diff-датотека или не биле споредени 2 датотеки. Поради тоа нема " +"достапна статистика." + +#: 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 "" +"Статистика:\n" +"\n" +"Стара датотека: %1\n" +"Нова датотека: %2\n" +"\n" +"Формат: %3\n" +"Број на парчиња: %4\n" +"Број на разлики: %5" + +#: 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 "" +"Статистика:\n" +"\n" +"Број на линии во дат. со разлика: %1\n" +"Формат: %2\n" +"\n" +"Тековна стара датотека: %3\n" +"Тековна нова датотека: %4\n" +"\n" +"Број на парчиња: %5\n" +"Број на разлики: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Параметри" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View" +msgstr "" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Поставувања за преглед" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Разлика" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Поставувања за разлика" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Датотеки" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Тука може да ги внесете датотеките што сакате да ги споредите." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Тука може да ги смените опциите за споредбата на датотеките." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Изглед" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Тука може да ги смените опциите за прегледот." @@ -575,8 +503,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Тука може да изберете друга програма за правење разлики. Стандардната програма " -"diff на Соларис не ги поддржува сите опции што ги има верзијата на ГНУ." +"Тука може да изберете друга програма за правење разлики. Стандардната " +"програма diff на Соларис не ги поддржува сите опции што ги има верзијата на " +"ГНУ." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -588,15 +517,20 @@ msgstr "Излезен формат" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Контекстни линии" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Број на контекстни линии:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -714,14 +648,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -735,14 +669,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -809,168 +743,261 @@ msgstr "Фонт:" msgid "Size:" msgstr "Големина:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Параметри" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Поставувања за преглед" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Фонт:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Поставувања за разлика" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "З&ачувај ги сите" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Зачу&вај .diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Размени извор со одредиште" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Прикажи статистика" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&ретходна датотека" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 не може да биде симнато." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Сл&една датотека" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 не постои на вашиот систем." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Претходна разлика" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Опции за разлики" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "След&на разлика" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Датотеки со закрпи" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Нема модели или нема разлики, оваа датотека: %1 не е валидна " +"датотека со разлики." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Зачувајте .diff" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Имаше проблеми при применувањето на разликата %1 на датотеката " +"%2." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -"Датотеката постои или е заштитена од запис. Дали сакате да запишете врз неа?" +"Имаше проблеми при применувањето на разликата %1 на папката " +"%2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Датотеката постои" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Не можев да отворам привремена датотека." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Запиши" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Не можев да запишам во привремената датотека %1, ја бришам." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Не запишувај" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Не можев да ја креирам одредишната папка %1.\n" +"Датотеката не беше зачувана." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Извршувам diff..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Не можев да го анализирам излезот на diff." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Анализирам излез од diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Датотеките се идентични." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Ја споредувам датотеката %1 со датотеката %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Не можев да запишам во привремената датотека." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Ги споредувам датотеките во %1 со датотеките во %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Програма за прегледување на разликите меѓу датотеки и евентуално генерирање " +"на разлика" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Прегледувам излез на diff од %1" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Ова ќе го спореди URL1 со URL2" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:42 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Направивте измени во одредишните датотеки.\n" -"Дали сакате да ги зачувате?" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Зачувувате промени" - -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Нема diff-датотека или не биле споредени 2 датотеки. Поради тоа нема достапна " -"статистика." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика за разликите" +#: main.cpp:52 +msgid "Kompare" +msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh и Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Автор" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Уметникот што ја изработи иконата на Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Многу добри совети" + +#: main.cpp:59 +msgid "Cervisia diff viewer" msgstr "" -"Статистика:\n" -"\n" -"Стара датотека: %1\n" -"Нова датотека: %2\n" -"\n" -"Формат: %3\n" -"Број на парчиња: %4\n" -"Број на разлики: %5" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Датотеки" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Разлика" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, 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 +#, fuzzy, 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 "" -"Статистика:\n" -"\n" -"Број на линии во дат. со разлика: %1\n" -"Формат: %2\n" -"\n" -"Тековна стара датотека: %3\n" -"Тековна нова датотека: %4\n" -"\n" -"Број на парчиња: %5\n" -"Број на разлики: %6" diff --git a/tde-i18n-ms/messages/tdesdk/kompare.po b/tde-i18n-ms/messages/tdesdk/kompare.po index da504f7ccfe..27537c124a3 100644 --- a/tde-i18n-ms/messages/tdesdk/kompare.po +++ b/tde-i18n-ms/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2008-02-18 20:45+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: Malay \n" @@ -16,320 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.6\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Ter&ap Perubahan" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Nyah Ter&ap Perbezaan" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Tera&p Semua" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Nyahterap Sem&ua" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fail Te&rdahulu" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Fail S&eterusnya" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Perbezaan Terdahulu" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Perbezaan Seterus&nya" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Tidak dapat membuka fail sementara." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Tidak dapat menulis ke fail sementara %1, memadamnya." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Tidak dapat mencipta direktori destinasi %1.\n" -"Fail tidak disimpan." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Tidak dapat huraikan diff output." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Fail adalah sama." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Tidak dapat menulis ke fail sementara." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "Per&bezaaan" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Laksana Diff Dalam" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Baris Arahan" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- destinasi sumber" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Lihat kepada perubahan kecil" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimumkan untuk fail besar" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Abaikan perubahan pada 'case'" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Lebarkan tab kepada senggang" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Abaikan tambahan atau pemadaman baris kosong" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Abaikan perubahan di dalam ruang kosong" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Paparkan nama fungsi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Cari Fail/Folder" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Layan fail sebagai kosong" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Konteks" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Disatukan" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Sebelah-sebelah" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Nombor dari baris konteks:" - -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program untuk melihat perbezaan di antara fail dan menjana diff jika dipilih." - -#: 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 and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Penulis" - -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "Teks dan Ikon" - -#: main.cpp:58 -#, fuzzy -msgid "A lot of good advice" -msgstr "Selamat berjaya dengan Mandriva Linux!" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Peninjau diff Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Semua Fail dan Folder" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Sumber" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destinasi" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Banding" - -#: main.cpp:189 -#, fuzzy -msgid "Compare these files or folder" -msgstr "Bandingkan fail atau direktori ini" - -#: kompare_shell.cpp:402 main.cpp:189 -#, fuzzy -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 "" -"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada " -"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara " -"fail atau direktori dimasukkan akan dimulakan." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Muhammad Najmi bin Ahmad Zabidi" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -446,30 +139,58 @@ msgstr "" #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada " -"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara " -"fail atau direktori dimasukkan akan dimulakan." - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Bandingkan fail atau direktori ini" - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Lihat Teks" +"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan " +"pada dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan " +"di antara fail atau direktori dimasukkan akan dimulakan." -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:398 main.cpp:185 #, fuzzy -msgid "Source Folder" -msgstr "Folder Rumah" +msgid "Compare Files or Folders" +msgstr "Semua Fail dan Folder" -#: komparenavtreepart/komparenavtreepart.cpp:66 +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Sumber" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destinasi" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Banding" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Bandingkan fail atau direktori ini" + +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan " +"pada dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan " +"di antara fail atau direktori dimasukkan akan dimulakan." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Lihat Teks" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Folder Rumah" + +#: komparenavtreepart/komparenavtreepart.cpp:66 #, fuzzy msgid "Destination Folder" msgstr "Folder Rumah" @@ -553,18 +274,236 @@ msgstr "Tidak Diketahui" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Simp&an Semua" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "Auto &Simpan" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Swap Sumber dengan Destinasi" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Papar Statistik" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Pilihan Diff" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail." + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Simpan .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 "Fail Wujud" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Tindih" + +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "Do Not Overwrite" +msgstr "Fail %s tidak dijumpai" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Laksana diff..." + +#: komparepart/kompare_part.cpp:496 +#, fuzzy +msgid "Parsing diff output..." +msgstr "Bahagian Depan Beza/Tampal" + +#: komparepart/kompare_part.cpp:545 +#, fuzzy +msgid "Comparing file %1 with file %2" +msgstr "Aksara (dengan ruang):" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Membandingkan fail dalam %1 dengan fail dalam %2" + +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "-n --rcs Keluarkan diff format RCS." + +#: 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 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" +"Anda telah membuat perubahan pada destinasi.\n" +"Anda mahu simpan perubahan?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Simpan Perubahan?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Disatukan" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Konteks" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Tiada fail diff, atau tiada 2 fail yang telah dibandingkan. Oleh itu, tiada " +"stat dapatditunjukkan." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistik Diff" + +#: 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 "" +"Statistik:\n" +"\n" +"Fail lama %1\n" +"Fail baru %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Jumlah perbezaan: %5" + +#: 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 "" +"Statistik:\n" +"\n" +"Jumlah fail dalam fail diff: %1\n" +"Format: %2\n" +"\n" +"Fail lama semasa: %3\n" +"Fail baru semasa: %4\n" +"\n" +"Number of hunks: %5\n" +"Jumlah perbezaan: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Keutamaan" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Lihat Teks" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View Settings" +msgstr "Tetapan Semasa" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Tetapan Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Fail Terbaru" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Paparan" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -592,15 +531,20 @@ msgstr "Format Keluaran" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Baris Konteks" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Nombor dari baris konteks:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -732,14 +676,14 @@ msgstr "Fail untuk menyimpan suntingan:" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -753,14 +697,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -832,174 +776,257 @@ msgstr "Font:" msgid "Size:" msgstr "Saiz:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Keutamaan" - -#: komparepart/kompareprefdlg.cpp:39 +#: libdialogpages/viewpage.cpp:119 #, fuzzy -msgid "View Settings" -msgstr "Tetapan Semasa" +msgid "&Fonts" +msgstr "Font:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Tetapan Diff" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Ter&ap Perubahan" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Simp&an Semua" - -#: komparepart/kompare_part.cpp:168 -#, fuzzy -msgid "Save .&diff..." -msgstr "Auto &Simpan" - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Swap Sumber dengan Destinasi" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Nyah Ter&ap Perbezaan" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Papar Statistik" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Tera&p Semua" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Nyahterap Sem&ua" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fail Te&rdahulu" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Pilihan Diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Fail S&eterusnya" -#: komparepart/kompare_part.cpp:443 -#, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Perbezaan Terdahulu" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Simpan .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Perbezaan Seterus&nya" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fail Wujud" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Tindih" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" -#: komparepart/kompare_part.cpp:446 -#, fuzzy -msgid "Do Not Overwrite" -msgstr "Fail %s tidak dijumpai" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Tidak dapat membuka fail sementara." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Tidak dapat menulis ke fail sementara %1, memadamnya." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Laksana diff..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Tidak dapat mencipta direktori destinasi %1.\n" +"Fail tidak disimpan." -#: komparepart/kompare_part.cpp:496 -#, fuzzy -msgid "Parsing diff output..." -msgstr "Bahagian Depan Beza/Tampal" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" -#: komparepart/kompare_part.cpp:545 -#, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Aksara (dengan ruang):" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Tidak dapat huraikan diff output." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Membandingkan fail dalam %1 dengan fail dalam %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Fail adalah sama." -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "-n --rcs Keluarkan diff format RCS." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Tidak dapat menulis ke fail sementara." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:33 +#, fuzzy +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" +"Program untuk melihat perbezaan di antara fail dan menjana diff jika dipilih." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Anda telah membuat perubahan pada destinasi.\n" -"Anda mahu simpan perubahan?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Simpan Perubahan?" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Tiada fail diff, atau tiada 2 fail yang telah dibandingkan. Oleh itu, tiada " -"stat dapatditunjukkan." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistik Diff" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistik:\n" -"\n" -"Fail lama %1\n" -"Fail baru %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Jumlah perbezaan: %5" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 and Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Penulis" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" +msgstr "Teks dan Ikon" + +#: main.cpp:58 +#, fuzzy +msgid "A lot of good advice" +msgstr "Selamat berjaya dengan Mandriva Linux!" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Peninjau diff Cervisia" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Bandingkan fail atau direktori ini" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Fail Terbaru" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "Per&bezaaan" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Tetapan Semasa" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Laksana Diff Dalam" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Baris Arahan" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- destinasi sumber" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Pili&han" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Lihat kepada perubahan kecil" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimumkan untuk fail besar" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Abaikan perubahan pada 'case'" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Lebarkan tab kepada senggang" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Abaikan tambahan atau pemadaman baris kosong" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Abaikan perubahan di dalam ruang kosong" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Paparkan nama fungsi" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Cari Fail/Folder" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Layan fail sebagai kosong" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Sebelah-sebelah" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistik:\n" -"\n" -"Jumlah fail dalam fail diff: %1\n" -"Format: %2\n" -"\n" -"Fail lama semasa: %3\n" -"Fail baru semasa: %4\n" -"\n" -"Number of hunks: %5\n" -"Jumlah perbezaan: %6" diff --git a/tde-i18n-nb/messages/tdesdk/kompare.po b/tde-i18n-nb/messages/tdesdk/kompare.po index 008743d3a87..0faf23a0cff 100644 --- a/tde-i18n-nb/messages/tdesdk/kompare.po +++ b/tde-i18n-nb/messages/tdesdk/kompare.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "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: 2005-11-07 21:28+0100\n" "Last-Translator: Axel Bojer \n" "Language-Team: Norwegian Bokmål \n" @@ -21,332 +21,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Legg på forskjellen" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "T&a vekk forskjellen" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Le&gg på alle" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Ta vekk alle" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "F&orrige fil" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "N&este fil" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Forrige forskjell" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Neste forskjell" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ingen modeller eller ingen forskjeller, denne fila: %1" -", er ikke en gyldig diff-fil." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Det var problemer med å legge på diff %1 på fila %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Det var problemer med å legge på diff %1 på mappa %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Klarte ikke åpne en midlertidig fil." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Klarte ikke skrive til den midlertidige fila %1, sletter den." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Kunne ikke opprette målmappa %1.\n" -"Fila ble ikke lagret." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Klarte ikke laste opp den midlertidige fila til målet %1" -". Fila er fremdeles tilgjengelig under: %2. Du kan kopiere den manuelt " -"til det riktige stedet." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Klarte ikke tolke utdata fra diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Filene er identiske." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Klarte ikke skrive til den midlertidige fila." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Forskjell" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Kjør diff i" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Kommandolinje" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- kilde mål " - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Se etter mindre endringer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimer for store filer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorer endringer mellom store og små bokstaver" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Erstatt TAB-tegn med mellomrom" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorer tomme linjer lagt til eller slettet" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorer endringer i tomrom" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Vis funksjonsnavn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Sammenlikner mapper rekursivt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Betrakt nye filer som tomme" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Kontekst" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Forent" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Side ved side" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Antall kontekstlinjer:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "Et program som viser forskjeller mellom filer og kan lage en diff-fil" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Dette sammenlikner URL1 med URL2" - -#: 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 "" -"Dette åpner URL1 og venter at det er utdata fra diff. URL1 kan også være en " -"«-», og da leses det fra standard inn-strømmen. Kan brukes f.eks. slik: cvs " -"diff | kompare -o- . Kompare ser da etter om det kan finne originalfila/filene " -"og så flette fila/filene inn i datastrømmen fra diff og vise resultatet. -n " -"slår av sjekken." - -#: 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 "" -"Dette fletter URL2 sammen med URL1, URL2 ventes å være utdata fra diff og URL1 " -"er fila eller mappa som denne datastrømmen skal flettes inn i. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Slår av sjekk for automatisk søking etter originalfil(er) når «-» brukes som " -"URL med parameteren «-o»." - -#: 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 "" -"Bruk dette til å angi koding ved kall fra kommandolinja. Standard er lokal " -"koding hvis ikke angitt." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "© 2001–2004 John Firebaugh og Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Forfatter" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare ikontegner" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mange gode råd" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff-viser" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Sammenlikne filer eller mapper" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Kilde" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Mål" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Sammenlign" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Sammenlikne disse filene eller mappene" - -#: 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 "" -"Hvis det er oppgitt to filnavn eller to mappenavn i feltene i denne dialogen, " -"så er denne knappen aktiv og en sammenlikning av filene eller mappene begynner " -"når den trykkes. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Bjørn Steensrud,Nils Kristian Tomren" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,28 +133,55 @@ msgstr "Flett denne fila eller mappa med diff-dataene" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Hvis det er oppgitt et filnavn eller mappenavn og en fil som inneholder utdata " -"fra diff i denne dialogen, så er denne knappen aktiv og om den trykkes, så " -"åpnes komparees hovedvisning hvor fila eller filene fra mappa er flettet med " -"diff-dataene slik at du kan legge på forskjellene til fila eller filene. " +"Hvis det er oppgitt et filnavn eller mappenavn og en fil som inneholder " +"utdata fra diff i denne dialogen, så er denne knappen aktiv og om den " +"trykkes, så åpnes komparees hovedvisning hvor fila eller filene fra mappa er " +"flettet med diff-dataene slik at du kan legge på forskjellene til fila eller " +"filene. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Sammenlikne disse filene eller mappene" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Sammenlikne filer eller mapper" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstvisning" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Kilde" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Kildemappe" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Mål" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Sammenlign" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Sammenlikne disse filene eller mappene" + +#: 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 "" +"Hvis det er oppgitt to filnavn eller to mappenavn i feltene i denne " +"dialogen, så er denne knappen aktiv og en sammenlikning av filene eller " +"mappene begynner når den trykkes. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstvisning" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Kildemappe" #: komparenavtreepart/komparenavtreepart.cpp:66 msgid "Destination Folder" @@ -562,18 +270,229 @@ msgstr "Ukjent" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Her kan du oppgi filene du vil sammenlikne." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "L&agre alt" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Lagre .&diff …" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Bytt om kilde og mål" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Vis statistikk" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL-en %1 kan ikke lastes ned." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL-en %1 finnes ikke på systemet ditt." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff-valg" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch| Patch-filer" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Lagre .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Fila finnes eller er sskrivebeskyttet. Vil du skrive over den?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Fila finnes" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Skriv over" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ikke skriv over" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Kjører diff …" + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Tolker utdata fra diff …" + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Sammenlikner fil %1 med fil %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Sammenlikner filer i %1 med filer i %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Viser diffs utdata fra %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Fletter diffs utdata fra %1 inn i fil %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Fletter diffs utdata fra %1 inn i mappe %2" + +#: 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 "" +"Du har gjort endringer i målfilen(e).\n" +"Vil du lagre dem?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Lagre endringer?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Forent" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Ingen diff-fil, eller ikke noe filpar har blitt kjørt diff på. Derfor er det " +"ingen statistikk tilgjengelig." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-statistikk" + +#: 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 "" +"Statistikk:\n" +"\n" +"Gammel fil: %1\n" +"Ny file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" + +#: 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 "" +"Statistikk:\n" +"\n" +"Antall filer i diff fila: %1\n" +"Format: %2\n" +"\n" +"Gjeldende gammel fil: %3\n" +"Gjeldende ny fil: %4\n" +"\n" +"Antall klumper: %5\n" +"Antall forskjeller: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Innstillinger" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstvisning" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Vis innstillinger" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Innstillinger for diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Filer" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Her kan du oppgi filene du vil sammenlikne." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Her kan du endre innstillinger for filsammenlikning." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "U&seende" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Her kan du endre innstillinger for visningen." @@ -602,18 +521,23 @@ msgstr "Utdataformat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Velg utdata-format som diff lager. Forent er det som brukes mest fordi det er " -"lettlest. TDE-utviklerne liker dette formatet best, så bruk det for å sende inn " -"lapper." +"Velg utdata-format som diff lager. Forent er det som brukes mest fordi det " +"er lettlest. TDE-utviklerne liker dette formatet best, så bruk det for å " +"sende inn lapper." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Linjer med kontekst" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Antall kontekstlinjer:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -738,16 +662,16 @@ msgstr "Filmønster som skal utelates" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Hvis dette er krysset av kan det angis et skallmønster i skrivefeltet til " "høyre, eller velg elementer fra lista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Her kan det angis eller fjernes et skallmønster, eller velg ett eller flere " "elementer fra lista." @@ -765,16 +689,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Her kan du oppgi URL til en fil med skallmønstre som skal ignoreres når mapper " -"sammenliknes." +"Her kan du oppgi URL til en fil med skallmønstre som skal ignoreres når " +"mapper sammenliknes." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "En fil du velger i dialogen som vises når du trykker på den vil bli lagt i " "dialogen til venstre for denne knappen." @@ -843,167 +767,271 @@ msgstr "Skrift:" msgid "Size:" msgstr "Størrelse:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Innstillinger" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Skrift:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Vis innstillinger" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Legg på forskjellen" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Innstillinger for diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "T&a vekk forskjellen" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "L&agre alt" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Le&gg på alle" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Lagre .&diff …" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Ta vekk alle" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Bytt om kilde og mål" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Vis statistikk" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL-en %1 kan ikke lastes ned." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL-en %1 finnes ikke på systemet ditt." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "F&orrige fil" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff-valg" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "N&este fil" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch| Patch-filer" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Forrige forskjell" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Lagre .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Neste forskjell" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Fila finnes eller er sskrivebeskyttet. Vil du skrive over den?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Ingen modeller eller ingen forskjeller, denne fila: %1, er ikke " +"en gyldig diff-fil." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fila finnes" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Det var problemer med å legge på diff %1 på fila %2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Skriv over" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Det var problemer med å legge på diff %1 på mappa %2." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ikke skriv over" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Klarte ikke åpne en midlertidig fil." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Klarte ikke skrive til den midlertidige fila %1, sletter den." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Kjører diff …" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Kunne ikke opprette målmappa %1.\n" +"Fila ble ikke lagret." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Tolker utdata fra diff …" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Klarte ikke laste opp den midlertidige fila til målet %1. Fila er " +"fremdeles tilgjengelig under: %2. Du kan kopiere den manuelt til det " +"riktige stedet." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Sammenlikner fil %1 med fil %2" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Klarte ikke tolke utdata fra diff." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Sammenlikner filer i %1 med filer i %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Filene er identiske." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Viser diffs utdata fra %1" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Klarte ikke skrive til den midlertidige fila." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Fletter diffs utdata fra %1 inn i fil %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Et program som viser forskjeller mellom filer og kan lage en diff-fil" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Fletter diffs utdata fra %1 inn i mappe %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Dette sammenlikner URL1 med URL2" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Du har gjort endringer i målfilen(e).\n" -"Vil du lagre dem?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Lagre endringer?" +"Dette åpner URL1 og venter at det er utdata fra diff. URL1 kan også være en " +"«-», og da leses det fra standard inn-strømmen. Kan brukes f.eks. slik: cvs " +"diff | kompare -o- . Kompare ser da etter om det kan finne originalfila/" +"filene og så flette fila/filene inn i datastrømmen fra diff og vise " +"resultatet. -n slår av sjekken." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Ingen diff-fil, eller ikke noe filpar har blitt kjørt diff på. Derfor er det " -"ingen statistikk tilgjengelig." +"Dette fletter URL2 sammen med URL1, URL2 ventes å være utdata fra diff og " +"URL1 er fila eller mappa som denne datastrømmen skal flettes inn i. " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-statistikk" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistikk:\n" -"\n" -"Gammel fil: %1\n" -"Ny file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +"Slår av sjekk for automatisk søking etter originalfil(er) når «-» brukes " +"som URL med parameteren «-o»." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Bruk dette til å angi koding ved kall fra kommandolinja. Standard er lokal " +"koding hvis ikke angitt." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "© 2001–2004 John Firebaugh og Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Forfatter" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare ikontegner" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mange gode råd" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff-viser" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Sammenlikne disse filene eller mappene" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Filer" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Forskjell" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Vis innstillinger" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Kjør diff i" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Kommandolinje" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- kilde mål " + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Parametre" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Se etter mindre endringer" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimer for store filer" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorer endringer mellom store og små bokstaver" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Erstatt TAB-tegn med mellomrom" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorer tomme linjer lagt til eller slettet" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorer endringer i tomrom" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Vis funksjonsnavn" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Sammenlikner mapper rekursivt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Betrakt nye filer som tomme" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Side ved side" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistikk:\n" -"\n" -"Antall filer i diff fila: %1\n" -"Format: %2\n" -"\n" -"Gjeldende gammel fil: %3\n" -"Gjeldende ny fil: %4\n" -"\n" -"Antall klumper: %5\n" -"Antall forskjeller: %6" diff --git a/tde-i18n-nds/messages/tdesdk/kompare.po b/tde-i18n-nds/messages/tdesdk/kompare.po index aabd9700d10..d1b83240faf 100644 --- a/tde-i18n-nds/messages/tdesdk/kompare.po +++ b/tde-i18n-nds/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2006-12-29 23:49+0100\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" @@ -16,337 +16,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Verscheel &anwennen" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Verscheel &torüchnehmen" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "All a&nwennen" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "All Ännern &torüchnehmen" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Verleden Datei" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Nakamen Datei" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Verleden Verscheel" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Nakamen Verscheel" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Keen Modellen oder keen Verschelen. De Datei %1 " -"is keen gellen Verscheeldatei." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Bi't Anwennen vun den Verscheel %1 op de Datei %2 " -"hett dat Problemen geven." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Bi't Anwennen vun den Verscheel %1 na den Orner %2 " -"hett dat Problemen geven." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Temporeer Datei lett sik nich opmaken." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Nich mööglich, na de Temporeerdatei %1 to schrieven. Se warrt " -"wegdaan." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"De Teelorner %1 lett sik nich opstellen.\n" -"De Datei wöör nich sekert." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"De Temporeerdatei lett sik nich na den Teeloort %1 " -"hoochladen. Dat gifft de Temporeerdatei noch ünner %2" -". Du kannst ehr vun Hand na de richtige Steed koperen." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Diff-Utgaav lett sik nich inlesen." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "De Dateien sünd liek." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nich mööglich, na de Temporeerdatei to schrieven." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Verscheel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "\"diff\" starten in" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Befehlsreeg" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- Born Teel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Na lüttst Sett vun Ännern söken" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "För grote Dateien topassen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ännern vun Groot-/Lüttschrieven övergahn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Tabulator- na Leertekens ümwanneln" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Toföögte oder wegdaan leddige Regen övergahn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Leertekenännern övergahn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Funkschoonnaams wiesen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Ok all Ünnerornern verglieken" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Niege Dateien as leddig behanneln" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formaat" - -#. 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 "Kontext" - -#. 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 "Ed-Skript" - -#. 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 "Normaal" - -#. 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 "Liekmaakt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Blangenanner" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Tall vun Kontextregen:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"En Programm för't Ankieken vun Datei-Verschelen un ok för't Opstellen vun " -"Verscheel-Dateien" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "URL1 mit URL2 verglieken" - -#: 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 "" -"Dit maakt URL1 op un verwacht, dat se en Utgaav vun \"diff\" is. URL1 kann ok " -"en \"-\" wesen, denn warrt vun de Standardingaav leest. Dit lett sik t.B. för " -"\"cvs diff | kompare -o -\" bruken. Kompare pröövt denn, wat dat de " -"Orginaaldatei(en) finnen kann, mischt ehr mit de Verscheelutgaav, un wiest denn " -"dat Resultaat. De Optschoon \"-n\" maakt disse Prööv ut." - -#: 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 "" -"Dit mischt URL2 na URL1. URL2 mutt en Verscheeldatei wesen un URL1 de Datei " -"oder Orner, na de(n) de Verschelen tomischt warrn schöölt. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Maakt tosamen mit \"-\" as URL un de Optschoon \"-o\" de Prööv för't " -"automaatsche Finnen vun de Orginaaldatei(en) ut." - -#: 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 "" -"Mit disse Optschoon lett sik de Koderen bi't Opropen vun de Befehlsreeg " -"instellen. Wenn Nix instellt is, warrt de lokale Koderen bruukt." - -#: 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 un Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Maker vun't Kompare-Lüttbild" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Vele gode Raatslääg" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia-Verscheelkieker" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Dateien oder Ornern verglieken" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Born" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Teel" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Verglieken" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Disse Dateien oder Ornern verglieken" - -#: 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 "" -"Wenn Du twee Dateinaams oder twee Ornern in disse Dialoogfeller ingeven hest, " -"warrt disse Knoop anmaakt. En Vergliek vun de ingeven Dateien oder Ornern warrt " -"start, wenn Du dor op klickst." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Heiko Evermann, Manfred Wiese, Sönke Dibbern" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -452,25 +128,51 @@ msgstr "Disse Datei oder Orner mit de \"diff\"-Utgaav mischen" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Wenn Du den Naam vun en Datei oder Orner un en Datei, de de \"diff\"-Utgaav " -"bargt, in disse Dialoogfeller indragen hest, warrt disse Knoop anmaakt. Wenn Du " -"em denn anklickst, geiht de Hööftansicht vun \"Kompare\" op, binnen de de Datei " -"oder de Orner mit de Utgaav vun \"diff\" mischt warrt, so dat Du de Verschelen " -"na de Datei(en) tofögen kannst. " +"bargt, in disse Dialoogfeller indragen hest, warrt disse Knoop anmaakt. Wenn " +"Du em denn anklickst, geiht de Hööftansicht vun \"Kompare\" op, binnen de de " +"Datei oder de Orner mit de Utgaav vun \"diff\" mischt warrt, so dat Du de " +"Verschelen na de Datei(en) tofögen kannst. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Disse Dateien oder Orner verglieken" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Dateien oder Ornern verglieken" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Textansicht" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Born" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Teel" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Verglieken" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Disse Dateien oder Orner verglieken" + +#: 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 "" +"Wenn Du twee Dateinaams oder twee Ornern in disse Dialoogfeller ingeven " +"hest, warrt disse Knoop anmaakt. En Vergliek vun de ingeven Dateien oder " +"Ornern warrt start, wenn Du dor op klickst." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Textansicht" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -563,18 +265,231 @@ msgstr "Nich bekannt" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Hier kannst Du de Dateien ingeven, de Du verglieken wullt." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&All sekern" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Verscheel-&Datei sekern..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Born un Teel tuschen" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Statistik wiesen" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "De URL %1 lett sik nich daalladen." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "De URL %1 gifft dat op Dien Systeem nich." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Verscheel-Optschonen" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Kodeplaster-Dateien" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "\".diff\"-Datei sekern" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"De Datei gifft dat al, oder se is schrievschuult; wullt Du ehr överschrieven?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Gifft Datei al" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Överschrieven" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nich överschrieven" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "\"Diff\" löppt..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Utgaav vun \"diff\" warrt inleest..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "An't Verglieken vun Datei \"%1\" mit Datei \"%2\"" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "" +"An't Verglieken vun de Dateien binnen \"%1\" mit de Dateien binnen \"%2\"" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Utgaav vun \"diff\" för \"%1\"" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "De Verscheel-Utgaav för \"%1\" warrt na Datei \"%2\" tomischt" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "De Verscheel-Utgaav för \"%1\" warrt na Orner \"%2\" tomischt" + +#: 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 "" +"Du hest de Teeldatei(en) ännert.\n" +"Wullt Du ehr sekern?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Ännern sekern?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Liekmaakt" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontext" + +#: 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 "Ed-Skript" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normaal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Keen Statistik verföögbor, wiel dat keen Verscheel-Datei is oder de " +"Verschelen nich ut twee Dateien kummt." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-Statistik" + +#: 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 "" +"Statistik:\n" +"\n" +"Ole Datei: %1\n" +"Niege Datei: %2\n" +"\n" +"Formaat: %3\n" +"Tall vun Stücken: %4\n" +"Tall vun Verschelen: %5" + +#: 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 "" +"Statistik:\n" +"\n" +"Dateien binnen Verscheel-Datei: %1\n" +"Formaat: %2\n" +"\n" +"Aktuelle ole Datei: %3\n" +"Aktuelle niege Datei: %4\n" +"\n" +"Stücken: %5\n" +"Verschelen: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Instellen" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textansicht" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Ansicht-Instellen" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Verscheel" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Verscheel-Instellen" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Dateien" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Hier kannst Du de Dateien ingeven, de Du verglieken wullt." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Hier kannst Du de Optschonen för den Dateivergliek ännern." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Utsehn" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Hier kannst Du de Optschonen för de Ansicht ännern." @@ -603,9 +518,9 @@ msgstr "Utgaavformaat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Söök dat Utgaavformaat vun \"diff\" ut. Dat tomehrst bruukte Formaat is " "\"Liekmaakt\", wiel dat eenfach to lesen is. De TDE-Schrieverslüüd möögt dat " @@ -615,6 +530,11 @@ msgstr "" msgid "Lines of Context" msgstr "Kontextregen" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Tall vun Kontextregen:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -739,19 +659,19 @@ msgstr "Dateimuster för't Utsluten" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Wenn dit aktiveert is, kannst Du en Konsool-Dateimuster in't Textfeld " "rechterhand ingeven, oder Indrääg ut de List utsöken." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Hier kannst Du Konsool-Dateimustern ingeven oder wegmaken, oder een oder mehr " -"Indrääg ut de List utsöken." +"Hier kannst Du Konsool-Dateimustern ingeven oder wegmaken, oder een oder " +"mehr Indrääg ut de List utsöken." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -766,19 +686,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Hier kannst Du de Adress vun en Datei mit Konsool-Dateimustern ingeven, de bi't " -"Verglieken vun de Ornern övergahn warrn schöölt." +"Hier kannst Du de Adress vun en Datei mit Konsool-Dateimustern ingeven, de " +"bi't Verglieken vun de Ornern övergahn warrn schöölt." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Elk Datei, de Du binnen den Dialoog utsöchst, de bi't Anklicken opdukt, warrt " -"na den Dialoog linkerhand vun dissen Knoop toföögt." +"Elk Datei, de Du binnen den Dialoog utsöchst, de bi't Anklicken opdukt, " +"warrt na den Dialoog linkerhand vun dissen Knoop toföögt." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -844,169 +764,276 @@ msgstr "Schriftoort:" msgid "Size:" msgstr "Grött:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Instellen" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Ansicht-Instellen" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Schriftoort:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Verscheel-Instellen" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Verscheel &anwennen" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&All sekern" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Verscheel &torüchnehmen" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Verscheel-&Datei sekern..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "All a&nwennen" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Born un Teel tuschen" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "All Ännern &torüchnehmen" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Statistik wiesen" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "De URL %1 lett sik nich daalladen." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "De URL %1 gifft dat op Dien Systeem nich." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Verleden Datei" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Verscheel-Optschonen" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Nakamen Datei" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Kodeplaster-Dateien" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Verleden Verscheel" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "\".diff\"-Datei sekern" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Nakamen Verscheel" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"De Datei gifft dat al, oder se is schrievschuult; wullt Du ehr överschrieven?" +"Keen Modellen oder keen Verschelen. De Datei %1 is keen gellen " +"Verscheeldatei." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Gifft Datei al" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Överschrieven" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nich överschrieven" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Bi't Anwennen vun den Verscheel %1 op de Datei %2 hett dat " +"Problemen geven." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Bi't Anwennen vun den Verscheel %1 na den Orner %2 hett " +"dat Problemen geven." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "\"Diff\" löppt..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Temporeer Datei lett sik nich opmaken." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Utgaav vun \"diff\" warrt inleest..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Nich mööglich, na de Temporeerdatei %1 to schrieven. Se warrt " +"wegdaan." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "An't Verglieken vun Datei \"%1\" mit Datei \"%2\"" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"De Teelorner %1 lett sik nich opstellen.\n" +"De Datei wöör nich sekert." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -"An't Verglieken vun de Dateien binnen \"%1\" mit de Dateien binnen \"%2\"" +"De Temporeerdatei lett sik nich na den Teeloort %1 hoochladen. " +"Dat gifft de Temporeerdatei noch ünner %2. Du kannst ehr vun Hand na " +"de richtige Steed koperen." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Utgaav vun \"diff\" för \"%1\"" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Diff-Utgaav lett sik nich inlesen." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "De Verscheel-Utgaav för \"%1\" warrt na Datei \"%2\" tomischt" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "De Dateien sünd liek." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "De Verscheel-Utgaav för \"%1\" warrt na Orner \"%2\" tomischt" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nich mööglich, na de Temporeerdatei to schrieven." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Du hest de Teeldatei(en) ännert.\n" -"Wullt Du ehr sekern?" +"En Programm för't Ankieken vun Datei-Verschelen un ok för't Opstellen vun " +"Verscheel-Dateien" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Ännern sekern?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "URL1 mit URL2 verglieken" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Keen Statistik verföögbor, wiel dat keen Verscheel-Datei is oder de Verschelen " -"nich ut twee Dateien kummt." +"Dit maakt URL1 op un verwacht, dat se en Utgaav vun \"diff\" is. URL1 kann " +"ok en \"-\" wesen, denn warrt vun de Standardingaav leest. Dit lett sik t.B. " +"för \"cvs diff | kompare -o -\" bruken. Kompare pröövt denn, wat dat de " +"Orginaaldatei(en) finnen kann, mischt ehr mit de Verscheelutgaav, un wiest " +"denn dat Resultaat. De Optschoon \"-n\" maakt disse Prööv ut." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-Statistik" +#: 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 "" +"Dit mischt URL2 na URL1. URL2 mutt en Verscheeldatei wesen un URL1 de Datei " +"oder Orner, na de(n) de Verschelen tomischt warrn schöölt. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistik:\n" -"\n" -"Ole Datei: %1\n" -"Niege Datei: %2\n" -"\n" -"Formaat: %3\n" -"Tall vun Stücken: %4\n" -"Tall vun Verschelen: %5" +"Maakt tosamen mit \"-\" as URL un de Optschoon \"-o\" de Prööv för't " +"automaatsche Finnen vun de Orginaaldatei(en) ut." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Mit disse Optschoon lett sik de Koderen bi't Opropen vun de Befehlsreeg " +"instellen. Wenn Nix instellt is, warrt de lokale Koderen bruukt." + +#: 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 un Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Maker vun't Kompare-Lüttbild" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Vele gode Raatslääg" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia-Verscheelkieker" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Disse Dateien oder Ornern verglieken" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Dateien" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Verscheel" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Ansicht-Instellen" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "\"diff\" starten in" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Befehlsreeg" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- Born Teel" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&ptschonen" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Na lüttst Sett vun Ännern söken" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "För grote Dateien topassen" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ännern vun Groot-/Lüttschrieven övergahn" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Tabulator- na Leertekens ümwanneln" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Toföögte oder wegdaan leddige Regen övergahn" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Leertekenännern övergahn" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Funkschoonnaams wiesen" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Ok all Ünnerornern verglieken" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Niege Dateien as leddig behanneln" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formaat" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Blangenanner" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistik:\n" -"\n" -"Dateien binnen Verscheel-Datei: %1\n" -"Formaat: %2\n" -"\n" -"Aktuelle ole Datei: %3\n" -"Aktuelle niege Datei: %4\n" -"\n" -"Stücken: %5\n" -"Verschelen: %6" diff --git a/tde-i18n-nl/messages/tdesdk/kompare.po b/tde-i18n-nl/messages/tdesdk/kompare.po index 01c6d5e0ca0..31f79779032 100644 --- a/tde-i18n-nl/messages/tdesdk/kompare.po +++ b/tde-i18n-nl/messages/tdesdk/kompare.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "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: 2007-07-14 02:04+0200\n" "Last-Translator: Rinse de Vries \n" "Language-Team: Dutch \n" @@ -27,341 +27,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Verschil toep&assen" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Toegep&ast verschil ongedaan maken" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "A&lles toepassen" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Alle toepassi&ngen ongedaan maken" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Vo&rig bestand" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Volgend b&estand" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Vorig verschil" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Volge&nd verschil" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Geen modellen of verschillen gevonden, het bestand %1 " -"is geen geldig diff bestand." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Er zijn problemen opgetreden tijdens het toepassen van de diff %1 " -"op bestand %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Er zijn problemen opgetreden tijdens het toepassen van diff %1 " -"op map %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Kon geen tijdelijk bestand openen." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Kon niet naar het tijdelijke bestand %1schrijven. Het wordt " -"verwijderd." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Kan de doelmap %1 niet aanmaken.\n" -"Het bestand is niet opgeslagen." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Kon het tijdelijke bestand niet verplaatsen naar %1" -". Het tijdelijke bestand is nog steeds beschikbaar als: %2" -". U kunt het eventueel handmatig verplaatsen naar de juiste locatie." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Kon de diff-uitvoer niet ontleden." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "De bestanden zijn identiek." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Kon niet naar het tijdelijke bestand schrijven." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Verschil" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Diff uitvoeren in" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Commandoprompt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- bron doel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Zoek naar kleinere veranderingen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Voor grote bestanden optimaliseren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Veranderingen in hoofd-/kleine letters negeren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Tabs naar spaties veranderen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Toegevoegde of verwijderde lege regels negeren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Veranderingen in witruimte negeren" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Functienamen tonen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Mappen recursief vergelijken" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Nieuwe bestanden als leeg behandelen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Opmaak" - -#. 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 "Context" - -#. 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 "Ed" - -#. 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 "Normaal" - -#. 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 "Unified" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Naast elkaar" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Aantal contextregels:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Een programma om de verschillen tussen bestanden weer te geven en optioneel een " -"diff te genereren" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Hiermee kunt URL-adres1 met URL-adres2 vergelijken" - -#: 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 "" -"Dit zal URL-adres openen en er wordt aangenomen dat dit bestand diff uitvoer " -"bevat. URL-adres 1 kan ook een '-' zijn en dan word er van stdin (standaard " -"invoer) gelezen. Dit kan bijvoorbeeld worden gebruikt voor cvs diff | kompare " -"-o -. Kompare zal een controle uitvoeren om te kijken of het de originele " -"bestanden kan vinden en dan de diff uitvoer in het originele bestand of " -"bestanden in voegen en dat weergeven. De optie -n schakelt het automatisch " -"zoeken uit." - -#: 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 "" -"Deze optie zal URL2 in URL1 invoegen, van URL2 word aangenomen dat het diff " -"uitvoer is en dat URL1 het bestand of de map is waar de uitvoer ingevoegd moet " -"worden." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Deze optie schakelt de controle op het vinden van het originele bestand of " -"bestanden in de diff uitvoer uit wanneer er gebruikt word gemaakt van '-' als " -"URL-adres met de optie -o." - -#: 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 "" -"Gebruik dit om de codering te kiezen als u het vanaf de commandoregel aanroept. " -"Als u niets specificeert zal de standaardcodering worden gebruikt." - -#: 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 en Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Auteur" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare pictogramontwerper" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Erg veel goed advies" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff-weergaveprogramma" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Bestanden of mappen vergelijken" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Bron" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Bestemming" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Vergelijken" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Vergelijk deze bestanden of mappen" - -#: 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 "" -"Als u 2 bestandsnamen of 2 mappen hebt ingevoerd in de velden van dit " -"dialoogvenster, dan zal deze knop worden geactiveerd. Door op deze knop te " -"drukken start u een vergelijking van de ingevoerde bestanden of mappen. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Otto Bruggeman,Rinse de Vries" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -467,25 +139,51 @@ msgstr "Voeg de diff uitvoer in in dit bestand of map" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Als u 2 bestandsnamen of 2 mappen hebt ingevoerd in de velden van dit " "dialoogvenster, dan zal deze knop worden geactiveerd. Door op deze knop te " "drukken start u een vergelijking van de ingevoerde bestanden of mappen. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Vergelijk deze bestanden of mappen" - -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstweergave" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Bestanden of mappen vergelijken" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Bron" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Bestemming" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Vergelijken" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Vergelijk deze bestanden of mappen" + +#: 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 "" +"Als u 2 bestandsnamen of 2 mappen hebt ingevoerd in de velden van dit " +"dialoogvenster, dan zal deze knop worden geactiveerd. Door op deze knop te " +"drukken start u een vergelijking van de ingevoerde bestanden of mappen. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstweergave" + +#: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" msgstr "Bronmap" @@ -576,20 +274,234 @@ msgstr "Onbekend" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Hier kunt u de bestanden invoeren die u wilt vergelijken." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&Alles opslaan" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "&Diff opslaan..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Bron en bestemming omwisselen" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Statistieken tonen" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Het URL-adres %1 kan niet worden opgehaald." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Het URL-adres %1 is niet aanwezig op uw systeem." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff-opties" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch-bestanden" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr ".diff opslaan" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Het bestand bestaat al of is tegen schrijven beveiligd. Wilt u het " +"overschrijven?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Het bestand bestaat al" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Overschrijven" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Niet overschrijven" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Bezig met het uitvoeren van diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Bezig met het ontleden van de diff uitvoer..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Bezig met het vergelijken van bestand %1 met bestand %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Bezig met het vergelijken van bestanden in %1 met bestanden in %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Bezig met het tonen van de diff uitvoer van bestand %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "" +"Bezig met in het invoegen van de diff uitvoer van bestand %1 in bestand %2..." + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Bezig met het invoegen van de diff uitvoer van bestand %1 in map %2..." + +#: 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 "" +"U hebt wijzigingen in het doelbestand(en) gemaakt.\n" +"Wilt u deze opslaan?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Wijzigingen opslaan?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unified" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Context" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normaal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Geen diff-bestand, of er is geen vergelijking tussen twee bestanden geweest. " +"Er zijn daarom geen statistieken beschikbaar." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff-statistieken" + +#: 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 "" +"Statistieken:\n" +"\n" +"Oud bestand: %1\n" +"Nieuw bestand: %2\n" +"\n" +"Formaat: %3\n" +"Aantal brokken: %4\n" +"Aantal verschillen: %5" + +#: 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 "" +"Statistieken:\n" +"\n" +"Aantal bestanden in het diff-bestand: %1\n" +"Formaat: %2\n" +"\n" +"Huidig oud bestand: %3\n" +"Huidig nieuw bestand: %4\n" +"\n" +"Aantal brokken: %5\n" +"Aantal verschillen: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Voorkeuren" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstweergave" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Weergave-instellingen" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff-instellingen" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "B&estanden" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Hier kunt u de bestanden invoeren die u wilt vergelijken." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" "Hier kunt u de opties wijzigen die u wilt gebruiken bij het vergelijken van " "bestanden." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Uiterlijk" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Hier kunt u de opties voor de manier van weergeven wijzigen." @@ -604,8 +516,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"U kunt een afwijkend diff-programma hier selecteren. Het standaard " -"diff-programma op Solaris ondersteunt niet alle opties die de GNU-versie " +"U kunt een afwijkend diff-programma hier selecteren. Het standaard diff-" +"programma op Solaris ondersteunt niet alle opties die de GNU-versie " "ondersteunt. Op deze manier kunt u de laatste versie selecteren." #: libdialogpages/diffpage.cpp:221 @@ -618,29 +530,34 @@ msgstr "Uitvoerformaat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Kies het uitvoerformaat van diff. 'Unified'' is het meest gebruikte " "uitvoerformaat omdat het bijzonder goed leesbaar is. De TDE ontwikkelaars " -"hebben een voorkeur voor dit formaat, dus het is raadzaam om dit uitvoerformaat " -"te kiezen om patches te versturen." +"hebben een voorkeur voor dit formaat, dus het is raadzaam om dit " +"uitvoerformaat te kiezen om patches te versturen." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Contextregels" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Aantal contextregels:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"In het normale geval is het aantal contextregels 2 of 3. Dit zorgt ervoor dat " -"de diff leesbaar is en in de meeste gevallen kan worden gebruikt om te patchen. " -"Meer dan 3 contextregels maakt een diff groter als noodzakelijk zonder extra " -"functionaliteit toe te voegen." +"In het normale geval is het aantal contextregels 2 of 3. Dit zorgt ervoor " +"dat de diff leesbaar is en in de meeste gevallen kan worden gebruikt om te " +"patchen. Meer dan 3 contextregels maakt een diff groter als noodzakelijk " +"zonder extra functionaliteit toe te voegen." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -756,16 +673,16 @@ msgstr "Bestandsnaampatroon voor uitsluiting" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Als u deze optie selecteert kunt u een bestandsnaampatroon opgeven aan de " "rechterzijde of elementen uit de lijst selecteren." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Hier kunt u een bestandsnaampatroon invoeren of verwijderen of één of meer " "elementen uit de lijst selecteren." @@ -783,19 +700,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Hier kunt u het URL-adres invoeren van een bestand met bestandsnaampatronen die " -"moeten worden overgeslagen tijdens het vergelijken van mappen." +"Hier kunt u het URL-adres invoeren van een bestand met bestandsnaampatronen " +"die moeten worden overgeslagen tijdens het vergelijken van mappen." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Elk bestand dat u in de dialoog selecteert die verschijnt nadat u hier op klikt " -"zal worden toegevoegd aan de dialoog links van deze knop." +"Elk bestand dat u in de dialoog selecteert die verschijnt nadat u hier op " +"klikt zal worden toegevoegd aan de dialoog links van deze knop." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -861,170 +778,280 @@ msgstr "Lettertype:" msgid "Size:" msgstr "Grootte:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Voorkeuren" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Lettertype:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Weergave-instellingen" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Verschil toep&assen" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff-instellingen" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Toegep&ast verschil ongedaan maken" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&Alles opslaan" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "A&lles toepassen" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "&Diff opslaan..." - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Bron en bestemming omwisselen" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Statistieken tonen" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Het URL-adres %1 kan niet worden opgehaald." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Alle toepassi&ngen ongedaan maken" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Het URL-adres %1 is niet aanwezig op uw systeem." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Vo&rig bestand" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff-opties" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Volgend b&estand" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch-bestanden" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Vorig verschil" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".diff opslaan" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Volge&nd verschil" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Het bestand bestaat al of is tegen schrijven beveiligd. Wilt u het " -"overschrijven?" +"Geen modellen of verschillen gevonden, het bestand %1 is geen " +"geldig diff bestand." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Het bestand bestaat al" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Er zijn problemen opgetreden tijdens het toepassen van de diff %1 " +"op bestand %2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Overschrijven" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Er zijn problemen opgetreden tijdens het toepassen van diff %1 op " +"map %2." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Niet overschrijven" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Kon geen tijdelijk bestand openen." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Kon niet naar het tijdelijke bestand %1schrijven. Het wordt " +"verwijderd." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Bezig met het uitvoeren van diff..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Kan de doelmap %1 niet aanmaken.\n" +"Het bestand is niet opgeslagen." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Bezig met het ontleden van de diff uitvoer..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Kon het tijdelijke bestand niet verplaatsen naar %1. Het " +"tijdelijke bestand is nog steeds beschikbaar als: %2. U kunt het " +"eventueel handmatig verplaatsen naar de juiste locatie." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Bezig met het vergelijken van bestand %1 met bestand %2" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Kon de diff-uitvoer niet ontleden." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Bezig met het vergelijken van bestanden in %1 met bestanden in %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "De bestanden zijn identiek." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Bezig met het tonen van de diff uitvoer van bestand %1" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Kon niet naar het tijdelijke bestand schrijven." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Bezig met in het invoegen van de diff uitvoer van bestand %1 in bestand %2..." +"Een programma om de verschillen tussen bestanden weer te geven en optioneel " +"een diff te genereren" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Bezig met het invoegen van de diff uitvoer van bestand %1 in map %2..." +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Hiermee kunt URL-adres1 met URL-adres2 vergelijken" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"U hebt wijzigingen in het doelbestand(en) gemaakt.\n" -"Wilt u deze opslaan?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Wijzigingen opslaan?" +"Dit zal URL-adres openen en er wordt aangenomen dat dit bestand diff uitvoer " +"bevat. URL-adres 1 kan ook een '-' zijn en dan word er van stdin (standaard " +"invoer) gelezen. Dit kan bijvoorbeeld worden gebruikt voor cvs diff | " +"kompare -o -. Kompare zal een controle uitvoeren om te kijken of het de " +"originele bestanden kan vinden en dan de diff uitvoer in het originele " +"bestand of bestanden in voegen en dat weergeven. De optie -n schakelt het " +"automatisch zoeken uit." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Geen diff-bestand, of er is geen vergelijking tussen twee bestanden geweest. Er " -"zijn daarom geen statistieken beschikbaar." - -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff-statistieken" +"Deze optie zal URL2 in URL1 invoegen, van URL2 word aangenomen dat het diff " +"uitvoer is en dat URL1 het bestand of de map is waar de uitvoer ingevoegd " +"moet worden." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistieken:\n" -"\n" -"Oud bestand: %1\n" -"Nieuw bestand: %2\n" -"\n" -"Formaat: %3\n" -"Aantal brokken: %4\n" -"Aantal verschillen: %5" +"Deze optie schakelt de controle op het vinden van het originele bestand of " +"bestanden in de diff uitvoer uit wanneer er gebruikt word gemaakt van '-' " +"als URL-adres met de optie -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Gebruik dit om de codering te kiezen als u het vanaf de commandoregel " +"aanroept. Als u niets specificeert zal de standaardcodering worden gebruikt." + +#: 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 en Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Auteur" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare pictogramontwerper" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Erg veel goed advies" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff-weergaveprogramma" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Vergelijk deze bestanden of mappen" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "B&estanden" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Verschil" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Weergave-instellingen" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Diff uitvoeren in" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Commandoprompt" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- bron doel" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pties" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Zoek naar kleinere veranderingen" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Voor grote bestanden optimaliseren" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Veranderingen in hoofd-/kleine letters negeren" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Tabs naar spaties veranderen" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Toegevoegde of verwijderde lege regels negeren" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Veranderingen in witruimte negeren" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Functienamen tonen" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Mappen recursief vergelijken" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Nieuwe bestanden als leeg behandelen" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Opmaak" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Naast elkaar" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistieken:\n" -"\n" -"Aantal bestanden in het diff-bestand: %1\n" -"Formaat: %2\n" -"\n" -"Huidig oud bestand: %3\n" -"Huidig nieuw bestand: %4\n" -"\n" -"Aantal brokken: %5\n" -"Aantal verschillen: %6" diff --git a/tde-i18n-pa/messages/tdesdk/kompare.po b/tde-i18n-pa/messages/tdesdk/kompare.po index b9b8a899944..d09e397ca4a 100644 --- a/tde-i18n-pa/messages/tdesdk/kompare.po +++ b/tde-i18n-pa/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2007-01-17 10:57+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" @@ -17,310 +17,13 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "ਅੰਤਰ ਲਾਗੂ(&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "ਅੰਤਰ ਲਾਗੂ ਕਰਨਾ ਵਾਪਸ(&a)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "ਸਭ ਲਾਗੂ(&l)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "ਸਭ ਲਾਗੂ ਵਾਪਸ(&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "ਪਿੱਛੇ ਫਾਇਲ(&r)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "ਅੱਗੇ ਫਾਇਲ(&e)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "ਪਿੱਛੇ ਅੰਤਰ(&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "ਅੱਗੇ ਅੰਤਰ(&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "ਇੱਕ ਆਰਜ਼ੀ ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "ਫਾਇਲਾਂ ਇੱਕੋ ਜਿਹੀਆਂ ਹੀ ਹਨ।" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "ਅੰਤਰ(&D)" - -#. 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 "cd dir && diff -udHprNa -- source destination" - -#. 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 "Ed" - -#. 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 "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 "ਕੇ-ਅੰਤਰ" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh ਅਤੇ Otto Bruggeman" - -#: 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 "ਸਰਵੀਸੀਆ diff ਦਰਸ਼ਕ" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -426,17 +129,40 @@ msgstr "ਇਸ ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆ #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਤੁਲਨਾ" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "ਸਰੋਤ" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "ਨਿਯਤ" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "ਤੁਲਨਾ" + #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "ਇਹ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "ਪਾਠ ਝਲਕ" @@ -524,18 +250,225 @@ msgstr "ਅਣਜਾਣ" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "ਇੱਥੇ ਤੁਸੀਂ ਤੁਲਨਾ ਕਰਨ ਲਈ ਫਾਇਲਾਂ ਦੇ ਸਕਦੇ ਹੋ।" - +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "ਸਭ ਚੁਣੋ(&A)" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "ਅੰਤਰ ਸੰਭਾਲੋ(&d)..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "ਅੰਤਰ ਚੋਣਾਂ" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|ਪੈਂਚ ਫਾਇਲਾਂ" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr ".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 "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "" + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "ਫਾਇਲ %1 ਦੀ ਫਾਇਲ %2 ਨਾਲ ਤੁਲਨਾ..." + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1 ਵਿੱਚੋਂ ਫਾਇਲਾਂ ਦੀ %2 ਵਿਚਲੀਆਂ ਫਾਇਲਾਂ ਨਾਲ ਤੁਲਨਾ" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 ਤੋਂ ਅੰਤਰ ਆਉਟਪੁੱਟ ਵੇਖੋ" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"ਅੰਕੜੇ:\n" +"\n" +"ਪੁਰਾਣੀ ਫਾਇਲ: %1\n" +"ਨਵੀਂ ਫਾਇਲ: %2\n" +"\n" +"ਫਾਰਮੈਟ: %3\n" +"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %4\n" +"ਅੰਤਰਾਂ ਦੀ ਗਿਣਤੀ: %5" + +#: 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 "" +"ਅੰਕੜੇ:\n" +"\n" +"ਅੰਤਰ ਫਾਇਲਾਂ ਵਿੱਚ ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ: %1\n" +"ਫਾਰਮੈਟ: %2\n" +"\n" +"ਮੌਜੂਦਾ ਪੁਰਾਣੀ ਫਾਇਲ: %3\n" +"ਮੌਜੂਦਾ ਨਵੀਂ ਫਾਇਲ: %4\n" +"\n" +"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %5\n" +"ਅੰਤਰਾਂ ਗਿਣਤੀ: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "ਮੇਰੀ ਪਸੰਦ" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "ਪਾਠ ਝਲਕ" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "ਵੇਖਣ ਸਥਾਪਨ" + #: 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 "ਫਾਇਲਾਂ(&F)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "ਇੱਥੇ ਤੁਸੀਂ ਤੁਲਨਾ ਕਰਨ ਲਈ ਫਾਇਲਾਂ ਦੇ ਸਕਦੇ ਹੋ।" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "ਇੱਥੇ ਤੁਸੀਂ ਤੁਲਨਾ ਕਰਨ ਵਾਲੀਆਂ ਫਾਇਲਾਂ ਲਈ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "ਦਿੱਖ(&p)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "ਇੱਥੇ ਤੁਸੀਂ ਵੇਖਣ ਸਬੰਧੀ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।" @@ -561,15 +494,20 @@ msgstr "ਆਉਟਪੁੱਟ ਫਾਰਮਿਟ" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "ਪਰਸੰਗ ਦੀਆਂ ਸਤਰਾਂ" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "ਪਰਸੰਗ ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -687,14 +625,14 @@ msgstr "ਅੱਡ ਰੱਖਣ ਲਈ ਫਾਇਲ ਤਰਤੀਬ" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -708,14 +646,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -782,163 +720,252 @@ msgstr "ਫੋਂਟ:" msgid "Size:" msgstr "ਆਕਾਰ:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "ਮੇਰੀ ਪਸੰਦ" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "ਵੇਖਣ ਸਥਾਪਨ" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "ਅੰਤਰ ਸਥਾਪਨ" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "ਸਭ ਚੁਣੋ(&A)" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "ਫੋਂਟ:" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "ਅੰਤਰ ਸੰਭਾਲੋ(&d)..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "ਅੰਤਰ ਲਾਗੂ(&A)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "ਅੰਤਰ ਲਾਗੂ ਕਰਨਾ ਵਾਪਸ(&a)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "ਅੰਕੜੇ ਵੇਖਾਓ" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "ਸਭ ਲਾਗੂ(&l)" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "ਸਭ ਲਾਗੂ ਵਾਪਸ(&U)" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "ਪਿੱਛੇ ਫਾਇਲ(&r)" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "ਅੰਤਰ ਚੋਣਾਂ" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "ਅੱਗੇ ਫਾਇਲ(&e)" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|ਪੈਂਚ ਫਾਇਲਾਂ" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "ਪਿੱਛੇ ਅੰਤਰ(&P)" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".diff ਸੰਭਾਲੋ" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "ਅੱਗੇ ਅੰਤਰ(&N)" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "ਉੱਪਰ ਲਿਖੋ" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "ਉੱਪਰ ਨਾ ਲਿਖੋ" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "ਇੱਕ ਆਰਜ਼ੀ ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "ਫਾਇਲ %1 ਦੀ ਫਾਇਲ %2 ਨਾਲ ਤੁਲਨਾ..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1 ਵਿੱਚੋਂ ਫਾਇਲਾਂ ਦੀ %2 ਵਿਚਲੀਆਂ ਫਾਇਲਾਂ ਨਾਲ ਤੁਲਨਾ" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "ਫਾਇਲਾਂ ਇੱਕੋ ਜਿਹੀਆਂ ਹੀ ਹਨ।" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 ਤੋਂ ਅੰਤਰ ਆਉਟਪੁੱਟ ਵੇਖੋ" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" +"ਇੱਕ ਪਰੋਗਰਾਮ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਫਾਇਲਾਂ ਵਿੱਚ ਅੰਤਰ ਵੇਖਾ ਸਕਦਾ ਹੈ ਅਤੇ ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਅੰਤਰ ਤਿਆਰ ਕਰ ਸਕਦਾ " +"ਹੈ।" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਹਨ?" - -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "ਅੰਤਰ ਅੰਕੜੇ" - -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"ਅੰਕੜੇ:\n" -"\n" -"ਪੁਰਾਣੀ ਫਾਇਲ: %1\n" -"ਨਵੀਂ ਫਾਇਲ: %2\n" -"\n" -"ਫਾਰਮੈਟ: %3\n" -"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %4\n" -"ਅੰਤਰਾਂ ਦੀ ਗਿਣਤੀ: %5" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 "(c) 2001-2004, John Firebaugh ਅਤੇ Otto Bruggeman" + +#: 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 "ਸਰਵੀਸੀਆ diff ਦਰਸ਼ਕ" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "ਇਹਨਾ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "ਫਾਇਲਾਂ(&F)" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "ਅੰਤਰ(&D)" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, 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 "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "ਚੋਣ(&p)" + +#: 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 "" -"ਅੰਕੜੇ:\n" -"\n" -"ਅੰਤਰ ਫਾਇਲਾਂ ਵਿੱਚ ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ: %1\n" -"ਫਾਰਮੈਟ: %2\n" -"\n" -"ਮੌਜੂਦਾ ਪੁਰਾਣੀ ਫਾਇਲ: %3\n" -"ਮੌਜੂਦਾ ਨਵੀਂ ਫਾਇਲ: %4\n" -"\n" -"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %5\n" -"ਅੰਤਰਾਂ ਗਿਣਤੀ: %6" diff --git a/tde-i18n-pl/messages/tdesdk/kompare.po b/tde-i18n-pl/messages/tdesdk/kompare.po index 7975003d115..5ada57f791e 100644 --- a/tde-i18n-pl/messages/tdesdk/kompare.po +++ b/tde-i18n-pl/messages/tdesdk/kompare.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "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: 2006-01-06 00:03+0100\n" "Last-Translator: Marta Rybczynska \n" "Language-Team: Polish \n" @@ -28,336 +28,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Zastosuj różnicę" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "C&ofnij różnicę" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Z&astosuj wszystkie" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Cofnij zastosowanie dla wszystkich" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Poprzedni plik" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Następny plik" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Poprzednia różnica" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Następna różnica" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Brak modeli lub brak różnic. Ten plik: %1 " -"nie jest poprawnym plikiem różnic." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Podczas nakładania poprawki %1 na plik %2 " -"wystąpiły problemy." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Podczas nakładania poprawki %1 na katalog %2 " -"wystąpiły problemy." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Nie można otworzyć pliku tymczasowego." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Nie można zapisać pliku tymczasowego %1, zostanie usunięty." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Nie można utworzyć katalogu docelowego %1.\n" -"Plik nie został zapisany." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Nie można wysłać tymczasowego pliku do lokalizacji docelowej %1" -". Plik tymczasowy jest ciągle dostępny: %2. Można go ręcznie skopiować " -"we właściwe miejsce." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Nie można przetworzyć wyników diffa." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Pliki są identyczne." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nie można zapisać do pliku tymczasowego." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Różnica" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Uruchom diffa w" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Wiersz poleceń" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- źródło cel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Obejrzyj mniejsze zmiany" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optymalizuj dla dużych plików" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Zignoruj zmianę wielkości liter" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Zamień tabulatory na odstępy" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Zignoruj dodane lub usunięte puste linie" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Zignoruj zmiany w białych znakach" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Pokaż nazwy funkcji" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Porównaj katalogi rekursywnie" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Traktuj nowe pliki jako puste" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Kontekst" - -#. 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 "Ed" - -#. 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 "Normalny" - -#. 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 "Połączone" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Strona po stronie" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Liczba linii kontekstu" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program do oglądania różnic między plikami i opcjonalnego tworzenia plików " -"różnicowych" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "To porówna URL1 z URL2" - -#: 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 "" -"To spowoduje otwarcie URL1 jako wyjścia diffa. URL1 może także być '-', a wtedy " -"odczyt nastąpi ze standardowego wejścia. Może być to użyte na przykład do cvs " -"diff | kompare -o -. Kompare sprawdzi, czy może znaleźć oryginalne pliki i " -"włączy je do wyniku diffa oraz pokaże w przeglądarce. -n wyłącza to " -"sprawdzenie." - -#: 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 "" -"Spowoduje to włączenie URL2 do URL1, URL2 powinien być wyjściem diffa a URL1 " -"plikiem lub katalogiem, do którego ma być dołączone." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Wyłącza automatycze wyszukiwanie oryginalnych plików przy użyciu '-' jako URL z " -"opcją '-o'." - -#: 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 "" -"Umożliwia ustawienie używanego kodowania znaków, kiedy wywołanie programu " -"następuje z wiersza komend. Domyślną wartością, jeśli inna nie zostanie podana, " -"jest kodowanie lokalne." - -#: 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 i Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Twórca ikon Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Dużo dobrych rad" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Przeglądarka różnic Cervisii" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Porównywanie plików lub katalogów" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Źródło" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cel" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Porównaj" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Porównaj te pliki albo katalogi" - -#: 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 "" -"Jeśli w pola tego okna dialogowego wpisano 2 nazwy plików lub 2 katalogi, wtedy " -"ten przycisk będzie dostępny i wciśnięcie go rozpocznie ich porównywanie." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Marta Rybczyńska" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -467,28 +144,54 @@ msgstr "Połącz ten plik lub katalog z wynikiem diffa" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Jeśli w pola tego okna wpisano nazwę pliku lub katalogu i plik zawierający " "wynik diffa, to ten przycisk będzie dostępny i naciśnięcie go otworzy główne " -"okno kompare, gdzie zawartość wybranego pliku lub plików z wybranego katalogu " -"będzie połączona z wyjściem diffa tak, aby można było potem zastosować różnice " -"do pliku lub plików. " +"okno kompare, gdzie zawartość wybranego pliku lub plików z wybranego " +"katalogu będzie połączona z wyjściem diffa tak, aby można było potem " +"zastosować różnice do pliku lub plików. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Porównaj te pliki albo katalogi" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Porównywanie plików lub katalogów" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Widok jako tekst" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Źródło" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cel" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Porównaj" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Porównaj te pliki albo katalogi" + +#: 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 "" +"Jeśli w pola tego okna dialogowego wpisano 2 nazwy plików lub 2 katalogi, " +"wtedy ten przycisk będzie dostępny i wciśnięcie go rozpocznie ich " +"porównywanie." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Widok jako tekst" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" msgstr "Katalog źródłowy" #: komparenavtreepart/komparenavtreepart.cpp:66 @@ -584,18 +287,229 @@ msgstr "Nieznane" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Tutaj można podać pliki, które mają być porównane." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Zapisz &wszystkie" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Zapisz .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Zamień źródło z celem" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Pokaż statystyki" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Nie można pobrać spod adresu URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 nie istnieje w tym systemie." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opcje diffa" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Pliki łat" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Zapisz .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Plik istnieje lub jest zabezpieczony przed zapisem. Czy go nadpisać?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Plik istnieje" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Nadpisz" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nie nadpisuj" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Uruchamianie diffa..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Parsowanie wyniku diffa.." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Porównywanie pliku %1 z plikiem %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Porównywanie plików w: %1 z plikami w: %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Przeglądanie wyniku diffa z %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Włączanie wyjścia diffa z %1 do pliku %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Włączanie wyjścia diffa z %1 do katalogu %2" + +#: 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 "" +"Wprowadzono zmiany do plików docelowych.\n" +"Czy je zapisać?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Czy zapisać zmiany?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Połączone" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normalny" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Brak pliku diff lub diff nie został wykonany na dwóch plikach. Z tego powodu " +"statystyki nie są dostępne." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statystyki diffa" + +#: 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 "" +"Statystyki:\n" +"\n" +"Stary plik: %1\n" +"Nowy plik: %2\n" +"\n" +"Format: %3\n" +"Liczba części: %4\n" +"Liczba różnic: %5" + +#: 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 "" +"Statystyki:\n" +"\n" +"Liczba plików w pliku diff: %1\n" +"Format: %2\n" +"\n" +"Aktualny stary plik: %3\n" +"Aktualny nowy plik: %4\n" +"\n" +"Liczba części: %5\n" +"Liczba różnic: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferencje" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Widok jako tekst" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Pokaż ustawienia" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Opcje diffa" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Pliki" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Tutaj można podać pliki, które mają być porównane." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Tutaj można zmienić opcje porównywania plików." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Wygląd" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Tutaj można zmienić opcje widoku." @@ -623,18 +537,23 @@ msgstr "Format wyjściowy" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Wybór formatu wyjściowego diffa. Zunifokowany jest używany najczęściej, " -"ponieważ jest czytelny. Twórcy TDE najbardziej go lubią, więc dobrym pomysłem " -"jest używanie go przy przysyłaniu łat." +"ponieważ jest czytelny. Twórcy TDE najbardziej go lubią, więc dobrym " +"pomysłem jest używanie go przy przysyłaniu łat." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Linie kontekstu" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Liczba linii kontekstu" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -759,16 +678,16 @@ msgstr "Pliki do wyłączenia" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Jest zaznaczone, jeśli wprowadzony został wzorzec do pola tekstowego po prawej " -"lub wybrano element z listy." +"Jest zaznaczone, jeśli wprowadzony został wzorzec do pola tekstowego po " +"prawej lub wybrano element z listy." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Tu można wpisać lub usunąć wzorzec albo wybrać jeden lub więcej elementów z " "listy." @@ -784,19 +703,19 @@ msgstr "Jeśli włączone, można wpisać nazwę pliku w pole po prawej." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Tu można wpisać URL pliku z wzorcami. Pasujące do nich pliki nie będą " "uwzględniane podczas porównywania katalogów." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Każdy plik wybrany z okna dialogowego pojawiającego się po kliknięciu zostanie " -"wstawiony do okna dialogowego po lewej stronie przycisku." +"Każdy plik wybrany z okna dialogowego pojawiającego się po kliknięciu " +"zostanie wstawiony do okna dialogowego po lewej stronie przycisku." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -862,167 +781,276 @@ msgstr "Czcionka:" msgid "Size:" msgstr "Rozmiar:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferencje" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Czcionka:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Pokaż ustawienia" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Zastosuj różnicę" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Opcje diffa" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "C&ofnij różnicę" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Zapisz &wszystkie" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Z&astosuj wszystkie" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Zapisz .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Cofnij zastosowanie dla wszystkich" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Zamień źródło z celem" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Pokaż statystyki" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Nie można pobrać spod adresu URL %1." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 nie istnieje w tym systemie." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opcje diffa" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Pliki łat" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Poprzedni plik" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Zapisz .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Następny plik" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Plik istnieje lub jest zabezpieczony przed zapisem. Czy go nadpisać?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Poprzednia różnica" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Plik istnieje" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Następna różnica" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Nadpisz" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Brak modeli lub brak różnic. Ten plik: %1 nie jest poprawnym " +"plikiem różnic." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nie nadpisuj" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Podczas nakładania poprawki %1 na plik %2 wystąpiły " +"problemy." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Podczas nakładania poprawki %1 na katalog %2 wystąpiły " +"problemy." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Uruchamianie diffa..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Nie można otworzyć pliku tymczasowego." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Parsowanie wyniku diffa.." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Nie można zapisać pliku tymczasowego %1, zostanie usunięty." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Porównywanie pliku %1 z plikiem %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Nie można utworzyć katalogu docelowego %1.\n" +"Plik nie został zapisany." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Porównywanie plików w: %1 z plikami w: %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Nie można wysłać tymczasowego pliku do lokalizacji docelowej %1. " +"Plik tymczasowy jest ciągle dostępny: %2. Można go ręcznie skopiować " +"we właściwe miejsce." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Przeglądanie wyniku diffa z %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Nie można przetworzyć wyników diffa." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Włączanie wyjścia diffa z %1 do pliku %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Pliki są identyczne." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Włączanie wyjścia diffa z %1 do katalogu %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nie można zapisać do pliku tymczasowego." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Wprowadzono zmiany do plików docelowych.\n" -"Czy je zapisać?" +"Program do oglądania różnic między plikami i opcjonalnego tworzenia plików " +"różnicowych" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Czy zapisać zmiany?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "To porówna URL1 z URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Brak pliku diff lub diff nie został wykonany na dwóch plikach. Z tego powodu " -"statystyki nie są dostępne." +"To spowoduje otwarcie URL1 jako wyjścia diffa. URL1 może także być '-', a " +"wtedy odczyt nastąpi ze standardowego wejścia. Może być to użyte na przykład " +"do cvs diff | kompare -o -. Kompare sprawdzi, czy może znaleźć oryginalne " +"pliki i włączy je do wyniku diffa oraz pokaże w przeglądarce. -n wyłącza to " +"sprawdzenie." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statystyki diffa" +#: 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 "" +"Spowoduje to włączenie URL2 do URL1, URL2 powinien być wyjściem diffa a URL1 " +"plikiem lub katalogiem, do którego ma być dołączone." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statystyki:\n" -"\n" -"Stary plik: %1\n" -"Nowy plik: %2\n" -"\n" -"Format: %3\n" -"Liczba części: %4\n" -"Liczba różnic: %5" +"Wyłącza automatycze wyszukiwanie oryginalnych plików przy użyciu '-' jako " +"URL z opcją '-o'." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Umożliwia ustawienie używanego kodowania znaków, kiedy wywołanie programu " +"następuje z wiersza komend. Domyślną wartością, jeśli inna nie zostanie " +"podana, jest kodowanie lokalne." + +#: 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 i Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Twórca ikon Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Dużo dobrych rad" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Przeglądarka różnic Cervisii" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Porównaj te pliki albo katalogi" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Pliki" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Różnica" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Pokaż ustawienia" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Uruchom diffa w" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Wiersz poleceń" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- źródło cel" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Opcje" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Obejrzyj mniejsze zmiany" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optymalizuj dla dużych plików" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Zignoruj zmianę wielkości liter" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Zamień tabulatory na odstępy" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Zignoruj dodane lub usunięte puste linie" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Zignoruj zmiany w białych znakach" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Pokaż nazwy funkcji" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Porównaj katalogi rekursywnie" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Traktuj nowe pliki jako puste" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Strona po stronie" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statystyki:\n" -"\n" -"Liczba plików w pliku diff: %1\n" -"Format: %2\n" -"\n" -"Aktualny stary plik: %3\n" -"Aktualny nowy plik: %4\n" -"\n" -"Liczba części: %5\n" -"Liczba różnic: %6" diff --git a/tde-i18n-pt/messages/tdesdk/kompare.po b/tde-i18n-pt/messages/tdesdk/kompare.po index 7a1f40e3000..e0b47c762fb 100644 --- a/tde-i18n-pt/messages/tdesdk/kompare.po +++ b/tde-i18n-pt/messages/tdesdk/kompare.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "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: 2007-04-10 14:49+0100\n" "Last-Translator: José Nuno Pires \n" "Language-Team: pt \n" @@ -18,337 +18,13 @@ msgstr "" "X-POFile-IgnoreConsistency: Source\n" "X-POFile-SpellExtra: Patches patch\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplicar a Diferença" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Ign&orar a Diferença" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&licar Tudo" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Ignorar T&udo" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fichei&ro Anterior" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Próximo Ficheiro" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Diferença &Anterior" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Próxima Diferença" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Não existem modelos ou diferenças, este ficheiro: %1 " -"não é um ficheiro de 'diff' válido." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Ocorreram problemas ao aplicar o 'diff' %1 ao ficheiro %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Ocorreram problemas ao aplicar o 'diff' %1 à pasta %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Não foi possível aceder a um ficheiro temporário." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Não foi possível gravar no ficheiro temporário %1, a apagar." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Não foi possível criar a pasta de destino %1.\n" -"O ficheiro não foi gravado." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Não foi possível enviar o ficheiro temporário para a localização de destino " -"%1. O ficheiro temporário mantém-se à mesma em %2" -". Você poderá copiá-lo manualmente para o local correcto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Não consigo analisar o resultado do diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Os ficheiros são idênticos." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Não foi possível gravar no ficheiro temporário." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Diferença" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Correr o Diff na" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Linha de Comandos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- origem destino" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Procurar alterações menores" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizar para ficheiros grandes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorar as mudanças de capitalização" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expandir os TABS para espaços" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorar as linhas em branco adicionadas ou removidas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorar as alterações dos espaços em branco" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostrar os nomes das funções" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Comparar recursivamente as pastas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratar os ficheiros novos como vazios" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formato" - -#. 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 "Contexto" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unificado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Lado-a-lado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Número de linhas de contexto:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Um programa para ver as diferenças entre ficheiros e para gerar opcionalmente " -"um registo das diferenças" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Isto irá comparar o URL1 com o URL2" - -#: 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 "" -"Isto irá abrir o URL1 e esperar por ele como sendo o resultado do 'diff'. O " -"URL1 pode também ser um '-', onde ele irá ler do 'standard input'. Pode ser " -"usado, por exemplo, para o cvs diff | kompare -o -. O Kompare fará uma " -"verificação para confirmar se consegue encontrar os ficheiros originais e então " -"fundir os mesmos no resultado do 'diff' e mostrar o resultado no visualizador. " -"O -n desactiva a verificação." - -#: 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 "" -"Isto irá fundir o URL2 no URL1. O URL2 é esperado como sendo o resultado do " -"'diff' e o URL1 o ficheiro ou pasta que o resultado do 'diff' está à espera de " -"existir para fundir." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Desactiva a verificação para procurar automaticamente os ficheiros originais ao " -"usar o '-' como URL na opção -o." - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" -"Use isto para seleccionar a codificação, quando o invocar a partir da linha de " -"comandos. Irá usar a codificação local se não foi explicitamente indicada." - -#: 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 e Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Artista dos ícones do Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Alguns bons avisos" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visualizador do 'diff' do Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Comparar Ficheiros ou Pastas" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Origem" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destino" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Comparar" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Comparar estes ficheiros ou pastas" - -#: 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 "" -"Se indicou 2 ficheiros ou 2 pastas nos campos desta janela, então este botão " -"ficará activo e, se o carregar, irá iniciar uma comparação dos ficheiros ou " -"pastas indicados." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "José Nuno Pires,Pedro Morais" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -454,28 +130,54 @@ msgstr "Fundir este ficheiro ou pasta com o resultado do 'diff'" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Se indicou um ficheiro ou uma pasta, para além de um ficheiro que contém o " -"resultado do 'diff' nos campos desta janela, então este botão ficará activo e, " -"se carregar nele, irá abrir a janela principal do Kompare, onde o resultado do " -"ficheiro ou ficheiros introduzidos é misturado com o resultado do 'diff', de " -"modo a que você possa então aplicar as diferenças a um ficheiro ou aos " -"ficheiros." +"resultado do 'diff' nos campos desta janela, então este botão ficará activo " +"e, se carregar nele, irá abrir a janela principal do Kompare, onde o " +"resultado do ficheiro ou ficheiros introduzidos é misturado com o resultado " +"do 'diff', de modo a que você possa então aplicar as diferenças a um " +"ficheiro ou aos ficheiros." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Comparar estes ficheiros ou pastas" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Comparar Ficheiros ou Pastas" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Vista de Texto" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Origem" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destino" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Comparar" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Comparar estes ficheiros ou pastas" + +#: 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 "" +"Se indicou 2 ficheiros ou 2 pastas nos campos desta janela, então este botão " +"ficará activo e, se o carregar, irá iniciar uma comparação dos ficheiros ou " +"pastas indicados." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Vista de Texto" + +#: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" msgstr "Pasta de Origem" @@ -566,18 +268,230 @@ msgstr "Desconhecido" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Aqui pode indicar os ficheiro que deseja comparar." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Gr&avar Tudo" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Gravar o .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Trocar a Origem e o Destino" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostrar as Estatísticas" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Não foi possível transferir o URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "O URL %1 não existe no seu sistema." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opções do Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Ficheiros de 'Patches'" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Gravar o .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"O ficheiro já existe ou está protegido contra gravações; deseja sobrepô-lo?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "O Ficheiro Existe" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sobrepor" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Não Sobrepor" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "A correr o diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "A analisar o resultado do 'diff'..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "A comparar o ficheiro %1 com o %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "A comparar os ficheiros em %1 com os em %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "A ver o resultado do 'diff' de %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "A misturar o resultado do 'diff' de %1 no ficheiro %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "A fundir o resultado do 'diff' de %1 na pasta %2" + +#: 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 "" +"Efectuou alterações ao(s) ficheiro(s) de destino.\n" +"Deseja gravá-las?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Gravar as Alterações?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificado" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contexto" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Não existe o ficheiro 'diff' ou não foram comparados 2 ficheiros. Como tal, " +"não existem estatísticas disponíveis." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Estatísticas do Diff" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Ficheiro antigo: %1\n" +"Ficheiro novo: %2\n" +"\n" +"Formato: %3\n" +"Número de blocos: %4\n" +"Número de diferenças: %5" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Número de ficheiros no ficheiro diff: %1\n" +"Formato: %2\n" +"\n" +"Ficheiro antigo: %3\n" +"Ficheiro novo: %4\n" +"\n" +"Número de blocos: %5\n" +"Número de diferenças: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Preferências" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Vista de Texto" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Configuração da Visualização" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diferenças" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Opções do Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Ficheiros" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Aqui pode indicar os ficheiro que deseja comparar." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Aqui pode modificar as opções para comparar os ficheiros." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "A&parência" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Aqui pode modificar as opções para a vista." @@ -593,8 +507,8 @@ msgid "" "you can select that version." msgstr "" "Você poderá seleccionar um programa 'diff' diferente aqui. No Solaris, o " -"programa 'diff' normal não suporte todas as opções que a versão da GNU suporta. " -"Desta forma, você poderá seleccionar essa versão." +"programa 'diff' normal não suporte todas as opções que a versão da GNU " +"suporta. Desta forma, você poderá seleccionar essa versão." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -606,9 +520,9 @@ msgstr "Formato de Saída" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Seleccione o formato do resultado gerado pelo 'diff'. O Unificado é o que é " "usado mais frequentemente por ser bastante legível. Os programadores do TDE " @@ -618,6 +532,11 @@ msgstr "" msgid "Lines of Context" msgstr "Linhas de Contexto" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Número de linhas de contexto:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -625,8 +544,8 @@ msgid "" "unnecessarily." msgstr "" "O número de linhas de contexto é normalmente igual a 2 ou 3. Isto torna o " -"'diff' legível e aplicável na maioria dos casos. Se for mais do que 3 linhas só " -"irá tornar o 'diff' confuso, desnecessariamente." +"'diff' legível e aplicável na maioria dos casos. Se for mais do que 3 linhas " +"só irá tornar o 'diff' confuso, desnecessariamente." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -742,19 +661,19 @@ msgstr "Padrão de Ficheiros a Excluir" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Se esta opção estiver assinala, você poderá indicar um padrão no campo de texto " -"à direita ou seleccionar os itens da lista." +"Se esta opção estiver assinala, você poderá indicar um padrão no campo de " +"texto à direita ou seleccionar os itens da lista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Aqui você poderá indicar ou remover um padrão ou seleccionar um ou mais itens " -"da lista." +"Aqui você poderá indicar ou remover um padrão ou seleccionar um ou mais " +"itens da lista." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -764,24 +683,24 @@ msgstr "Ficheiro com Nomes a Excluir" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Se esta opção estiver assinalada, você poderá indicar o nome de um ficheiro na " -"lista à direita." +"Se esta opção estiver assinalada, você poderá indicar o nome de um ficheiro " +"na lista à direita." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Aqui você poderá indicar o URL de um ficheiro com padrões de nomes a ignorar " "durante a comparação de pastas." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Todos os ficheiros que seleccionar na janela que aparece quando você carregar " -"nela serão postos na janela à esquerda deste botão." +"Todos os ficheiros que seleccionar na janela que aparece quando você " +"carregar nela serão postos na janela à esquerda deste botão." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -847,168 +766,276 @@ msgstr "Tipo de letra:" msgid "Size:" msgstr "Dimensões:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferências" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Tipo de letra:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Configuração da Visualização" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplicar a Diferença" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Opções do Diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Ign&orar a Diferença" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Gr&avar Tudo" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&licar Tudo" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Gravar o .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Ignorar T&udo" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Trocar a Origem e o Destino" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostrar as Estatísticas" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Não foi possível transferir o URL %1." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "O URL %1 não existe no seu sistema." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fichei&ro Anterior" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opções do Diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Próximo Ficheiro" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Ficheiros de 'Patches'" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Diferença &Anterior" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Gravar o .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Próxima Diferença" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"O ficheiro já existe ou está protegido contra gravações; deseja sobrepô-lo?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "O Ficheiro Existe" +"Não existem modelos ou diferenças, este ficheiro: %1 não é um " +"ficheiro de 'diff' válido." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sobrepor" - -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Não Sobrepor" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Ocorreram problemas ao aplicar o 'diff' %1 ao ficheiro %2." +"" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Ocorreram problemas ao aplicar o 'diff' %1 à pasta %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "A correr o diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Não foi possível aceder a um ficheiro temporário." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "A analisar o resultado do 'diff'..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Não foi possível gravar no ficheiro temporário %1, a apagar." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "A comparar o ficheiro %1 com o %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Não foi possível criar a pasta de destino %1.\n" +"O ficheiro não foi gravado." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "A comparar os ficheiros em %1 com os em %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Não foi possível enviar o ficheiro temporário para a localização de " +"destino %1. O ficheiro temporário mantém-se à mesma em %2. " +"Você poderá copiá-lo manualmente para o local correcto." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "A ver o resultado do 'diff' de %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Não consigo analisar o resultado do diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "A misturar o resultado do 'diff' de %1 no ficheiro %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Os ficheiros são idênticos." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "A fundir o resultado do 'diff' de %1 na pasta %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Não foi possível gravar no ficheiro temporário." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Efectuou alterações ao(s) ficheiro(s) de destino.\n" -"Deseja gravá-las?" +"Um programa para ver as diferenças entre ficheiros e para gerar " +"opcionalmente um registo das diferenças" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Gravar as Alterações?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Isto irá comparar o URL1 com o URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Não existe o ficheiro 'diff' ou não foram comparados 2 ficheiros. Como tal, não " -"existem estatísticas disponíveis." +"Isto irá abrir o URL1 e esperar por ele como sendo o resultado do 'diff'. O " +"URL1 pode também ser um '-', onde ele irá ler do 'standard input'. Pode ser " +"usado, por exemplo, para o cvs diff | kompare -o -. O Kompare fará uma " +"verificação para confirmar se consegue encontrar os ficheiros originais e " +"então fundir os mesmos no resultado do 'diff' e mostrar o resultado no " +"visualizador. O -n desactiva a verificação." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Estatísticas do Diff" +#: 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 "" +"Isto irá fundir o URL2 no URL1. O URL2 é esperado como sendo o resultado do " +"'diff' e o URL1 o ficheiro ou pasta que o resultado do 'diff' está à espera " +"de existir para fundir." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estatísticas:\n" -"\n" -"Ficheiro antigo: %1\n" -"Ficheiro novo: %2\n" -"\n" -"Formato: %3\n" -"Número de blocos: %4\n" -"Número de diferenças: %5" +"Desactiva a verificação para procurar automaticamente os ficheiros originais " +"ao usar o '-' como URL na opção -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Use isto para seleccionar a codificação, quando o invocar a partir da linha " +"de comandos. Irá usar a codificação local se não foi explicitamente indicada." + +#: 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 e Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Artista dos ícones do Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Alguns bons avisos" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visualizador do 'diff' do Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Comparar estes ficheiros ou pastas" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Ficheiros" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Diferença" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Configuração da Visualização" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Correr o Diff na" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Linha de Comandos" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- origem destino" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pções" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Procurar alterações menores" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizar para ficheiros grandes" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorar as mudanças de capitalização" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expandir os TABS para espaços" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorar as linhas em branco adicionadas ou removidas" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorar as alterações dos espaços em branco" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostrar os nomes das funções" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Comparar recursivamente as pastas" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratar os ficheiros novos como vazios" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formato" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Lado-a-lado" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estatísticas:\n" -"\n" -"Número de ficheiros no ficheiro diff: %1\n" -"Formato: %2\n" -"\n" -"Ficheiro antigo: %3\n" -"Ficheiro novo: %4\n" -"\n" -"Número de blocos: %5\n" -"Número de diferenças: %6" diff --git a/tde-i18n-pt_BR/messages/tdesdk/kompare.po b/tde-i18n-pt_BR/messages/tdesdk/kompare.po index 4fee08eeb9a..faee30af869 100644 --- a/tde-i18n-pt_BR/messages/tdesdk/kompare.po +++ b/tde-i18n-pt_BR/messages/tdesdk/kompare.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "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: 2006-07-14 17:08+0300\n" "Last-Translator: Marcus Gama \n" "Language-Team: Brazilian Portuguese \n" @@ -19,336 +19,13 @@ msgstr "" "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Aplicar a Diferença" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Ign&orar Diferença" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ap&licar Tudo" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Não &Aplicar Tudo" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "A&rquivo Anterior" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Próximo Arquivo" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Diferença &Anterior" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Próxima Diferença" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Nenhum modelo ou nenhuma diferença, este arquivo: %1" -", não é um arquivo de diferença válido." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Ocorreram problemas ao aplicar a diferença %1 ao arquivo %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Ocorreram problemas ao aplicar a diferença %1 à pasta %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Não foi possível abrir um arquivo temporário." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Não foi possível gravar o arquivo temporário %1, excluindo-o." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Não foi possível criar o diretório destino %1.\n" -"O arquivo não foi salvo." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Nâo foi possível atualizar o arquivo temporário para a localização destino " -"%1. O arquivo temporário ainda está disponível em: %2" -". Você pode copiá-lo manualmente para o local correto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Não consigo analisar o resultado do diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Os arquivos são idênticos." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Não foi possível gravar o arquivo temporário." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Diferença" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Executar Diff em" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Linha de Comandos" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- origem destino" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Procurar por alterações menores" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Otimizar para arquivos grandes" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorar as mudanças de caixa" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expandir os TABS para espaços" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorar as linhas em branco adicionadas ou removidas" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorar as alterações dos espaços em branco" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Mostrar os nomes das funções" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Comparar pastas recursivamente" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tratar os arquivos novos como vazios" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formato" - -#. 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 "Contexto" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Unificado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Lado-a-lado" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Número de linhas de contexto:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Um programa para ver as diferenças entre arquivos e para gerar opcionalmente um " -"registo das diferenças" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Isto comparará URL1 com URL2" - -#: 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 "" -"Isto abrirá URL1 e esperará pela saída do diff. URL1 pode também ser um '-' e " -"então ele lerá da entrada padrão. Pode ser usado por exemplo para cvs diff | " -"konpare -o -. O Kompare fará uma verificação para ver se ele pode encontrar " -"o(s) arquivo(s) original(is) e então misturá-lo(s) com o(s) arquivo(s) " -"original(is) na saída do diff e mostrar isto num visualizador. -n desabilita a " -"verificação." - -#: 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 "" -"Isto mesclará URL2 na URL1, URL2 é esperada para ser a saída do diff e URL1 o " -"arquivo ou pasta que a saída do diff precisa estar para mesclar nele." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Desabilita a verificação para busca automática do(s) arquivo(s) original(is) " -"quando usar '-' como URL com a opção-o." - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" -"Use isto para especificar a codificação ao chamá-lo da linha de comando. Seu " -"padrão é a codificação local se não especificado." - -#: 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 e Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Ícone dp Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Muitos conselhos bons" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Visualizador de diff do Cervisia" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Comparar Arquivos ou Pastas" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Origem" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Destino" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Comparar" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Comparar estes arquivos ou pasta" - -#: 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 "" -"Se você inserir 2 nomes de arquivos ou 2 pastas nos campos deste diálogo então " -"este botão será habilitado e pressioná-lo iniciará a comparação dos arquivos ou " -"pastas inseridos." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Marcus Gama" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -454,23 +131,50 @@ msgstr "Mesclar este arquivo ou pasta com a saída do diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Se você inserir um nome de arquivo ou pasta e um arquivo que contenha saída do " -"diff nos campos neste diálogo então este botão estará habilitado e pressioná-lo " -"fará com que a janela principal do kompare seja aberta onde a saída do arquivo " -"ou arquivos inseridos da pasta são mesclados com a saída do diff, de modo que " -"você possa então aplicar a(s) diferença(s) para um arquivo ou para os arquivos." +"Se você inserir um nome de arquivo ou pasta e um arquivo que contenha saída " +"do diff nos campos neste diálogo então este botão estará habilitado e " +"pressioná-lo fará com que a janela principal do kompare seja aberta onde a " +"saída do arquivo ou arquivos inseridos da pasta são mesclados com a saída do " +"diff, de modo que você possa então aplicar a(s) diferença(s) para um arquivo " +"ou para os arquivos." + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Comparar Arquivos ou Pastas" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Origem" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Destino" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Comparar" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Comparar estes arquivos ou pastas" -#: kompare_shell.cpp:439 +#: 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 "" +"Se você inserir 2 nomes de arquivos ou 2 pastas nos campos deste diálogo " +"então este botão será habilitado e pressioná-lo iniciará a comparação dos " +"arquivos ou pastas inseridos." + +#: kompare_shell.cpp:439 msgid "Text View" msgstr "Janela de Texto" @@ -565,18 +269,230 @@ msgstr "Desconhecido" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Aqui você pode inserir os arquivos que deseja comparar." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "S&alvar Tudo" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Salvar .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Trocar Origem com Destino" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Mostrar as Estatísticas" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "A URL %1 não pôde ser baixada." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "A URL %1 não existe em seu sistema de arquivos." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opções do Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Arquivos de patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Salvar .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"O arquivo existe ou é protegido contra gravação; você deseja sobrescrevê-lo?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Arquivo Existe" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Sobrescrever" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Não Sobrescrever" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Executando diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Analisando saída do diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Comparando arquivo %1 com arquivo %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Comparando os arquivos em %1 com os em %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Vendo saída do diff de %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Misturando saída do diff de %1 para o arquivo %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Misturando saída do diff de %1 para pasta %2" + +#: 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 "" +"Você fez alterações para o(s) arquivo(s) de destino.\n" +"Deseja salvá-las?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Salvar Alterações?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unificado" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Contexto" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nenhum arquivo diff, ou não existem 2 arquivos que tivessem sido " +"compadrados. Deste modo nenhuma estatística disponível." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Estatísticas Diff" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Arquivo antigo: %1\n" +"Arquivo novo: %2\n" +"\n" +"Formato: %3\n" +"Número de blocos: %4\n" +"Número de diferenças: %5" + +#: 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 "" +"Estatísticas:\n" +"\n" +"Número de arquivos no arquivo diff: %1\n" +"Formato: %2\n" +"\n" +"Arquivo antigo atual: %3\n" +"Arquivo novo atual: %4\n" +"\n" +"Número de blocos: %5\n" +"Número de diferenças: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Configurações" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Janela de Texto" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Configurações de Visão" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Configurações do Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Arquivos" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Aqui você pode inserir os arquivos que deseja comparar." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Aqui você pode mudar as opções para comparação dos arquivos." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "A&parência" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Aqui você pode mudar as opções para a janela." @@ -591,9 +507,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Você pode selecionar um programa de diff diferente aqui. O programa padrão do " -"Solaris não suporta todas as opções que a versão GNU suporta. Desta maneira, " -"você pode selecionar esta versão." +"Você pode selecionar um programa de diff diferente aqui. O programa padrão " +"do Solaris não suporta todas as opções que a versão GNU suporta. Desta " +"maneira, você pode selecionar esta versão." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -605,9 +521,9 @@ msgstr "Formato de Saída" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Selecione o formato da saída gerada pelo diff. O formato unificado é o que é " "mais freqüentemente usado, pois é mais legível. Os desenvolvedores do TDE " @@ -617,6 +533,11 @@ msgstr "" msgid "Lines of Context" msgstr "Linhas de Contexto" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Número de linhas de contexto:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -672,8 +593,8 @@ msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" -"Adicione a expressão regular aqui, que você deseja usar. para ignorar as linhas " -"que combinarem com ela." +"Adicione a expressão regular aqui, que você deseja usar. para ignorar as " +"linhas que combinarem com ela." #: libdialogpages/diffpage.cpp:294 msgid "&Edit..." @@ -741,19 +662,19 @@ msgstr "Padrão de Arquivo a Excluir" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Se isto estiver marcado, você pode digitar um padrão do shell na caixa de texto " -"à direita ou selecioná-lo da lista." +"Se isto estiver marcado, você pode digitar um padrão do shell na caixa de " +"texto à direita ou selecioná-lo da lista." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Aqui você pode digitar ou remover um padrão de shell, ou selecionar uma ou mais " -"entradas da lista." +"Aqui você pode digitar ou remover um padrão de shell, ou selecionar uma ou " +"mais entradas da lista." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -768,19 +689,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Aqui você pode digitar a URL de um arquivo, com os padrões do shell, a ser " "ignorado, durante a comparação de pastas." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Qualquer arquivo que você selecionar no diálogo que aparecer quando você clicar " -"nele, será colocado no diálogo na esquerda deste botão." +"Qualquer arquivo que você selecionar no diálogo que aparecer quando você " +"clicar nele, será colocado no diálogo na esquerda deste botão." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -846,168 +767,276 @@ msgstr "Fonte:" msgid "Size:" msgstr "Tamanho:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Configurações" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Configurações de Visão" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Configurações do Diff" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "S&alvar Tudo" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Fonte:" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Salvar .&diff..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Aplicar a Diferença" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Trocar Origem com Destino" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Ign&orar Diferença" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Mostrar as Estatísticas" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ap&licar Tudo" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "A URL %1 não pôde ser baixada." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Não &Aplicar Tudo" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "A URL %1 não existe em seu sistema de arquivos." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "A&rquivo Anterior" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opções do Diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Próximo Arquivo" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Arquivos de patch" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Diferença &Anterior" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Salvar .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Próxima Diferença" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"O arquivo existe ou é protegido contra gravação; você deseja sobrescrevê-lo?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Arquivo Existe" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Sobrescrever" +"Nenhum modelo ou nenhuma diferença, este arquivo: %1, não é um " +"arquivo de diferença válido." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Não Sobrescrever" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Ocorreram problemas ao aplicar a diferença %1 ao arquivo %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Ocorreram problemas ao aplicar a diferença %1 à pasta %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Executando diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Não foi possível abrir um arquivo temporário." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Analisando saída do diff..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Não foi possível gravar o arquivo temporário %1, excluindo-o." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Comparando arquivo %1 com arquivo %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Não foi possível criar o diretório destino %1.\n" +"O arquivo não foi salvo." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Comparando os arquivos em %1 com os em %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Nâo foi possível atualizar o arquivo temporário para a localização " +"destino %1. O arquivo temporário ainda está disponível em: %2. " +"Você pode copiá-lo manualmente para o local correto." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Vendo saída do diff de %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Não consigo analisar o resultado do diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Misturando saída do diff de %1 para o arquivo %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Os arquivos são idênticos." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Misturando saída do diff de %1 para pasta %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Não foi possível gravar o arquivo temporário." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Você fez alterações para o(s) arquivo(s) de destino.\n" -"Deseja salvá-las?" +"Um programa para ver as diferenças entre arquivos e para gerar opcionalmente " +"um registo das diferenças" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Salvar Alterações?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Isto comparará URL1 com URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Nenhum arquivo diff, ou não existem 2 arquivos que tivessem sido compadrados. " -"Deste modo nenhuma estatística disponível." +"Isto abrirá URL1 e esperará pela saída do diff. URL1 pode também ser um '-' " +"e então ele lerá da entrada padrão. Pode ser usado por exemplo para cvs diff " +"| konpare -o -. O Kompare fará uma verificação para ver se ele pode " +"encontrar o(s) arquivo(s) original(is) e então misturá-lo(s) com o(s) " +"arquivo(s) original(is) na saída do diff e mostrar isto num visualizador. -n " +"desabilita a verificação." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Estatísticas Diff" +#: 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 "" +"Isto mesclará URL2 na URL1, URL2 é esperada para ser a saída do diff e URL1 " +"o arquivo ou pasta que a saída do diff precisa estar para mesclar nele." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Estatísticas:\n" -"\n" -"Arquivo antigo: %1\n" -"Arquivo novo: %2\n" -"\n" -"Formato: %3\n" -"Número de blocos: %4\n" -"Número de diferenças: %5" +"Desabilita a verificação para busca automática do(s) arquivo(s) original(is) " +"quando usar '-' como URL com a opção-o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Use isto para especificar a codificação ao chamá-lo da linha de comando. Seu " +"padrão é a codificação local se não especificado." + +#: 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 e Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Ícone dp Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Muitos conselhos bons" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Visualizador de diff do Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Comparar estes arquivos ou pasta" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Arquivos" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Diferença" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Configurações de Visão" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Executar Diff em" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Linha de Comandos" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- origem destino" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pções" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Procurar por alterações menores" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Otimizar para arquivos grandes" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorar as mudanças de caixa" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expandir os TABS para espaços" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorar as linhas em branco adicionadas ou removidas" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorar as alterações dos espaços em branco" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Mostrar os nomes das funções" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Comparar pastas recursivamente" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tratar os arquivos novos como vazios" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formato" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Lado-a-lado" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Estatísticas:\n" -"\n" -"Número de arquivos no arquivo diff: %1\n" -"Formato: %2\n" -"\n" -"Arquivo antigo atual: %3\n" -"Arquivo novo atual: %4\n" -"\n" -"Número de blocos: %5\n" -"Número de diferenças: %6" diff --git a/tde-i18n-ro/messages/tdesdk/kompare.po b/tde-i18n-ro/messages/tdesdk/kompare.po index 15034f5eef4..d50a7c73be4 100644 --- a/tde-i18n-ro/messages/tdesdk/kompare.po +++ b/tde-i18n-ro/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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" "Last-Translator: Claudiu Costin \n" "Language-Team: Romanian \n" @@ -15,308 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "" - -#. 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -414,17 +119,40 @@ msgstr "" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "" @@ -492,34 +220,220 @@ msgid "" "Applied: Deletion of %n lines undone" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "" + +#: 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 "The URL %1 cannot be downloaded." +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" + +#: 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 "" -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" msgstr "" #: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +msgid "Files" msgstr "" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." msgstr "" #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" +#: kompareurldialog.cpp:53 +msgid "Appearance" +msgstr "" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -545,15 +459,20 @@ msgstr "" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -671,14 +590,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -692,14 +611,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -766,145 +685,249 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Preferinţe" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" msgstr "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" msgstr "" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" msgstr "" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" msgstr "" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" msgstr "" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" msgstr "" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" msgstr "" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " msgstr "" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" +#: main.cpp:52 +msgid "Kompare" msgstr "" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" +#: main.cpp:55 main.cpp:56 +msgid "Author" msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:57 +msgid "Kompare icon artist" msgstr "" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, 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 "" diff --git a/tde-i18n-ru/messages/tdesdk/kompare.po b/tde-i18n-ru/messages/tdesdk/kompare.po index 8c799ae2f40..7dd1ff0440f 100644 --- a/tde-i18n-ru/messages/tdesdk/kompare.po +++ b/tde-i18n-ru/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2005-11-04 21:27+0200\n" "Last-Translator: Nick Shaforostoff \n" "Language-Team: Russian \n" @@ -15,332 +15,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Применить различия" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Отменить различия" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Применить &все" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Отменить все" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&редыдущий файл" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Следующий файл" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Пр&едыдущее различие" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "С&ледующее различие" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Нет макетов или различий. Файл %1 не является файлом формата " -"diff." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Возникли проблемы во время применения diff %1 к файлу %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Возникли проблемы во время применения diff %1 к папке %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Не удаётся открыть временный файл." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Не удаётся записать во временный файл %1, удаляем его." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Не удалось создать конечную папку %1.\n" -"Файл не сохранён." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Не удаётся загрузить временный файл в точку назначения %1" -". Временный файл всё ещё доступен под именем %2" -". Вы можете вручную скопировать его в нужное место." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Не удаётся обработать вывод diff." - -#: 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 "Запустить Diff в" - -#. 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 "cd dir && diff -udHprNa -- <источник> <назначение>" - -#. 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 "Ed" - -#. 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 "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 "Программа для просмотра различий между файлами и создания файла diff." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Сравнение \"Ссылки1\" с \"Ссылкой2\"" - -#: 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 "" -"Открыть URL1, считая,что это вывод diff. URL1 также может быть '-'. Это можно " -"использовать, например, так: cvs diff | kompare -o -. Kompare проверит, " -"существует ли оригинальный файл, а затем смешает с выводом diff и покажет " -"результат. Ключ -n отменяет проверку." - -#: 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 "" -"Смешать URL2 и URL1, URL2 должен быть выводом diff, а URL1 - (оригинальный) " -"файл или папка." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Отключает проверку автоматического поиска оригинального файла(ов) при " -"использовании '-' в качестве источника с опцией -o." - -#: 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) и Отто Брюггеман (Otto " -"Bruggeman)" - -#: 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 "Просмотр различий в Cervisia" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Виталий Зайцев" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -450,24 +134,49 @@ msgstr "Слить этот файл или папку с выводом diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Если вы указали имя файла или папки и файл, в котором содержится вывод diff, в " -"этом диалоге, эта кнопка станет доступна и нажатие на неё откроет главное окно " -"Kompare, где вывод указанного файла или файлов из папки смешается с выводом " -"diff так, что вы сможете \"применить\" различия к файлам." +"Если вы указали имя файла или папки и файл, в котором содержится вывод diff, " +"в этом диалоге, эта кнопка станет доступна и нажатие на неё откроет главное " +"окно Kompare, где вывод указанного файла или файлов из папки смешается с " +"выводом diff так, что вы сможете \"применить\" различия к файлам." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Сравнить файлы или папки" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Сравнение файлов или папок" -#: kompare_shell.cpp:439 -msgid "Text View" -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 "Сравнить" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Сравнить файлы или папки" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"Если вы указали файлы или папки в полях этого диалога, эта кнопка станет " +"доступна и нажатие на неё начнёт сравнение указанных файлов или папок." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Просмотр текста" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -566,18 +275,229 @@ msgstr "Неизвестный" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Здесь можно ввести файла для сравнения" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Сохранить &все" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Сохранить различия в файл .&diff..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "Невозможно загрузить ссылку %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Невозможно открыть %1." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Параметры Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Файлы различий (*.diff *.dif *.patch)" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Сохранить .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 "Файл уже существует" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Запущен diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Обрабатывается вывод diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Сравниваются файл %1 с файлом %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Сравниваются файлы в %1 с файлами в %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Просмотр вывода diff из %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Смешивание вывода diff из файла %1 в файл %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Смешивание вывода diff из файла %1 в папку %2" + +#: 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 "" +"Файл назначения был изменён.\n" +"Вы хотите его сохранить?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Нет файла diff или сравнение произведено не по двум файлам. Статистика " +"недоступна." + +#: 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 "" +"Статистика:\n" +"\n" +"Старый файл: %1\n" +"Новый файл: %2\n" +"\n" +"Формат: %3\n" +"Количество не изменённых: %4\n" +"Количество различий: %5" + +#: 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 "" +"Статистика:\n" +"\n" +"Количество файлов в файле различий: %1\n" +"Формат: %2\n" +"\n" +"Текущий старый файл: %3\n" +"Текущий новый файл: %4\n" +"\n" +"Количество не изменённых: %5\n" +"Количество различий: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Параметры" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Просмотр текста" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Настройки вида" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Различия" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Настройки различий" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Файлы" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Здесь можно ввести файла для сравнения" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Здесь можно настроить параметры сравнения" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Представление:" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Здесь можно настроить визуальные параметры" @@ -606,18 +526,23 @@ msgstr "Формат вывода" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Выберите формат вывода, генерируемый diff. Наиболее часто используемым является " -"Unified, т.к. он лёгок для чтения. Пожалуйста, используйте именно его для " -"заплаток, которые вы отправляете разработчикам TDE." +"Выберите формат вывода, генерируемый diff. Наиболее часто используемым " +"является Unified, т.к. он лёгок для чтения. Пожалуйста, используйте именно " +"его для заплаток, которые вы отправляете разработчикам TDE." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Строки контекста" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Количество строк контекста:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -735,16 +660,16 @@ msgstr "Шаблон имени для исключения" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Если это включено, вы сможете ввести маску файла в текстовом поле справа или " "выбрать одно из значений из списка." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Здесь вы можете ввести маску файла, или выбрать предопределённые значения." @@ -760,16 +685,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Здесь вы можете ввести путь к файлу, содержащему маски файлов, которые нужно " "игнорировать при сравнении папок." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Файлы, которые вы выберете в появившемся диалоге, будут видны в списке слева." @@ -837,167 +762,271 @@ msgstr "Шрифт:" msgid "Size:" msgstr "Размер:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Параметры" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Шрифт:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Настройки вида" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Применить различия" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Настройки различий" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Отменить различия" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Сохранить &все" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Применить &все" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Сохранить различия в файл .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +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 "The URL %1 cannot be downloaded." -msgstr "Невозможно загрузить ссылку %1." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Невозможно открыть %1." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&редыдущий файл" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Параметры Diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Следующий файл" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Файлы различий (*.diff *.dif *.patch)" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Пр&едыдущее различие" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Сохранить .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "С&ледующее различие" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Файл уже существует. Заменить его?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Нет макетов или различий. Файл %1 не является файлом формата " +"diff." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Файл уже существует" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Возникли проблемы во время применения diff %1 к файлу %2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Заменить" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Возникли проблемы во время применения diff %1 к папке %2." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Не заменять" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Не удаётся открыть временный файл." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Не удаётся записать во временный файл %1, удаляем его." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Запущен diff..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Не удалось создать конечную папку %1.\n" +"Файл не сохранён." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Обрабатывается вывод diff..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Не удаётся загрузить временный файл в точку назначения %1. " +"Временный файл всё ещё доступен под именем %2. Вы можете вручную " +"скопировать его в нужное место." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Сравниваются файл %1 с файлом %2" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Не удаётся обработать вывод diff." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Сравниваются файлы в %1 с файлами в %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Все файлы идентичны." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Просмотр вывода diff из %1" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Не удаётся записать во временный файл." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Смешивание вывода diff из файла %1 в файл %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Программа для просмотра различий между файлами и создания файла diff." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Смешивание вывода diff из файла %1 в папку %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Сравнение \"Ссылки1\" с \"Ссылкой2\"" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Файл назначения был изменён.\n" -"Вы хотите его сохранить?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Сохранить изменения?" +"Открыть URL1, считая,что это вывод diff. URL1 также может быть '-'. Это " +"можно использовать, например, так: cvs diff | kompare -o -. Kompare " +"проверит, существует ли оригинальный файл, а затем смешает с выводом diff и " +"покажет результат. Ключ -n отменяет проверку." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Нет файла diff или сравнение произведено не по двум файлам. Статистика " -"недоступна." - -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика различий" +"Смешать URL2 и URL1, URL2 должен быть выводом diff, а URL1 - (оригинальный) " +"файл или папка." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Статистика:\n" -"\n" -"Старый файл: %1\n" -"Новый файл: %2\n" -"\n" -"Формат: %3\n" -"Количество не изменённых: %4\n" -"Количество различий: %5" +"Отключает проверку автоматического поиска оригинального файла(ов) при " +"использовании '-' в качестве источника с опцией -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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) и Отто Брюггеман (Otto " +"Bruggeman)" + +#: 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 "Просмотр различий в Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Сравнить файлы или папку" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Файлы" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Различие" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Настройки вида" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Запустить Diff в" + +#: 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 "cd dir && diff -udHprNa -- <источник> <назначение>" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Статистика:\n" -"\n" -"Количество файлов в файле различий: %1\n" -"Формат: %2\n" -"\n" -"Текущий старый файл: %3\n" -"Текущий новый файл: %4\n" -"\n" -"Количество не изменённых: %5\n" -"Количество различий: %6" diff --git a/tde-i18n-rw/messages/tdesdk/kompare.po b/tde-i18n-rw/messages/tdesdk/kompare.po index ff3c4fb2d1c..9ea69d216f1 100644 --- a/tde-i18n-rw/messages/tdesdk/kompare.po +++ b/tde-i18n-rw/messages/tdesdk/kompare.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 3.4\n" -"POT-Creation-Date: 2014-09-29 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2005-05-25 18:11-0600\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -24,607 +24,523 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -#, fuzzy -msgid "&Apply Difference" -msgstr "Ikinyuranyo/Itandukaniro" +#: _translatorinfo:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "" +"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " +"NSENGIYUMVA" -#: libdiff2/komparemodellist.cpp:64 +#: _translatorinfo:2 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "" +"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " +"ndonatienuk@yahoo.co.uk" + +#: kompare_shell.cpp:77 #, fuzzy -msgid "Un&apply Difference" -msgstr "Ikinyuranyo/Itandukaniro" +msgid "Could not find our KompareViewPart." +msgstr "OYA Gushaka . " -#: libdiff2/komparemodellist.cpp:67 +#: kompare_shell.cpp:106 #, fuzzy -msgid "App&ly All" -msgstr "Gushyira Hose" +msgid "Could not load our KompareViewPart." +msgstr "OYA Ibirimo . " -#: libdiff2/komparemodellist.cpp:70 +#: kompare_shell.cpp:114 #, fuzzy -msgid "&Unapply All" -msgstr "Gusubiza Byose" +msgid "Could not find our KompareNavigationPart." +msgstr "OYA Gushaka . " -#: libdiff2/komparemodellist.cpp:73 +#: kompare_shell.cpp:138 #, fuzzy -msgid "P&revious File" -msgstr "Idosiye " +msgid "Could not load our KompareNavigationPart." +msgstr "OYA Ibirimo . " -#: libdiff2/komparemodellist.cpp:76 +#: kompare_shell.cpp:233 #, fuzzy -msgid "N&ext File" -msgstr "Idosiye " +msgid "&Open Diff..." +msgstr "Gufungura ... " -#: libdiff2/komparemodellist.cpp:79 +#: kompare_shell.cpp:234 #, fuzzy -msgid "&Previous Difference" -msgstr "Kureba Ikinyuranyo" +msgid "&Compare Files..." +msgstr "Gukoporora &Amadosiye..." -#: libdiff2/komparemodellist.cpp:82 +#: kompare_shell.cpp:237 #, fuzzy -msgid "&Next Difference" -msgstr "Kureba Ikinyuranyo" +msgid "&Blend URL with Diff..." +msgstr "Na: ... " -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#: kompare_shell.cpp:246 #, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -" Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : %1 " -", ni OYA A Byemewe Idosiye . " +msgid "Show T&ext View" +msgstr "Igaragaza rigufi" -#: libdiff2/komparemodellist.cpp:246 +#: kompare_shell.cpp:248 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr " i %1 Kuri i Idosiye %2 . " +msgid "Hide T&ext View" +msgstr "Name=Igaragaza Umwandiko" -#: libdiff2/komparemodellist.cpp:271 +#: kompare_shell.cpp:257 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr " i %1 Kuri i Ububiko... %2 . " +msgid " 0 of 0 differences " +msgstr "0 %S Bya 0 %S Ibinyuranyo " -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +#: kompare_shell.cpp:258 #, fuzzy -msgid "Could not open a temporary file." -msgstr "OYA Gufungura A By'igihe gito Idosiye . " +msgid " 0 of 0 files " +msgstr "0 %S Bya 0 %S Idosiye " -#: libdiff2/komparemodellist.cpp:350 +#: kompare_shell.cpp:273 #, fuzzy -msgid "Could not write to the temporary file %1, deleting it." +msgid "" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -" OYA Kwandika Kuri i By'igihe gito Idosiye %1 , Gusiba . " +"%1 Bya %n Idosiye \n" +"%1 Bya %n Idosiye " -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy +#: kompare_shell.cpp:275 +#, fuzzy, c-format msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." +"_n: %n file \n" +" %n files " msgstr "" -" OYA Kurema Ishyika: Ububiko %1 . \n" -"Idosiye OYA . " +"%n Idosiye \n" +"%n Idosiye " -#: libdiff2/komparemodellist.cpp:383 +#: kompare_shell.cpp:278 #, fuzzy msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" -" OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo " -"%1 . By'igihe gito Idosiye ni Bihari : %2 " -". N'intoki Gukoporora Kuri i Iburyo: . " +"%1 Bya %n Ikinyuranyo/Itandukaniro , %2 Byashyizweho \n" +"%1 Bya %n Ibinyuranyo , %2 Byashyizweho " -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -#, fuzzy -msgid "Could not parse diff output." -msgstr "OYA Ibisohoka . " +#: kompare_shell.cpp:281 +#, fuzzy, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +"%n Ikinyuranyo/Itandukaniro \n" +"%n Ibinyuranyo " -#: libdiff2/komparemodellist.cpp:451 +#: kompare_shell.cpp:369 #, fuzzy -msgid "The files are identical." -msgstr "Idosiye birasa . " +msgid "Blend File/Folder with diff Output" +msgstr "Idosiye /Na: " -#: libdiff2/komparemodellist.cpp:613 +#: kompare_shell.cpp:370 #, fuzzy -msgid "Could not write to the temporary file." -msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . " +msgid "File/Folder" +msgstr "Idosiye /" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Difference" -msgstr "Ikinyuranyo/ Itandukaniro" +#: kompare_shell.cpp:371 +#, fuzzy +msgid "Diff Output" +msgstr "Ibisohoka" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend" +msgstr "impera" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "Command Line" -msgstr "Komandi" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend this file or folder with the diff output" +msgstr "iyi Idosiye Cyangwa Ububiko... Na: i Ibisohoka " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "& & - - - Inkomoko Ishyika: " +#: kompare_shell.cpp:373 +#, fuzzy +msgid "" +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " +msgstr "" +"A Idosiye Cyangwa Ububiko... Izina: na A Idosiye ifite Ibisohoka in i " +"Amashami: in iyi Ikiganiro Hanyuma iyi Akabuto Bikora na Gufungura Reba i " +"Ibisohoka Bya i Idosiye Cyangwa Idosiye Kuva: i Ububiko... Bivanze Na: i " +"Ibisohoka Hanyuma Gushyiraho i Ikinyuranyo/Itandukaniro ( S ) Kuri A Idosiye " +"Cyangwa Kuri i Idosiye . " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, fuzzy, no-c-format -msgid "Look for smaller changes" -msgstr "ya: Gitoya Amahinduka " +#: kompare_shell.cpp:398 main.cpp:185 +#, fuzzy +msgid "Compare Files or Folders" +msgstr "Cyangwa " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, fuzzy, no-c-format -msgid "Optimize for large files" -msgstr "ya: Kinini Idosiye " +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Inkomoko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, fuzzy, no-c-format -msgid "Ignore changes in case" -msgstr "Amahinduka in " +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Ishyika" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Amasimbuka Kuri Imyanya " +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Kugereranya" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, fuzzy, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Kyongewe Cyangwa Cyavanyweho ubusa Imirongo " +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Idosiye Cyangwa Ububiko " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, fuzzy, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Amahinduka in " +#: kompare_shell.cpp:402 main.cpp:189 +#, fuzzy +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 "" +"2 Cyangwa 2 Ububiko in i Amashami: in iyi Ikiganiro Hanyuma iyi Akabuto " +"Bikora na Tangira &vendorShortName; A Bya i Idosiye Cyangwa Ububiko . " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, fuzzy, no-c-format -msgid "Show function names" -msgstr "Umumaro Amazina " +#: kompare_shell.cpp:439 +#, fuzzy +msgid "Text View" +msgstr "Kugaragaza Ibikurikira" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Ububiko " +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Idosiye y'Ishungura" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, fuzzy, no-c-format -msgid "Treat new files as empty" -msgstr "Gishya Idosiye Nka ubusa " +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Ububiko bw'Ishyika" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Imiterere" +#: komparenavtreepart/komparenavtreepart.cpp:71 +#, fuzzy +msgid "Source File" +msgstr "Idosiye nkomoko" -#. 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 "urwego rw'imyumvire, rw'imivugirwe" +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Amerekezo- Nyandiko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, fuzzy, no-c-format -msgid "Ed" -msgstr "Impera" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Idosiye nkomoko" -#. 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 "Bisanzwe" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Amerekezo-Nyandiko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, fuzzy, no-c-format -msgid "RCS" -msgstr "COS" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, fuzzy, no-c-format -msgid "Unified" -msgstr "Bitarangira" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, fuzzy, no-c-format -msgid "Side-by-side" -msgstr "- ku - " +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, fuzzy, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr ": Kuri %n Umurongo: : Kuri %n Imirongo " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, fuzzy, no-c-format -msgid "Number of context lines:" -msgstr "Bya Imvugiro Imirongo : " +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "%n %n Imirongo " -#: main.cpp:33 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, fuzzy, c-format msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "A Porogaramu Kuri Reba i Ibinyuranyo hagati Idosiye na A " +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Kugereranya # Na: " +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "%n %n Imirongo " -#: main.cpp:40 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, fuzzy, c-format 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 "" -"Gufungura na Kuri Ibisohoka . A ' - ' na Hanyuma Soma Kuva: Bisanzwe Iyinjiza . " -"Byakoreshejwe ya: Urugero ya: | - o - . A Kugenzura Kuri NIBA Gushaka i " -"~Umwimerere Idosiye ( S ) na Hanyuma i ~Umwimerere Idosiye ( S ) i na Herekana " -"%S in i . - n i Kugenzura . " +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " -#: main.cpp:41 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format 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. " +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "%n %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Kitazwi" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" msgstr "" -", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i Kuri . " -#: main.cpp:42 +#: komparepart/kompare_part.cpp:165 #, fuzzy -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"i Kugenzura ya: mu buryo bwikora: i ~Umwimerere Idosiye ( S ) Ryari: ikoresha " -"' - ' Nka Na: i - o Ihitamo . " +msgid "Save &All" +msgstr "Gushyingura Byose" -#: main.cpp:43 +#: komparepart/kompare_part.cpp:168 #, fuzzy -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 "" -"iyi Kuri Kugaragaza i Imisobekere: Ryari: Kuva: i command Umurongo: . Mburabuzi " -"Kuri i Bya hafi Imisobekere: NIBA OYA . " +msgid "Save .&diff..." +msgstr "Kubika." -#: main.cpp:52 +#: komparepart/kompare_part.cpp:171 #, fuzzy -msgid "Kompare" -msgstr "Kugereranya" +msgid "Swap Source with Destination" +msgstr "Na: " -#: main.cpp:54 +#: komparepart/kompare_part.cpp:174 #, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "( C ) - , na " +msgid "Show Statistics" +msgstr "Sitatisitiki" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Umwanditsi" +#: komparepart/kompare_part.cpp:269 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr " %1 Yimuwe . " -#: main.cpp:57 +#: komparepart/kompare_part.cpp:281 #, fuzzy -msgid "Kompare icon artist" -msgstr "Agashushondanga Umuhanzi " +msgid "The URL %1 does not exist on your system." +msgstr " %1 OYA ku Sisitemu . " -#: main.cpp:58 +#: komparepart/kompare_part.cpp:425 #, fuzzy -msgid "A lot of good advice" -msgstr "A Bya " +msgid "Diff Options" +msgstr "Guhitamo" -#: main.cpp:59 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Ushinzwe kureba Impamyabushobozi" +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.DIF." -#: kompare_shell.cpp:398 main.cpp:185 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Compare Files or Folders" -msgstr "Cyangwa " +msgid "Save .diff" +msgstr "Kubika." -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Inkomoko" +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Idosiye Cyangwa ni Kwandika - Birinzwe ; Kuri Guhindura ? " -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Ishyika" +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "File Exists" +msgstr "Idosiye " -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Kugereranya" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Gusimbuza" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:446 #, fuzzy -msgid "Compare these files or folder" -msgstr "Idosiye Cyangwa Ububiko... " +msgid "Do Not Overwrite" +msgstr "Gusimbuza " -#: kompare_shell.cpp:402 main.cpp:189 +#: komparepart/kompare_part.cpp:481 #, fuzzy -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 "" -"2 Cyangwa 2 Ububiko in i Amashami: in iyi Ikiganiro Hanyuma iyi Akabuto Bikora " -"na Tangira &vendorShortName; A Bya i Idosiye Cyangwa Ububiko . " - -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "" -"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " -"NSENGIYUMVA" +msgid "KomparePart" +msgstr "Igice Kate " -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." msgstr "" -"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " -"ndonatienuk@yahoo.co.uk" -#: kompare_shell.cpp:77 +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "OYA Gushaka . " +msgid "Parsing diff output..." +msgstr "Ibisohoka ... " -#: kompare_shell.cpp:106 +#: komparepart/kompare_part.cpp:545 #, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "OYA Ibirimo . " +msgid "Comparing file %1 with file %2" +msgstr "Idosiye %1 Na: Idosiye %2 " -#: kompare_shell.cpp:114 +#: komparepart/kompare_part.cpp:550 #, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "OYA Gushaka . " +msgid "Comparing files in %1 with files in %2" +msgstr "Idosiye in %1 Na: Idosiye in %2 " -#: kompare_shell.cpp:138 -#, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "OYA Ibirimo . " +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Ibisohoka Kuva: %1 " -#: kompare_shell.cpp:233 +#: komparepart/kompare_part.cpp:558 #, fuzzy -msgid "&Open Diff..." -msgstr "Gufungura ... " +msgid "Blending diff output from %1 into file %2" +msgstr "Ibisohoka Kuva: %1 Idosiye %2 " -#: kompare_shell.cpp:234 +#: komparepart/kompare_part.cpp:563 #, fuzzy -msgid "&Compare Files..." -msgstr "Gukoporora &Amadosiye..." +msgid "Blending diff output from %1 into folder %2" +msgstr "Ibisohoka Kuva: %1 Ububiko... %2 " -#: kompare_shell.cpp:237 +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #, fuzzy -msgid "&Blend URL with Diff..." -msgstr "Na: ... " +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"Amahinduka Kuri i Ishyika: Idosiye ( S ) . \n" +"nka Kuri Kubika ? " -#: kompare_shell.cpp:246 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #, fuzzy -msgid "Show T&ext View" -msgstr "Igaragaza rigufi" +msgid "Save Changes?" +msgstr "Kubika ? " -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Name=Igaragaza Umwandiko" +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, fuzzy, no-c-format +msgid "Unified" +msgstr "Bitarangira" -#: kompare_shell.cpp:257 -#, fuzzy -msgid " 0 of 0 differences " -msgstr "0 %S Bya 0 %S Ibinyuranyo " +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "urwego rw'imyumvire, rw'imivugirwe" -#: kompare_shell.cpp:258 -#, fuzzy -msgid " 0 of 0 files " -msgstr "0 %S Bya 0 %S Idosiye " +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, fuzzy, no-c-format +msgid "RCS" +msgstr "COS" -#: kompare_shell.cpp:273 +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, fuzzy, no-c-format +msgid "Ed" +msgstr "Impera" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Bisanzwe" + +#: komparepart/kompare_part.cpp:667 #, fuzzy msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -"%1 Bya %n Idosiye \n" -"%1 Bya %n Idosiye " - -#: kompare_shell.cpp:275 -#, fuzzy, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -"%n Idosiye \n" -"%n Idosiye " +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "Idosiye , Cyangwa Oya 2 Idosiye . Oya stats Bihari . " -#: kompare_shell.cpp:278 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 #, fuzzy -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -"%1 Bya %n Ikinyuranyo/Itandukaniro , %2 Byashyizweho \n" -"%1 Bya %n Ibinyuranyo , %2 Byashyizweho " +msgid "Diff Statistics" +msgstr "Sitatisitiki" -#: kompare_shell.cpp:281 -#, fuzzy, c-format +#: komparepart/kompare_part.cpp:673 +#, fuzzy msgid "" -"_n: %n difference \n" -" %n differences " +"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 "" -"%n Ikinyuranyo/Itandukaniro \n" -"%n Ibinyuranyo " - -#: kompare_shell.cpp:369 -#, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Idosiye /Na: " - -#: kompare_shell.cpp:370 -#, fuzzy -msgid "File/Folder" -msgstr "Idosiye /" - -#: kompare_shell.cpp:371 -#, fuzzy -msgid "Diff Output" -msgstr "Ibisohoka" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend" -msgstr "impera" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend this file or folder with the diff output" -msgstr "iyi Idosiye Cyangwa Ububiko... Na: i Ibisohoka " +": \n" +"\n" +"Idosiye : %1 \n" +"Idosiye : %2 \n" +"\n" +": %3 \n" +"Bya : %4 \n" +"Bya Ibinyuranyo : %5 " -#: kompare_shell.cpp:373 +#: komparepart/kompare_part.cpp:686 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"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 "" -"A Idosiye Cyangwa Ububiko... Izina: na A Idosiye ifite Ibisohoka in i Amashami: " -"in iyi Ikiganiro Hanyuma iyi Akabuto Bikora na Gufungura Reba i Ibisohoka Bya i " -"Idosiye Cyangwa Idosiye Kuva: i Ububiko... Bivanze Na: i Ibisohoka Hanyuma " -"Gushyiraho i Ikinyuranyo/Itandukaniro ( S ) Kuri A Idosiye Cyangwa Kuri i " -"Idosiye . " +": \n" +"\n" +"Bya Idosiye in Idosiye : %1 \n" +": %2 \n" +"\n" +"ki/bishaje Idosiye : %3 \n" +"Gishya Idosiye : %4 \n" +"\n" +"Bya : %5 \n" +"Bya Ibinyuranyo : %6 " -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Idosiye Cyangwa Ububiko " +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Ibyahisemo" -#: kompare_shell.cpp:439 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Text View" +msgid "View" msgstr "Kugaragaza Ibikurikira" -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Idosiye y'Ishungura" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "Ububiko bw'Ishyika" - -#: komparenavtreepart/komparenavtreepart.cpp:71 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Source File" -msgstr "Idosiye nkomoko" +msgid "View Settings" +msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" -#: komparenavtreepart/komparenavtreepart.cpp:72 -#, fuzzy -msgid "Destination File" -msgstr "Amerekezo- Nyandiko" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:78 +#: komparepart/kompareprefdlg.cpp:43 #, fuzzy -msgid "Source Line" -msgstr "Idosiye nkomoko" +msgid "Diff Settings" +msgstr "Amagenamiterere nyamubyimba" -#: komparenavtreepart/komparenavtreepart.cpp:79 +#: kompareurldialog.cpp:41 #, fuzzy -msgid "Destination Line" -msgstr "Amerekezo-Nyandiko" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Ikinyuranyo/Itandukaniro" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, fuzzy, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr ": Kuri %n Umurongo: : Kuri %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, fuzzy, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, fuzzy, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr ": Bya %n Umurongo: : Bya %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, fuzzy, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, fuzzy, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr ": Bya %n Umurongo: : Bya %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, fuzzy, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Kitazwi" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "" +msgid "Files" +msgstr "&Amadosiye" #: kompareurldialog.cpp:41 #, fuzzy msgid "Here you can enter the files you want to compare." msgstr "Injiza i Idosiye Kuri Kugereranya # . " -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "" - #: kompareurldialog.cpp:47 #, fuzzy msgid "Here you can change the options for comparing the files." msgstr "Guhindura... i Amahitamo ya: i Idosiye . " +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Imigaragarire" + #: kompareurldialog.cpp:53 #, fuzzy msgid "Here you can change the options for the view." @@ -642,8 +558,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Guhitamo A Porogaramu . i Bisanzwe Porogaramu OYA Gushigikira Byose i Amahitamo " -"i Verisiyo . Guhitamo Verisiyo . " +"Guhitamo A Porogaramu . i Bisanzwe Porogaramu OYA Gushigikira Byose i " +"Amahitamo i Verisiyo . Guhitamo Verisiyo . " #: libdialogpages/diffpage.cpp:221 #, fuzzy @@ -658,18 +574,23 @@ msgstr "Ibisohoka imiterere:" #: libdialogpages/diffpage.cpp:233 #, fuzzy msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"i Imiterere Bya i Ibisohoka ku . ni i Rimwe ni Byakoreshejwe ni . MukusanyaTDE " -"nka iyi Imiterere i Bihebuje Koresha ya: . " +"i Imiterere Bya i Ibisohoka ku . ni i Rimwe ni Byakoreshejwe ni . " +"MukusanyaTDE nka iyi Imiterere i Bihebuje Koresha ya: . " #: libdialogpages/diffpage.cpp:247 #, fuzzy msgid "Lines of Context" msgstr "Bya " +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, fuzzy, no-c-format +msgid "Number of context lines:" +msgstr "Bya Imvugiro Imirongo : " + #: libdialogpages/diffpage.cpp:253 #, fuzzy msgid "" @@ -812,8 +733,8 @@ msgstr "Idosiye Kuri " #: libdialogpages/diffpage.cpp:330 #, fuzzy msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "iyi ni Ivivuwe Injiza A Igikonoshwa Ishusho in i Umwandiko Agasanduku ku i " "Iburyo: Cyangwa Guhitamo Ibyinjijwe Kuva: i Urutonde . " @@ -821,8 +742,8 @@ msgstr "" #: libdialogpages/diffpage.cpp:332 #, fuzzy msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Injiza Cyangwa Gukuraho A Igikonoshwa Ishusho Cyangwa Guhitamo Rimwe Cyangwa " "Birenzeho Ibyinjijwe Kuva: i Urutonde . " @@ -842,16 +763,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 #, fuzzy msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Injiza i Bya A Idosiye Na: Igikonoshwa Imitako Kuri Kureka i Bya i Ububiko . " #: libdialogpages/diffpage.cpp:344 #, fuzzy msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Idosiye Guhitamo in i Ikiganiro Hejuru Ryari: Kanda Gushyira in i Ikiganiro " "Kuri i Ibumoso: Bya iyi Akabuto . " @@ -928,191 +849,298 @@ msgstr "Imyandikire:" msgid "Size:" msgstr "Ingano:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Ibyahisemo" - -#: komparepart/kompareprefdlg.cpp:39 +#: libdialogpages/viewpage.cpp:119 #, fuzzy -msgid "View Settings" -msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" +msgid "&Fonts" +msgstr "Imyandikire:" -#: komparepart/kompareprefdlg.cpp:43 +#: libdiff2/komparemodellist.cpp:61 #, fuzzy -msgid "Diff Settings" -msgstr "Amagenamiterere nyamubyimba" +msgid "&Apply Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#: komparepart/kompare_part.cpp:165 +#: libdiff2/komparemodellist.cpp:64 #, fuzzy -msgid "Save &All" -msgstr "Gushyingura Byose" +msgid "Un&apply Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#: komparepart/kompare_part.cpp:168 +#: libdiff2/komparemodellist.cpp:67 #, fuzzy -msgid "Save .&diff..." -msgstr "Kubika." +msgid "App&ly All" +msgstr "Gushyira Hose" -#: komparepart/kompare_part.cpp:171 +#: libdiff2/komparemodellist.cpp:70 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Na: " +msgid "&Unapply All" +msgstr "Gusubiza Byose" -#: komparepart/kompare_part.cpp:174 +#: libdiff2/komparemodellist.cpp:73 #, fuzzy -msgid "Show Statistics" -msgstr "Sitatisitiki" +msgid "P&revious File" +msgstr "Idosiye " -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:76 #, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr " %1 Yimuwe . " +msgid "N&ext File" +msgstr "Idosiye " -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:79 #, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr " %1 OYA ku Sisitemu . " +msgid "&Previous Difference" +msgstr "Kureba Ikinyuranyo" -#: komparepart/kompare_part.cpp:425 +#: libdiff2/komparemodellist.cpp:82 #, fuzzy -msgid "Diff Options" -msgstr "Guhitamo" +msgid "&Next Difference" +msgstr "Kureba Ikinyuranyo" -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.DIF." +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +" Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : %1 , ni " +"OYA A Byemewe Idosiye . " -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:246 #, fuzzy -msgid "Save .diff" -msgstr "Kubika." +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr " i %1 Kuri i Idosiye %2 . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:271 #, fuzzy -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Idosiye Cyangwa ni Kwandika - Birinzwe ; Kuri Guhindura ? " +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr " i %1 Kuri i Ububiko... %2 . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 #, fuzzy -msgid "File Exists" -msgstr "Idosiye " - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Gusimbuza" +msgid "Could not open a temporary file." +msgstr "OYA Gufungura A By'igihe gito Idosiye . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "Do Not Overwrite" -msgstr "Gusimbuza " +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +" OYA Kwandika Kuri i By'igihe gito Idosiye %1 , Gusiba . " -#: komparepart/kompare_part.cpp:481 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "KomparePart" -msgstr "Igice Kate " +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +" OYA Kurema Ishyika: Ububiko %1 . \n" +"Idosiye OYA . " -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" +" OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo " +"%1 . By'igihe gito Idosiye ni Bihari : %2 . N'intoki " +"Gukoporora Kuri i Iburyo: . " -#: komparepart/kompare_part.cpp:496 +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 #, fuzzy -msgid "Parsing diff output..." -msgstr "Ibisohoka ... " +msgid "Could not parse diff output." +msgstr "OYA Ibisohoka . " -#: komparepart/kompare_part.cpp:545 +#: libdiff2/komparemodellist.cpp:451 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Idosiye %1 Na: Idosiye %2 " +msgid "The files are identical." +msgstr "Idosiye birasa . " -#: komparepart/kompare_part.cpp:550 +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Comparing files in %1 with files in %2" -msgstr "Idosiye in %1 Na: Idosiye in %2 " +msgid "Could not write to the temporary file." +msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . " -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Ibisohoka Kuva: %1 " +#: main.cpp:33 +#, fuzzy +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "A Porogaramu Kuri Reba i Ibinyuranyo hagati Idosiye na A " -#: komparepart/kompare_part.cpp:558 +#: main.cpp:39 #, fuzzy -msgid "Blending diff output from %1 into file %2" -msgstr "Ibisohoka Kuva: %1 Idosiye %2 " +msgid "This will compare URL1 with URL2" +msgstr "Kugereranya # Na: " -#: komparepart/kompare_part.cpp:563 +#: main.cpp:40 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Ibisohoka Kuva: %1 Ububiko... %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 "" +"Gufungura na Kuri Ibisohoka . A ' - ' na Hanyuma Soma Kuva: Bisanzwe " +"Iyinjiza . Byakoreshejwe ya: Urugero ya: | - o - . A Kugenzura Kuri NIBA " +"Gushaka i ~Umwimerere Idosiye ( S ) na Hanyuma i ~Umwimerere Idosiye ( S ) i " +"na Herekana %S in i . - n i Kugenzura . " -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 #, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Amahinduka Kuri i Ishyika: Idosiye ( S ) . \n" -"nka Kuri Kubika ? " +", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i " +"Kuri . " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: main.cpp:42 #, fuzzy -msgid "Save Changes?" -msgstr "Kubika ? " +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"i Kugenzura ya: mu buryo bwikora: i ~Umwimerere Idosiye ( S ) Ryari: " +"ikoresha ' - ' Nka Na: i - o Ihitamo . " -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 #, fuzzy msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "Idosiye , Cyangwa Oya 2 Idosiye . Oya stats Bihari . " +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"iyi Kuri Kugaragaza i Imisobekere: Ryari: Kuva: i command Umurongo: . " +"Mburabuzi Kuri i Bya hafi Imisobekere: NIBA OYA . " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: main.cpp:52 #, fuzzy -msgid "Diff Statistics" -msgstr "Sitatisitiki" +msgid "Kompare" +msgstr "Kugereranya" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:54 #, fuzzy -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 "" -": \n" -"\n" -"Idosiye : %1 \n" -"Idosiye : %2 \n" -"\n" -": %3 \n" -"Bya : %4 \n" -"Bya Ibinyuranyo : %5 " +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "( C ) - , na " -#: komparepart/kompare_part.cpp:686 +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Umwanditsi" + +#: main.cpp:57 #, fuzzy -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" +msgid "Kompare icon artist" +msgstr "Agashushondanga Umuhanzi " + +#: main.cpp:58 +#, fuzzy +msgid "A lot of good advice" +msgstr "A Bya " + +#: main.cpp:59 +#, fuzzy +msgid "Cervisia diff viewer" +msgstr "Ushinzwe kureba Impamyabushobozi" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Idosiye Cyangwa Ububiko... " + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Amadosiye" + +#: komparepart/komparepartui.rc:13 +#, fuzzy, no-c-format +msgid "&Difference" +msgstr "Ikinyuranyo/ Itandukaniro" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, fuzzy, no-c-format +msgid "Command Line" +msgstr "Komandi" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "& & - - - Inkomoko Ishyika: " + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Amahitamo" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, fuzzy, no-c-format +msgid "Look for smaller changes" +msgstr "ya: Gitoya Amahinduka " + +#: komparepart/komparesaveoptionsbase.ui:146 +#, fuzzy, no-c-format +msgid "Optimize for large files" +msgstr "ya: Kinini Idosiye " + +#: komparepart/komparesaveoptionsbase.ui:157 +#, fuzzy, no-c-format +msgid "Ignore changes in case" +msgstr "Amahinduka in " + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Amasimbuka Kuri Imyanya " + +#: komparepart/komparesaveoptionsbase.ui:173 +#, fuzzy, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Kyongewe Cyangwa Cyavanyweho ubusa Imirongo " + +#: komparepart/komparesaveoptionsbase.ui:181 +#, fuzzy, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Amahinduka in " + +#: komparepart/komparesaveoptionsbase.ui:189 +#, fuzzy, no-c-format +msgid "Show function names" +msgstr "Umumaro Amazina " + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Ububiko " + +#: komparepart/komparesaveoptionsbase.ui:211 +#, fuzzy, no-c-format +msgid "Treat new files as empty" +msgstr "Gishya Idosiye Nka ubusa " + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Imiterere" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, fuzzy, no-c-format +msgid "Side-by-side" +msgstr "- ku - " + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -": \n" -"\n" -"Bya Idosiye in Idosiye : %1 \n" -": %2 \n" -"\n" -"ki/bishaje Idosiye : %3 \n" -"Gishya Idosiye : %4 \n" -"\n" -"Bya : %5 \n" -"Bya Ibinyuranyo : %6 " diff --git a/tde-i18n-sk/messages/tdesdk/kompare.po b/tde-i18n-sk/messages/tdesdk/kompare.po index 05a6d8c1fdc..20f4578bf26 100644 --- a/tde-i18n-sk/messages/tdesdk/kompare.po +++ b/tde-i18n-sk/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2006-08-24 10:56+0100\n" "Last-Translator: Flashmann \n" "Language-Team: Slovak \n" @@ -17,337 +17,13 @@ msgstr "" "X-Generator: KBabel 1.9\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Použiť rozdiel" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Vrátiť rozdiel" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "P&oužiť všetky" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Vrá&tiť všetky zmeny" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "P&redchádzajúci súbor" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Nasledujúci súbor" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Predchádzajúci rozdiel" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Nasledujúci rozdiel" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Žiadne modely ani rozdiely v súbore: %1. Nie je to platný súbor " -"diff." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Nastali problémy pri použití rozdielu %1 na súbor %2." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Nastali problémy pri použití rozdielu %1 na priečinok %2" -"." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Nepodarilo sa otvoriť dočasný súbor." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Nepodaril sa zápis do dočasného súboru %1, súbor bol zmazaný." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Nepodarilo sa vytvoriť cieľový adresár %1.\n" -"Súbor nebol uložený." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Nepodarilo sa poslať dočasný súbor na cieľové umiestnenie %1" -". Dočasný súbor je k dispozícii pod: %2. Môžete ho na správne miesto " -"skopírovať ručne." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Nepodarilo sa spracovať výstup diff." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Súbory sú rovnaké." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nepodaril sa zápis do dočasného súboru." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Rozdiel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Spustiť diff v" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Príkazový riadok" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- zdroj cieľ" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Hľadať menšie zmeny" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimalizovať pre veľké súbory" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorovať zmenu veľkosti písmen" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Nahradiť tabulátory medzerami" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorovať pridané alebo odstránené prázdne riadky" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorovať zmeny v prázdnom mieste" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Zobraziť mená funkcií" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Porovnať priečinky rekurzívne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Nové súbory považovať za prázdne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Formát" - -#. 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 "Kontext" - -#. 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 "Ed" - -#. 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álne" - -#. 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 "Unified" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Vedľa seba" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Počet riadkov kontextu:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program na zobrazenie rozdielov medzi súbormi s prípadnou možnosťou generovať " -"diff." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Toto porovná URL1 a URL2" - -#: 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 "" -"Toto otvorí URL1 a očakáva, že je to rozdiel z programu diff. URL1 môže byť aj " -"'-' a potom sa číta štandardný vstup. Je to možné použiť napríklad ako cvs diff " -"| kompare -o -. Kompare zistí, či môže nájsť pôvodný súbor a ak áno, spojí ho s " -"výstupom diff a zobrazí výsledok. -n kontrolu vypne.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." - -#: 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 "" -"Toto spojí URL2 do URL1. URL2 má byť výstup diff a URL1 súbor alebo priečinok, " -"do ktorého sa má tento diff pridať." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Vypne kontrolu automatického hľadania pôvodného súboru pri použití '-' namiesto " -"URL s voľbou -o." - -#: 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 "" -"Použite túto voľbu pre špecifikovanie kódovanie pri spúšťaní z príkazového " -"riadku. Ak kódovanie nešpecifikujete, bude použité miestne kódovanie." - -#: 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 a Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Tvorca Kompare ikony" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Veľa dobrých rád" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Prehliadač Cervisia diff " - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Porovnať súbory alebo priečinky" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Zdroj" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cieľ" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Porovnať" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Porovnať tieto súbory alebo priečinky" - -#: 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 "" -"Ak ste zadali 2 mená súborov alebo 2 priečinky, toto tlačidlo bude povolené a " -"jeho stlačením sa spustí porovnanie zadaných súborov alebo priečinkov." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Stanislav Višňovský,Jozef Říha,Eugen Tarabčák" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -457,28 +133,53 @@ msgstr "Spojiť tento súbor alebo priečinok s výstupom diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Ak ste zadali súbor alebo priečinok a súbor, ktorý obsahuje výstup diff, toto " -"tlačidlo bude povolené a jeho stlačením sa zobrazí okno, kde bude výsledok " -"zmiešania výstupu diff a súboru alebo priečinkov, takže budete vidieť rozdiely " -"v súbore alebo súboroch." +"Ak ste zadali súbor alebo priečinok a súbor, ktorý obsahuje výstup diff, " +"toto tlačidlo bude povolené a jeho stlačením sa zobrazí okno, kde bude " +"výsledok zmiešania výstupu diff a súboru alebo priečinkov, takže budete " +"vidieť rozdiely v súbore alebo súboroch." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Porovnať tieto súbory alebo priečinky" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Porovnať súbory alebo priečinky" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Textový pohľad" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Zdroj" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Zdrojový priečinok" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cieľ" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Porovnať" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Porovnať tieto súbory alebo priečinky" + +#: 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 "" +"Ak ste zadali 2 mená súborov alebo 2 priečinky, toto tlačidlo bude povolené " +"a jeho stlačením sa spustí porovnanie zadaných súborov alebo priečinkov." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Textový pohľad" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Zdrojový priečinok" #: komparenavtreepart/komparenavtreepart.cpp:66 msgid "Destination Folder" @@ -573,18 +274,229 @@ msgstr "Neznámy" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Sem môžete vložiť súbory, ktoré chcete porovnať." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Uložiť &všetko" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Uložť .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Vymeniť zdroj a cieľ" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Zobraziť štatistiku" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL %1 nie je možné stiahnuť." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 na vašom systéme neexistuje." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Možnosti Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Súbory patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Uložiť .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Súbor existuje, alebo je chránený proti zápisu. Chcete ho prepísať?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Súbor existuje" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Prepísať" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Neprepisovať" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Spúšťam diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Spracovávam výstup diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Porovnávam súbor %1 so súborom %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Porovnávam súbory v %1 so súbormi v %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Zobrazujem výstup diff z %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Spájam výstup diff z %1 do súboru %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Spájam výstup diff z %1 do priečinku %2" + +#: 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 "" +"Zmenili ste cieľ.\n" +"Chcete zmeny uložiť?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Uložiť zmeny?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Unified" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontext" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normálne" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nebolo vykonané porovnanie 2 súborov ani zadaný súbor diff, takže štatistika " +"nie je k dispozícii." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Štatistika Diff" + +#: 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 "" +"Štatistika:\n" +"\n" +"Aktuálny starý súbor: %1\n" +"Aktuálny nový súbor: %2\n" +"\n" +"Formát: %3\n" +"Počet kusov: %4\n" +"Počet rozdielov: %5" + +#: 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 "" +"Štatistika:\n" +"\n" +"Počet súborov v súbore diff: %1\n" +"Formát : %2\n" +"\n" +"Aktuálny starý súbor: %3\n" +"Aktuálny nový súbor: %4\n" +"\n" +"Počet kusov: %5\n" +"Počet rozdielov: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Nastavenia" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textový pohľad" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Zobraziť nastavenie" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Nastavenie Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Súbory" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Sem môžete vložiť súbory, ktoré chcete porovnať." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Tu môžete zmeniť voľby na porovnávanie súborov" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Vzhľad" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Tu môžete zmeniť voľby pre prehliadanie" @@ -600,8 +512,8 @@ msgid "" "you can select that version." msgstr "" "Tu si môžete vybrať iný program diff. Na systéme Solaris štandardný program " -"diff nepodporuje všetky voľby, ktoré podporuje verzia GNU. Táto voľba umožňuje " -"vybrať GNU verziu." +"diff nepodporuje všetky voľby, ktoré podporuje verzia GNU. Táto voľba " +"umožňuje vybrať GNU verziu." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -613,26 +525,32 @@ msgstr "Formát výstupu" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Vyberte formát výstupu vygenerovaného diffom. Unified je používaný najčastejšie " -"pretože sa jedná o veľmi dobre čitateľný formát. Vývojári TDE ho majú v obľube " -"a používajú ho pri posielaní patchov." +"Vyberte formát výstupu vygenerovaného diffom. Unified je používaný " +"najčastejšie pretože sa jedná o veľmi dobre čitateľný formát. Vývojári TDE " +"ho majú v obľube a používajú ho pri posielaní patchov." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Počet riadkov kontextu" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Počet riadkov kontextu:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"Počet riadkov kontextu je bežne 2 alebo 3. Toto nastavenie robí diff čitateľným " -"a vo väčšine prípadov použiteľným. Viac než 3 riadky súbor zbytočne nafukujú." +"Počet riadkov kontextu je bežne 2 alebo 3. Toto nastavenie robí diff " +"čitateľným a vo väčšine prípadov použiteľným. Viac než 3 riadky súbor " +"zbytočne nafukujú." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -748,16 +666,16 @@ msgstr "Vzor pre vylúčené súbory" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Ak je táto voľba vybraná, môžete vložiť vzor shellu do textového poľa vpravo " "alebo vybrať položky zo zoznamu." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Tu môžete vložiť alebo odstrániť vzor shellu alebo vybrať jednu alebo viac " "položiek zo zoznamu." @@ -775,19 +693,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"Tu môžete vložiť URL adresu súboru s príznakmi, ktoré sa majú ignorovať počas " -"porovnania priečinkov." +"Tu môžete vložiť URL adresu súboru s príznakmi, ktoré sa majú ignorovať " +"počas porovnania priečinkov." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Súbor, ktorý zvolíte v dialógu, ktorý sa objaví sa po kliknutí bude vložený do " -"dialógu naľavo od tohto tlačidla." +"Súbor, ktorý zvolíte v dialógu, ktorý sa objaví sa po kliknutí bude vložený " +"do dialógu naľavo od tohto tlačidla." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -853,167 +771,277 @@ msgstr "Písmo:" msgid "Size:" msgstr "Veľkosť:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Nastavenia" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Písmo:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Zobraziť nastavenie" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Použiť rozdiel" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Nastavenie Diff" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Vrátiť rozdiel" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Uložiť &všetko" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "P&oužiť všetky" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Uložť .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Vrá&tiť všetky zmeny" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Vymeniť zdroj a cieľ" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Zobraziť štatistiku" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 nie je možné stiahnuť." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 na vašom systéme neexistuje." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Možnosti Diff" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Súbory patch" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "P&redchádzajúci súbor" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Uložiť .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Nasledujúci súbor" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Súbor existuje, alebo je chránený proti zápisu. Chcete ho prepísať?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Predchádzajúci rozdiel" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Súbor existuje" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Nasledujúci rozdiel" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Prepísať" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Žiadne modely ani rozdiely v súbore: %1. Nie je to platný súbor " +"diff." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Neprepisovať" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Nastali problémy pri použití rozdielu %1 na súbor %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Nastali problémy pri použití rozdielu %1 na priečinok %2." +"" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Spúšťam diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Nepodarilo sa otvoriť dočasný súbor." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Spracovávam výstup diff..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Nepodaril sa zápis do dočasného súboru %1, súbor bol zmazaný." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Porovnávam súbor %1 so súborom %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Nepodarilo sa vytvoriť cieľový adresár %1.\n" +"Súbor nebol uložený." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Porovnávam súbory v %1 so súbormi v %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Nepodarilo sa poslať dočasný súbor na cieľové umiestnenie %1. " +"Dočasný súbor je k dispozícii pod: %2. Môžete ho na správne miesto " +"skopírovať ručne." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Zobrazujem výstup diff z %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Nepodarilo sa spracovať výstup diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Spájam výstup diff z %1 do súboru %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Súbory sú rovnaké." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Spájam výstup diff z %1 do priečinku %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nepodaril sa zápis do dočasného súboru." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Zmenili ste cieľ.\n" -"Chcete zmeny uložiť?" +"Program na zobrazenie rozdielov medzi súbormi s prípadnou možnosťou " +"generovať diff." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Uložiť zmeny?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Toto porovná URL1 a URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Nebolo vykonané porovnanie 2 súborov ani zadaný súbor diff, takže štatistika " -"nie je k dispozícii." +"Toto otvorí URL1 a očakáva, že je to rozdiel z programu diff. URL1 môže byť " +"aj '-' a potom sa číta štandardný vstup. Je to možné použiť napríklad ako " +"cvs diff | kompare -o -. Kompare zistí, či môže nájsť pôvodný súbor a ak " +"áno, spojí ho s výstupom diff a zobrazí výsledok. -n kontrolu vypne.and then " +"it will read from standard input. Can be used for instance for cvs diff | " +"kompare -o -. Kompare will do a check to see if it can find the original " +"file(s) and then blend the original file(s) into the diffoutput and show " +"that in the viewer. -n disables the check." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Štatistika Diff" +#: 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 "" +"Toto spojí URL2 do URL1. URL2 má byť výstup diff a URL1 súbor alebo " +"priečinok, do ktorého sa má tento diff pridať." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Štatistika:\n" -"\n" -"Aktuálny starý súbor: %1\n" -"Aktuálny nový súbor: %2\n" -"\n" -"Formát: %3\n" -"Počet kusov: %4\n" -"Počet rozdielov: %5" +"Vypne kontrolu automatického hľadania pôvodného súboru pri použití '-' " +"namiesto URL s voľbou -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Použite túto voľbu pre špecifikovanie kódovanie pri spúšťaní z príkazového " +"riadku. Ak kódovanie nešpecifikujete, bude použité miestne kódovanie." + +#: 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 a Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Tvorca Kompare ikony" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Veľa dobrých rád" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Prehliadač Cervisia diff " + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Porovnať tieto súbory alebo priečinky" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Súbory" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Rozdiel" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Zobraziť nastavenie" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Spustiť diff v" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Príkazový riadok" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- zdroj cieľ" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Možnosti" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Hľadať menšie zmeny" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimalizovať pre veľké súbory" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorovať zmenu veľkosti písmen" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Nahradiť tabulátory medzerami" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorovať pridané alebo odstránené prázdne riadky" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorovať zmeny v prázdnom mieste" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Zobraziť mená funkcií" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Porovnať priečinky rekurzívne" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Nové súbory považovať za prázdne" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Formát" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Vedľa seba" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Štatistika:\n" -"\n" -"Počet súborov v súbore diff: %1\n" -"Formát : %2\n" -"\n" -"Aktuálny starý súbor: %3\n" -"Aktuálny nový súbor: %4\n" -"\n" -"Počet kusov: %5\n" -"Počet rozdielov: %6" diff --git a/tde-i18n-sl/messages/tdesdk/kompare.po b/tde-i18n-sl/messages/tdesdk/kompare.po index 3ff3218f8d1..72ba62a4e8b 100644 --- a/tde-i18n-sl/messages/tdesdk/kompare.po +++ b/tde-i18n-sl/messages/tdesdk/kompare.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "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: 2006-05-18 20:17+0200\n" "Last-Translator: Jure Repinc \n" "Language-Team: Slovenian \n" @@ -23,335 +23,13 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Uveljavi razliko" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "R&azveljavi razlike" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Uve&ljavi vse" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Razveljavi vse" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "P&rejšnja datoteka" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "N&aslednja datoteka" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Prejšnja razlika" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Naslednja razlika" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Ni modelov ali ni razlik. Ta datoteka, %1" -", ni veljavna datoteka diff." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Prišlo je do težav pri uveljavljanju diff %1 v datoteko %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Prišlo je do težav pri uveljavljanju diff %1 v mapo %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Ni bilo moč odpreti začasne datoteke." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Ni bilo moč pisati v začasno datoteko %1, zato se briše." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Ni bilo moč ustvariti ciljnega imenika %1.\n" -"Datoteka ni bila shranjena." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Ni moč prenesti začasne datoteke na ciljno lokacijo %1" -". Začasna datoteka je še vedno na voljo v: %2" -". Lahko jo ročno skopirate na pravo mesto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Ni bilo moč razčleniti izhoda diffa." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Datoteki sta enaki." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Ni bilo moč pisati v začasno datoteko." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Razlika" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Poženi diff v" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Ukazna vrstica" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd imenik && diff -udHprNa -- vir cilj" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Išči manjše spremembe" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Prilagodi za velike datoteke" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Prezri spremembe med velikimi/malimi črkami" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Razširi tabulatorje v presledke" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Prezri dodane ali odstranjene prazne vrstice" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Prezri spremembe v praznem prostoru" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Prikaži imena funkcij" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Primerjaj mape rekurzivno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Obravnavaj nove datoteke kot prazne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Oblika" - -#. 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 "Kontekst" - -#. 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 "Ed" - -#. 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 "Običajno" - -#. 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 "Enotno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Drug poleg drugega" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Število vrstic konteksta:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program za ogled razlik med datotekama in možno ustvarjanje datoteke sprememb " -"(diff)" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "To bo primerjalo URL1 z URL2" - -#: 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 "" -"To bo odprlo URL1, za katerega se pričakuje, da je izhod diff-a. URL1 je lahko " -"tudi »-«, kar pomeni branje iz standardnega vhoda. Lahko se uporabi tako: cvs " -"diff | kompare -o -. Kompare bo poskušal najti originalne datoteke in združiti " -"originale z izhodom diff-a ter prikazati to v pregledovalniku. Možnost -n " -"onemogoči iskanje originalov." - -#: 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 "" -"To bo zmešalo URL2 v URL1. Pričakuje se, da je URL2 izpis diff in URL1 datoteka " -"ali mapa, v katero se zmeša izpis diff." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Onemogoči preverjanje samodejnega iskanja prvotne datoteke, ko se uporablja »-« " -"kot URL z možnostjo -o." - -#: 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 "" -"Uporabite to za določitev kodiranja ko ga kličete iz ukazne vrstice. Če ni " -"določeno, bo privzeto uporabljeno krajevno kodiranje." - -#: 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 in Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Avtor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Umetnik, ki je ustvaril ikone za Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mnogo dobrih nasvetov" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Pregledovalnik diff za Cervisio" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Primerjaj datoteki ali mapi" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Vir" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Cilj" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Primerjaj" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Primerjaj ti datoteki ali mapi" - -#: 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 "" -"Če ste vnesli 2 datoteki ali 2 mapi v polja tega pogovornega okna, potem bo ta " -"gumb omogočen in pritisk nanj bo pričelo s primerjanjem vnešenih datotek ali " -"map." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -465,24 +143,50 @@ msgstr "Zmešaj to datoteko ali mapo z izpisom diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Če ste vnesli ime datoteke ali mape in ime datoteke, ki vsebuje izhod diff-a, " -"bo ta gumb omogočen in po kliku nanj bo Kompare prikazal združen izhod vnesene " -"datoteke ali datotek iz map in izhoda diff-a. Na ta način lahko uveljavite " -"spremembe za želene datoteke." +"Če ste vnesli ime datoteke ali mape in ime datoteke, ki vsebuje izhod diff-" +"a, bo ta gumb omogočen in po kliku nanj bo Kompare prikazal združen izhod " +"vnesene datoteke ali datotek iz map in izhoda diff-a. Na ta način lahko " +"uveljavite spremembe za želene datoteke." + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Primerjaj datoteki ali mapi" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Vir" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Cilj" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Primerjaj" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Primerjaj te datoteke ali mape" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Besedilni prikaz" +#: 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 "" +"Če ste vnesli 2 datoteki ali 2 mapi v polja tega pogovornega okna, potem bo " +"ta gumb omogočen in pritisk nanj bo pričelo s primerjanjem vnešenih datotek " +"ali map." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Besedilni prikaz" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -587,18 +291,230 @@ msgstr "Neznan" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Tukaj lahko vnesete datoteke ki jih želite primerjati." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Shrani &vse" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Shrani .&diff ..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Zamenjaj vir s ciljem" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Prikaži statistiko" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL %1 ne more biti naložen." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 ne obstaja na tem sistemu." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Možnosti diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Datoteke vrste Patch" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Shrani .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" +"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Datoteka obstaja" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Nadomesti" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ne nadomesti" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Poganjanje diff ...." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Razčlenjevanje izhoda diff ..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Primerjanje datoteke %1 z datoteko %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Primerjanje datotek v %1 z datotekami v %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Prikazovanje izhoda diff iz %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Mešanje izpisa diff iz %1 v datoteko %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Mešanje izpisa diff iz %1 v mapo %2" + +#: 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 "" +"Spremenili ste ciljne datoteke.\n" +"Bi jih radi shranili?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Shranim spremembe?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Enotno" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Običajno" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika " +"zaradi tegani na voljo." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistika diff" + +#: 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 "" +"Statistika:\n" +"\n" +"Stara datoteka: %1\n" +"Nova datoteka: %2\n" +"\n" +"Oblika: %3\n" +"Število kosov: %4\n" +"Število razlik: %5" + +#: 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 "" +"Statistika:\n" +"\n" +"Število datotek v datoteki diff: %1\n" +"Oblika: %2\n" +"\n" +"Trenutna stara datoteka: %3\n" +"Trenutna nova datoteka: %4\n" +"\n" +"Število kosov: %5\n" +"Število razlik: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Lastnosti" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Besedilni prikaz" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Nastavitve prikaza" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Nastavitve Diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Datoteke" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Tukaj lahko vnesete datoteke ki jih želite primerjati." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Tukaj lahko spremenite možnosti za primerjavo datotek." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Videz" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Tu lahko spremenite možnosti pogleda." @@ -613,8 +529,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Tu lahko izberete drug diff program. Na Solarisu običajen diff ne podpira vseh " -"možnosti, ki jih podpira različica GNU. Na to način lahko izberete to " +"Tu lahko izberete drug diff program. Na Solarisu običajen diff ne podpira " +"vseh možnosti, ki jih podpira različica GNU. Na to način lahko izberete to " "različico." #: libdialogpages/diffpage.cpp:221 @@ -627,9 +543,9 @@ msgstr "Vrsta izhoda" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Izberite obliko, ki ga bo ustvaril diff. »Enotna« je oblika, ki se uporablja " "najpogosteje ker je dobro berljiva. Razvijalci TDE imajo najraje prav to " @@ -639,6 +555,11 @@ msgstr "" msgid "Lines of Context" msgstr "Vrstice konteksta" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Število vrstic konteksta:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -646,7 +567,8 @@ msgid "" "unnecessarily." msgstr "" "Število kontekstnih vrstic je običajno 2 ali 3. Tako je diff berljiv in " -"uporaben v večini primerov. Več kot 3 vrstice bodo diff brez potrebe napihnile." +"uporaben v večini primerov. Več kot 3 vrstice bodo diff brez potrebe " +"napihnile." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -762,16 +684,16 @@ msgstr "Vzorec datotek, ki naj se izključi" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Če je označena ta možnost, lahko vnesete vzorec za ukazno lupino v besedilno " "polje na desni ali pa izberete vnose s seznama." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Tu lahko vnesete ali odstranite lupinski vzorec ali izberete enega ali več " "vnosov s seznama." @@ -789,16 +711,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Tu lahko vnesete URL ali datoteko z lupinskimi vzorci, ki jih prezreze med " "primerjanjem map." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Katerokoli datoteko, ki jo izberete v oknu, ki se pojavi ob kliku nanj, bo " "postavljena v okno na levi strani tega gumba." @@ -867,168 +789,275 @@ msgstr "Pisava:" msgid "Size:" msgstr "Velikost:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Lastnosti" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Nastavitve prikaza" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Nastavitve Diff" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Shrani &vse" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Pisava:" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Shrani .&diff ..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Uveljavi razliko" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Zamenjaj vir s ciljem" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "R&azveljavi razlike" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Prikaži statistiko" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Uve&ljavi vse" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 ne more biti naložen." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Razveljavi vse" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 ne obstaja na tem sistemu." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "P&rejšnja datoteka" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Možnosti diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "N&aslednja datoteka" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Datoteke vrste Patch" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Prejšnja razlika" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Shrani .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Naslednja razlika" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Datoteka obstaja ali pa je zaščitena pred pisanjem; jo želite nadomestiti?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Datoteka obstaja" - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Nadomesti" +"Ni modelov ali ni razlik. Ta datoteka, %1, ni veljavna datoteka " +"diff." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ne nadomesti" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Prišlo je do težav pri uveljavljanju diff %1 v datoteko %2." +"" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Prišlo je do težav pri uveljavljanju diff %1 v mapo %2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Poganjanje diff ...." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Ni bilo moč odpreti začasne datoteke." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Razčlenjevanje izhoda diff ..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Ni bilo moč pisati v začasno datoteko %1, zato se briše." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Primerjanje datoteke %1 z datoteko %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Ni bilo moč ustvariti ciljnega imenika %1.\n" +"Datoteka ni bila shranjena." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Primerjanje datotek v %1 z datotekami v %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Ni moč prenesti začasne datoteke na ciljno lokacijo %1. Začasna " +"datoteka je še vedno na voljo v: %2. Lahko jo ročno skopirate na " +"pravo mesto." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazovanje izhoda diff iz %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Ni bilo moč razčleniti izhoda diffa." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Mešanje izpisa diff iz %1 v datoteko %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Datoteki sta enaki." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Mešanje izpisa diff iz %1 v mapo %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ni bilo moč pisati v začasno datoteko." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Spremenili ste ciljne datoteke.\n" -"Bi jih radi shranili?" +"Program za ogled razlik med datotekama in možno ustvarjanje datoteke " +"sprememb (diff)" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Shranim spremembe?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "To bo primerjalo URL1 z URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Ni datoteke diff ali pa nista bili primerjani dve datoteki. Statistika zaradi " -"tegani na voljo." +"To bo odprlo URL1, za katerega se pričakuje, da je izhod diff-a. URL1 je " +"lahko tudi »-«, kar pomeni branje iz standardnega vhoda. Lahko se uporabi " +"tako: cvs diff | kompare -o -. Kompare bo poskušal najti originalne datoteke " +"in združiti originale z izhodom diff-a ter prikazati to v pregledovalniku. " +"Možnost -n onemogoči iskanje originalov." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistika diff" +#: 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 "" +"To bo zmešalo URL2 v URL1. Pričakuje se, da je URL2 izpis diff in URL1 " +"datoteka ali mapa, v katero se zmeša izpis diff." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistika:\n" -"\n" -"Stara datoteka: %1\n" -"Nova datoteka: %2\n" -"\n" -"Oblika: %3\n" -"Število kosov: %4\n" -"Število razlik: %5" +"Onemogoči preverjanje samodejnega iskanja prvotne datoteke, ko se uporablja " +"»-« kot URL z možnostjo -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Uporabite to za določitev kodiranja ko ga kličete iz ukazne vrstice. Če ni " +"določeno, bo privzeto uporabljeno krajevno kodiranje." + +#: 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 in Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Avtor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Umetnik, ki je ustvaril ikone za Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mnogo dobrih nasvetov" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Pregledovalnik diff za Cervisio" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Primerjaj ti datoteki ali mapi" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Datoteke" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Razlika" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Nastavitve prikaza" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Poženi diff v" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Ukazna vrstica" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd imenik && diff -udHprNa -- vir cilj" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Možnosti" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Išči manjše spremembe" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Prilagodi za velike datoteke" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Prezri spremembe med velikimi/malimi črkami" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Razširi tabulatorje v presledke" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Prezri dodane ali odstranjene prazne vrstice" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Prezri spremembe v praznem prostoru" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Prikaži imena funkcij" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Primerjaj mape rekurzivno" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Obravnavaj nove datoteke kot prazne" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Oblika" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Drug poleg drugega" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Število datotek v datoteki diff: %1\n" -"Oblika: %2\n" -"\n" -"Trenutna stara datoteka: %3\n" -"Trenutna nova datoteka: %4\n" -"\n" -"Število kosov: %5\n" -"Število razlik: %6" diff --git a/tde-i18n-sr/messages/tdesdk/kompare.po b/tde-i18n-sr/messages/tdesdk/kompare.po index 713490d4089..5ceb13446b6 100644 --- a/tde-i18n-sr/messages/tdesdk/kompare.po +++ b/tde-i18n-sr/messages/tdesdk/kompare.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "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: 2005-08-08 09:22+0200\n" "Last-Translator: Slobodan Simic \n" "Language-Team: Serbian \n" @@ -19,335 +19,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Примени разлику" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Поништи примењену разлику" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Приме&ни све" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Поништи све примењено" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&ретходни фајл" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "С&ледећи фајл" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Претходна разлика" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Следећа разлика" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Нема модела или нема разлика, овај фајл: %1" -", није исправан фајл разлике" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Дошло је до проблема приликом примене разлике %1 на фајл %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Дошло је до проблема приликом примене разлике %1 на фасциклу " -"%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Нисам могао да отворим привремени фајл." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Нисам могао да пишем у привремени фајл %1, бришем га." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Нисам могао да направим одредишни директоријум %1.\n" -"Фајл није снимљен." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Нисам могао да пошаљем привремени фајл на одредишну локацију %1" -". Привремени фајл је још увек доступан под: %2" -". Можете га ручно ископирати на право место." - -#: 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 "cd dir && diff -udHprNa -- izvor odrediste" - -#. 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 "Ed" - -#. 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 "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 "Ово ће упоредити URL1 са URL2" - -#: 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 "" -"Ово ће отворити URL1 у очекивању да је то излаз разлике. URL1 такође може бити " -"„-“ и у том случају ће читати из стандардног улаза. Може се на пример користити " -"за cvs diff | kompare -o -. Kompare ће извршити проверу да види да ли може да " -"нађе оригиналне фајлове и онда ће стопити оригиналне фајлове у излаз разлике и " -"то приказати у делу за преглед. -n искључује проверу." - -#: 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 "" -"Ово ће стопити URL2 у URL1, где се очекује да је URL2 излаз разлике, а URL1 " -"фајл или фасцикла у коју треба стопити излаз разлике. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Искључује проверу за аутоматско проналажење оригиналних фајлова када се са " -"опцијом -o користи „-“ као URL." - -#: 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 "" -"© 2001-2004, Џон Фајербо (John Firebaugh) и Ото Бругеман (Otto Bruggeman)" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Аутор" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Аутор иконе за Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Много добрих савета" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Приказивач разлика Cervisia-е" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Бојан Божовић" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -457,27 +135,53 @@ msgstr "Стопи овај фајл или фасциклу са излазом #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Ако сте унели име фајла или фасцикле и фајл који садржи излаз разлике у пољима " -"у овом прозору, онда ће ово дугме бити омогућено и његовим притискањем ће се " -"отворити главни поглед kompare-а где су излази унетог фајла или фајлова из " -"фасцикле помешани са излазом разлике, тако да можете применити разлике на фајл " -"или фајлове. " - -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Упореди ове фајлове или фасцикле" +"Ако сте унели име фајла или фасцикле и фајл који садржи излаз разлике у " +"пољима у овом прозору, онда ће ово дугме бити омогућено и његовим " +"притискањем ће се отворити главни поглед kompare-а где су излази унетог " +"фајла или фајлова из фасцикле помешани са излазом разлике, тако да можете " +"применити разлике на фајл или фајлове. " -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Текстуални поглед" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Упореди фајлове или фасцикле" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: 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 "Упореди" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Упореди ове фајлове или фасцикле" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"Ако сте унели два имена фајла или две фасцикле у пољима у овом прозору, ово " +"дугме ће бити укључено и његовим притискањем ће започети упоређивање унетих " +"фајлова или фасцикли. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Текстуални поглед" + +#: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" msgstr "Изворна фасцикла" @@ -574,18 +278,229 @@ msgstr "Непознат" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Овде можете унети фајлове које желите да упоредите." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Сними &све" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "С&ними .diff..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "Тај URL %1 не може бити преузет." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Тај URL %1 не постоји на вашем систему." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Опције разликовања" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Фајлови закрпа" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Сними .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 "Фајл постоји" + +#: 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" + +#: 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 "Упоређујем фајл %1 са фајлом %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Упоређујем фајлове у %1 са фајловима у %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Приказујем излаз разлике из %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Стапам излаз разлике из %1 у фајл %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Стапам излаз разлике из %1 у фасциклу %2" + +#: 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 "" +"Направили сте измене у одредишним фајловима.\n" +"Да ли бисте желели да их снимите?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Статистика:\n" +"\n" +"Стари фајл: %1\n" +"Нови фајл: %2\n" +"\n" +"Формат: %3\n" +"Број комада: %4\n" +"Број разлика: %5" + +#: 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 "" +"Статистика:\n" +"\n" +"Број фајлова у фајлу разлике: %1\n" +"Формат: %2\n" +"\n" +"Текући стари фајл: %3\n" +"Текући нови фајл: %4\n" +"\n" +"Број комада: %5\n" +"Број разлика: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Подешавања" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Текстуални поглед" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Прегледај подешавања" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Разликовање" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Подешавања разликовања" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Фајлови" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Овде можете унети фајлове које желите да упоредите." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Овде можете да измените опције за поређење фајлова." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Изглед" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Овде можете да измените опције за приказ." @@ -601,8 +516,8 @@ msgid "" "you can select that version." msgstr "" "Овде можете изабрати други програм за разликовање. На Solaris-у стандардни " -"програм за разликовање не подржава све опције које подржава GNU верзија. Овде " -"зато можете изабрати ту верзију." +"програм за разликовање не подржава све опције које подржава GNU верзија. " +"Овде зато можете изабрати ту верзију." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -614,9 +529,9 @@ msgstr "Формат излаза" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Изаберите формат излаза који генерише програм за разликовање. Унификовани се " "користи најчешће зато што је врло читљив. Програмери TDE-а највише воле овај " @@ -626,6 +541,11 @@ msgstr "" msgid "Lines of Context" msgstr "Линије контекста" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Број линија контекста:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -633,8 +553,8 @@ msgid "" "unnecessarily." msgstr "" "Број контекстних линија је нормално 2 или 3. Ово чини разлику читљивом и " -"применљивом у већини случајева. Више од 3 линије ће само непотребно оптеретити " -"разлику." +"применљивом у већини случајева. Више од 3 линије ће само непотребно " +"оптеретити разлику." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -750,19 +670,19 @@ msgstr "Облик фајлова које треба искључити" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Ако је попуњено, можете унети облик шкољке у текстуално поље десно или изабрати " -"ставке из листе." +"Ако је попуњено, можете унети облик шкољке у текстуално поље десно или " +"изабрати ставке из листе." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Овде можете унети или уклонити облик шкољке или изабрати једну или више ставки " -"из листе." +"Овде можете унети или уклонити облик шкољке или изабрати једну или више " +"ставки из листе." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -775,19 +695,19 @@ msgstr "Ако је попуњено, можете унети име фајла #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Овде можете унети URL фајла са облицима шкољке које треба игнорисати током " "поређења фасцикли." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Било који фајл који изаберете у дијалогу који искочи када кликнете на њега биће " -"стављен у дијалог лево од овог дугмета." +"Било који фајл који изаберете у дијалогу који искочи када кликнете на њега " +"биће стављен у дијалог лево од овог дугмета." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -853,167 +773,274 @@ msgstr "Фонт:" msgid "Size:" msgstr "Величина:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Подешавања" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Прегледај подешавања" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Фонт:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Подешавања разликовања" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Примени разлику" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Сними &све" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Поништи примењену разлику" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "С&ними .diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Приме&ни све" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Замени извор одредиштем" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Прикажи статистику" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Поништи све примењено" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Тај URL %1 не може бити преузет." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&ретходни фајл" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Тај URL %1 не постоји на вашем систему." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "С&ледећи фајл" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Опције разликовања" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Претходна разлика" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Фајлови закрпа" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Следећа разлика" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Сними .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Нема модела или нема разлика, овај фајл: %1, није исправан фајл " +"разлике" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Фајл постоји или је заштићен од писања; желите ли да га пребришете?" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Дошло је до проблема приликом примене разлике %1 на фајл %2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Фајл постоји" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Дошло је до проблема приликом примене разлике %1 на фасциклу " +"%2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Пребриши" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Нисам могао да отворим привремени фајл." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Немој да пребришеш" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Нисам могао да пишем у привремени фајл %1, бришем га." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Нисам могао да направим одредишни директоријум %1.\n" +"Фајл није снимљен." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Извршавам разликовање..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Нисам могао да пошаљем привремени фајл на одредишну локацију %1. " +"Привремени фајл је још увек доступан под: %2. Можете га ручно " +"ископирати на право место." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Рашчлањујем излаз разлике..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Нисам могао да анализирам излаз разлике." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Упоређујем фајл %1 са фајлом %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Фајлови су идентични." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Упоређујем фајлове у %1 са фајловима у %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Нисам могао да пишем у привремени фајл." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Приказујем излаз разлике из %1" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Програм за прегледање разлика међу фајловима и опционо прављење фајла разлика" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Стапам излаз разлике из %1 у фајл %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Ово ће упоредити URL1 са URL2" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Стапам излаз разлике из %1 у фасциклу %2" +#: 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 "" +"Ово ће отворити URL1 у очекивању да је то излаз разлике. URL1 такође може " +"бити „-“ и у том случају ће читати из стандардног улаза. Може се на пример " +"користити за cvs diff | kompare -o -. Kompare ће извршити проверу да види да " +"ли може да нађе оригиналне фајлове и онда ће стопити оригиналне фајлове у " +"излаз разлике и то приказати у делу за преглед. -n искључује проверу." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Направили сте измене у одредишним фајловима.\n" -"Да ли бисте желели да их снимите?" +"Ово ће стопити URL2 у URL1, где се очекује да је URL2 излаз разлике, а URL1 " +"фајл или фасцикла у коју треба стопити излаз разлике. " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Да ли да снимим измене?" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Искључује проверу за аутоматско проналажење оригиналних фајлова када се са " +"опцијом -o користи „-“ као URL." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Нема фајла разлике, или никоја два фајла нису разликована. Стога, није доступна " -"статистика." +"Користите ово да бисте навели кодирање када га зовете из командне линије. " +"Ако није наведено, подразумевано ће се користити локално кодирање." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика разликовања" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -"Статистика:\n" -"\n" -"Стари фајл: %1\n" -"Нови фајл: %2\n" -"\n" -"Формат: %3\n" -"Број комада: %4\n" -"Број разлика: %5" +"© 2001-2004, Џон Фајербо (John Firebaugh) и Ото Бругеман (Otto Bruggeman)" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Аутор" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Аутор иконе за Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Много добрих савета" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Приказивач разлика Cervisia-е" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Упореди ове фајлове или фасцикле" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Фајлови" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Разлика" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, 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 "cd dir && diff -udHprNa -- izvor odrediste" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Статистика:\n" -"\n" -"Број фајлова у фајлу разлике: %1\n" -"Формат: %2\n" -"\n" -"Текући стари фајл: %3\n" -"Текући нови фајл: %4\n" -"\n" -"Број комада: %5\n" -"Број разлика: %6" diff --git a/tde-i18n-sr@Latn/messages/tdesdk/kompare.po b/tde-i18n-sr@Latn/messages/tdesdk/kompare.po index 11a124ad201..63676b98344 100644 --- a/tde-i18n-sr@Latn/messages/tdesdk/kompare.po +++ b/tde-i18n-sr@Latn/messages/tdesdk/kompare.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "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: 2005-08-08 09:22+0200\n" "Last-Translator: Slobodan Simic \n" "Language-Team: Serbian \n" @@ -19,336 +19,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Primeni razliku" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Poništi primenjenu razliku" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Prime&ni sve" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Poništi sve primenjeno" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "P&rethodni fajl" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "S&ledeći fajl" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Prethodna razlika" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Sledeća razlika" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Nema modela ili nema razlika, ovaj fajl: %1" -", nije ispravan fajl razlike" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Došlo je do problema prilikom primene razlike %1 na fajl %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Došlo je do problema prilikom primene razlike %1 na fasciklu " -"%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Nisam mogao da otvorim privremeni fajl." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Nisam mogao da pišem u privremeni fajl %1, brišem ga." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Nisam mogao da napravim odredišni direktorijum %1.\n" -"Fajl nije snimljen." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Nisam mogao da pošaljem privremeni fajl na odredišnu lokaciju %1" -". Privremeni fajl je još uvek dostupan pod: %2" -". Možete ga ručno iskopirati na pravo mesto." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Nisam mogao da analiziram izlaz razlike." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Fajlovi su identični." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Nisam mogao da pišem u privremeni fajl." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Razlika" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Pokreni razlikovanje u" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Komandna linija" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- izvor odrediste" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Izgled za manje izmene" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimizuj za velike fajlove" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignoriši izmene koje se odnose na veličinu slova" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Proširi tabulatore u razmake" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignoriši dodate ili uklonjene prazne linije" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignoriši izmene u praznom prostoru" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Prikaži imena funkcija" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Uporedi fascikle rekurzivno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Tretiraj nove fajlove kao prazne" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Kontekst" - -#. 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 "Ed" - -#. 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 "Običan" - -#. 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 "Ujedinjeno" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Rame-uz-rame" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Broj linija konteksta:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program za pregledanje razlika među fajlovima i opciono pravljenje fajla " -"razlika" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Ovo će uporediti URL1 sa URL2" - -#: 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 "" -"Ovo će otvoriti URL1 u očekivanju da je to izlaz razlike. URL1 takođe može biti " -"„-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primer koristiti " -"za cvs diff | kompare -o -. Kompare će izvršiti proveru da vidi da li može da " -"nađe originalne fajlove i onda će stopiti originalne fajlove u izlaz razlike i " -"to prikazati u delu za pregled. -n isključuje proveru." - -#: 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 "" -"Ovo će stopiti URL2 u URL1, gde se očekuje da je URL2 izlaz razlike, a URL1 " -"fajl ili fascikla u koju treba stopiti izlaz razlike. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Isključuje proveru za automatsko pronalaženje originalnih fajlova kada se sa " -"opcijom -o koristi „-“ kao URL." - -#: 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 "" -"Koristite ovo da biste naveli kodiranje kada ga zovete iz komandne linije. Ako " -"nije navedeno, podrazumevano će se koristiti lokalno kodiranje." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "" -"© 2001-2004, Džon Fajerbo (John Firebaugh) i Oto Brugeman (Otto Bruggeman)" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Autor" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Autor ikone za Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Mnogo dobrih saveta" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Prikazivač razlika Cervisia-e" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Uporedi fajlove ili fascikle" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Izvor" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Odredište" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Uporedi" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Uporedi ove fajlove ili fascikle" - -#: 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 "" -"Ako ste uneli dva imena fajla ili dve fascikle u poljima u ovom prozoru, ovo " -"dugme će biti uključeno i njegovim pritiskanjem će započeti upoređivanje unetih " -"fajlova ili fascikli. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Bojan Božović" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -458,25 +135,51 @@ msgstr "Stopi ovaj fajl ili fasciklu sa izlazom razlike" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Ako ste uneli ime fajla ili fascikle i fajl koji sadrži izlaz razlike u poljima " -"u ovom prozoru, onda će ovo dugme biti omogućeno i njegovim pritiskanjem će se " -"otvoriti glavni pogled kompare-a gde su izlazi unetog fajla ili fajlova iz " -"fascikle pomešani sa izlazom razlike, tako da možete primeniti razlike na fajl " -"ili fajlove. " +"Ako ste uneli ime fajla ili fascikle i fajl koji sadrži izlaz razlike u " +"poljima u ovom prozoru, onda će ovo dugme biti omogućeno i njegovim " +"pritiskanjem će se otvoriti glavni pogled kompare-a gde su izlazi unetog " +"fajla ili fajlova iz fascikle pomešani sa izlazom razlike, tako da možete " +"primeniti razlike na fajl ili fajlove. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Uporedi ove fajlove ili fascikle" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Uporedi fajlove ili fascikle" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Tekstualni pogled" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Izvor" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Odredište" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Uporedi" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Uporedi ove fajlove ili fascikle" + +#: 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 "" +"Ako ste uneli dva imena fajla ili dve fascikle u poljima u ovom prozoru, ovo " +"dugme će biti uključeno i njegovim pritiskanjem će započeti upoređivanje " +"unetih fajlova ili fascikli. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Tekstualni pogled" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -575,18 +278,229 @@ msgstr "Nepoznat" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Ovde možete uneti fajlove koje želite da uporedite." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Snimi &sve" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "S&nimi .diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Zameni izvor odredištem" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Prikaži statistiku" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Taj URL %1 ne može biti preuzet." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Taj URL %1 ne postoji na vašem sistemu." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Opcije razlikovanja" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Fajlovi zakrpa" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Snimi .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Fajl postoji ili je zaštićen od pisanja; želite li da ga prebrišete?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Fajl postoji" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Prebriši" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Nemoj da prebrišeš" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Izvršavam razlikovanje..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Raščlanjujem izlaz razlike..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Upoređujem fajl %1 sa fajlom %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Upoređujem fajlove u %1 sa fajlovima u %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Prikazujem izlaz razlike iz %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Stapam izlaz razlike iz %1 u fajl %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Stapam izlaz razlike iz %1 u fasciklu %2" + +#: 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 "" +"Napravili ste izmene u odredišnim fajlovima.\n" +"Da li biste želeli da ih snimite?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Da li da snimim izmene?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Ujedinjeno" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Kontekst" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Običan" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Nema fajla razlike, ili nikoja dva fajla nisu razlikovana. Stoga, nije " +"dostupna statistika." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Statistika razlikovanja" + +#: 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 "" +"Statistika:\n" +"\n" +"Stari fajl: %1\n" +"Novi fajl: %2\n" +"\n" +"Format: %3\n" +"Broj komada: %4\n" +"Broj razlika: %5" + +#: 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 "" +"Statistika:\n" +"\n" +"Broj fajlova u fajlu razlike: %1\n" +"Format: %2\n" +"\n" +"Tekući stari fajl: %3\n" +"Tekući novi fajl: %4\n" +"\n" +"Broj komada: %5\n" +"Broj razlika: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Podešavanja" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Tekstualni pogled" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Pregledaj podešavanja" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Razlikovanje" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Podešavanja razlikovanja" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Fajlovi" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Ovde možete uneti fajlove koje želite da uporedite." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Ovde možete da izmenite opcije za poređenje fajlova." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Izgled" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Ovde možete da izmenite opcije za prikaz." @@ -602,8 +516,8 @@ msgid "" "you can select that version." msgstr "" "Ovde možete izabrati drugi program za razlikovanje. Na Solaris-u standardni " -"program za razlikovanje ne podržava sve opcije koje podržava GNU verzija. Ovde " -"zato možete izabrati tu verziju." +"program za razlikovanje ne podržava sve opcije koje podržava GNU verzija. " +"Ovde zato možete izabrati tu verziju." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -615,18 +529,23 @@ msgstr "Format izlaza" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"Izaberite format izlaza koji generiše program za razlikovanje. Unifikovani se " -"koristi najčešće zato što je vrlo čitljiv. Programeri TDE-a najviše vole ovaj " -"format, pa ga zato koristite za slanje zakrpa." +"Izaberite format izlaza koji generiše program za razlikovanje. Unifikovani " +"se koristi najčešće zato što je vrlo čitljiv. Programeri TDE-a najviše vole " +"ovaj format, pa ga zato koristite za slanje zakrpa." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Linije konteksta" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Broj linija konteksta:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -634,8 +553,8 @@ msgid "" "unnecessarily." msgstr "" "Broj kontekstnih linija je normalno 2 ili 3. Ovo čini razliku čitljivom i " -"primenljivom u većini slučajeva. Više od 3 linije će samo nepotrebno opteretiti " -"razliku." +"primenljivom u većini slučajeva. Više od 3 linije će samo nepotrebno " +"opteretiti razliku." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -751,19 +670,19 @@ msgstr "Oblik fajlova koje treba isključiti" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Ako je popunjeno, možete uneti oblik školjke u tekstualno polje desno ili " "izabrati stavke iz liste." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Ovde možete uneti ili ukloniti oblik školjke ili izabrati jednu ili više stavki " -"iz liste." +"Ovde možete uneti ili ukloniti oblik školjke ili izabrati jednu ili više " +"stavki iz liste." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -776,16 +695,16 @@ msgstr "Ako je popunjeno, možete uneti ime fajla u polje desno." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Ovde možete uneti URL fajla sa oblicima školjke koje treba ignorisati tokom " "poređenja fascikli." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Bilo koji fajl koji izaberete u dijalogu koji iskoči kada kliknete na njega " "biće stavljen u dijalog levo od ovog dugmeta." @@ -854,167 +773,275 @@ msgstr "Font:" msgid "Size:" msgstr "Veličina:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Podešavanja" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Font:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Pregledaj podešavanja" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Primeni razliku" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Podešavanja razlikovanja" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Poništi primenjenu razliku" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Snimi &sve" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Prime&ni sve" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "S&nimi .diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "&Poništi sve primenjeno" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Zameni izvor odredištem" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "P&rethodni fajl" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Prikaži statistiku" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Taj URL %1 ne može biti preuzet." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Taj URL %1 ne postoji na vašem sistemu." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "S&ledeći fajl" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Opcije razlikovanja" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Prethodna razlika" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Fajlovi zakrpa" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Sledeća razlika" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Snimi .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Nema modela ili nema razlika, ovaj fajl: %1, nije ispravan fajl " +"razlike" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Fajl postoji ili je zaštićen od pisanja; želite li da ga prebrišete?" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Došlo je do problema prilikom primene razlike %1 na fajl %2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Fajl postoji" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Došlo je do problema prilikom primene razlike %1 na fasciklu " +"%2." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Prebriši" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Nisam mogao da otvorim privremeni fajl." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Nemoj da prebrišeš" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Nisam mogao da pišem u privremeni fajl %1, brišem ga." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Nisam mogao da napravim odredišni direktorijum %1.\n" +"Fajl nije snimljen." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Izvršavam razlikovanje..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Nisam mogao da pošaljem privremeni fajl na odredišnu lokaciju %1. " +"Privremeni fajl je još uvek dostupan pod: %2. Možete ga ručno " +"iskopirati na pravo mesto." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Raščlanjujem izlaz razlike..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Nisam mogao da analiziram izlaz razlike." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Upoređujem fajl %1 sa fajlom %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Fajlovi su identični." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Upoređujem fajlove u %1 sa fajlovima u %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Nisam mogao da pišem u privremeni fajl." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Prikazujem izlaz razlike iz %1" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"Program za pregledanje razlika među fajlovima i opciono pravljenje fajla " +"razlika" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Stapam izlaz razlike iz %1 u fajl %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Ovo će uporediti URL1 sa URL2" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Stapam izlaz razlike iz %1 u fasciklu %2" +#: 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 "" +"Ovo će otvoriti URL1 u očekivanju da je to izlaz razlike. URL1 takođe može " +"biti „-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primer " +"koristiti za cvs diff | kompare -o -. Kompare će izvršiti proveru da vidi da " +"li može da nađe originalne fajlove i onda će stopiti originalne fajlove u " +"izlaz razlike i to prikazati u delu za pregled. -n isključuje proveru." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Napravili ste izmene u odredišnim fajlovima.\n" -"Da li biste želeli da ih snimite?" +"Ovo će stopiti URL2 u URL1, gde se očekuje da je URL2 izlaz razlike, a URL1 " +"fajl ili fascikla u koju treba stopiti izlaz razlike. " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Da li da snimim izmene?" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Isključuje proveru za automatsko pronalaženje originalnih fajlova kada se sa " +"opcijom -o koristi „-“ kao URL." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Nema fajla razlike, ili nikoja dva fajla nisu razlikovana. Stoga, nije dostupna " -"statistika." +"Koristite ovo da biste naveli kodiranje kada ga zovete iz komandne linije. " +"Ako nije navedeno, podrazumevano će se koristiti lokalno kodiranje." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Statistika razlikovanja" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -"Statistika:\n" -"\n" -"Stari fajl: %1\n" -"Novi fajl: %2\n" -"\n" -"Format: %3\n" -"Broj komada: %4\n" -"Broj razlika: %5" +"© 2001-2004, Džon Fajerbo (John Firebaugh) i Oto Brugeman (Otto Bruggeman)" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Autor" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Autor ikone za Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Mnogo dobrih saveta" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Prikazivač razlika Cervisia-e" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Uporedi ove fajlove ili fascikle" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Fajlovi" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Razlika" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Pregledaj podešavanja" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Pokreni razlikovanje u" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Komandna linija" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- izvor odrediste" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "O&pcije" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Izgled za manje izmene" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimizuj za velike fajlove" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignoriši izmene koje se odnose na veličinu slova" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Proširi tabulatore u razmake" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignoriši dodate ili uklonjene prazne linije" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignoriši izmene u praznom prostoru" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Prikaži imena funkcija" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Uporedi fascikle rekurzivno" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Tretiraj nove fajlove kao prazne" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Rame-uz-rame" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistika:\n" -"\n" -"Broj fajlova u fajlu razlike: %1\n" -"Format: %2\n" -"\n" -"Tekući stari fajl: %3\n" -"Tekući novi fajl: %4\n" -"\n" -"Broj komada: %5\n" -"Broj razlika: %6" diff --git a/tde-i18n-sv/messages/tdesdk/kompare.po b/tde-i18n-sv/messages/tdesdk/kompare.po index 5d79bc72206..cf73062b560 100644 --- a/tde-i18n-sv/messages/tdesdk/kompare.po +++ b/tde-i18n-sv/messages/tdesdk/kompare.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "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: 2005-12-03 16:43+0100\n" "Last-Translator: Stefan Asserhall \n" "Language-Team: Swedish \n" @@ -18,338 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Applicera skillnad" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Ångra &applicera skillnad" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "App&licera alla" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Å&ngra applicera alla" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fö®ående fil" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Nä&sta fil" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Föregående skillnad" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Nästa s&killnad" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Inga modeller eller inga skillnader. Den här filen: %1" -", är inte en giltig jämförelsefil." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Det uppstod problem att applicera jämförelsen %1 med filen %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Det uppstod problem att applicera jämförelsen %1 med katalogen " -"%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Kunde inte öppna en tillfällig fil." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Kunde inte skriva till den tillfälliga filen %1. Tar bort den." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Kunde inte skapa målkatalogen %1.\n" -"Filen har inte sparats." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Kunde inte ladda upp tillfällig fil till målplatsen %1" -". Den tillfälliga filen är fortfarande tillgänglig under %2" -". Du kan kopiera den till rätt plats för hand." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Kunde inte tolka jämförelseutmatning." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Filerna är identiska." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Kunde inte skriva till den tillfälliga filen." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "S&killnad" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Kör jämförelse i" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Kommandorad" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd katalog && diff -udHprNa -- källa mål" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Leta efter mindre ändringar" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Optimera för stora filer" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Ignorera skiftläge" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Expandera tabulator-tecken till mellanslag" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Ignorera tillagda eller borttagna tomma rader" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Ignorera ändringar i blanktecken" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Visa funktionsnamn" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Jämför kataloger rekursivt" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Behandla nya filer som tomma" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Format" - -#. 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 "Sammanhang" - -#. 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 "Ed" - -#. 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 "Normal" - -#. 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 "Förenat" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Sida vid sida" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Antal sammanhangsrader:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Program för att visa skillnaderna mellan filer och valfritt skapa en " -"jämförelsefil" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Det här jämför webbadress 1 med webbadress 2" - -#: 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 "" -"Detta öppnar webbadress 1 och förväntar sig att den är en jämförelseutmatning. " -"Webbadress 1 kan också vara \"-\", och läses då från standardinmatningen. Detta " -"kan till exempel användas med \"cvs diff | kompare -o -\". Kompare kontrollerar " -"om originalfilerna kan hittas, och fogar sedan ihop originalfilerna med " -"jämförelseutmatningen och visar det i visningsfönstret. Väljaren \"-n\" stänger " -"av kontrollen." - -#: 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 "" -"Detta fogar ihop webbadress 2 med webbadress 1. Webbadress 2 förväntas vara en " -"jämförelseutmatning och webbadress 1 filen eller katalogen som " -"jämförelseutmatningen ska fogas ihop med. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Stänger av kontrollen för att automatiskt hitta originalfilerna när \"-\" " -"används som webbadress med väljaren -o." - -#: 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 "" -"Använd det här för att ange kodningen vid anrop från kommandoraden. Det får den " -"lokala kodningen som standardvärde om det inte anges." - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "© 2001-2004, John Firebaugh och Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Upphovsman" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare ikongrafik" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Ett stort antal goda råd" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia-jämförelsevisning" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Jämför filer eller kataloger" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Källa" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Mål" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Jämför" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Jämför de här filerna eller katalogen" - -#: 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 "" -"Om du har angett två filnamn eller två kataloger i den här dialogrutans fält, " -"aktiveras den här knappen, och en jämförelse av de inskrivna filerna eller " -"katalogerna startas genom att klicka på den. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Stefan Asserhäll" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -455,28 +130,55 @@ msgstr "Foga ihop filen eller katalogen med jämförelseutmatningen" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Om du har angett en fil eller katalog och en fil som innehåller " -"jämförelseutmatning i den här dialogrutans fält, aktiveras den här knappen, och " -"Kompares huvudfönster startas genom att klicka på den, där utmatningen från de " -"inskrivna filen eller filerna i katalogen blandas med jämförelseutmatningen. " +"jämförelseutmatning i den här dialogrutans fält, aktiveras den här knappen, " +"och Kompares huvudfönster startas genom att klicka på den, där utmatningen " +"från de inskrivna filen eller filerna i katalogen blandas med " +"jämförelseutmatningen. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Jämför de här filerna eller katalogerna" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Jämför filer eller kataloger" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Textvy" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Källa" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Källkatalog" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Mål" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Jämför" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Jämför de här filerna eller katalogerna" + +#: 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 "" +"Om du har angett två filnamn eller två kataloger i den här dialogrutans " +"fält, aktiveras den här knappen, och en jämförelse av de inskrivna filerna " +"eller katalogerna startas genom att klicka på den. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Textvy" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Källkatalog" #: komparenavtreepart/komparenavtreepart.cpp:66 msgid "Destination Folder" @@ -565,18 +267,229 @@ msgstr "Okänd" msgid "KompareNavTreePart" msgstr "Komparenavträd-del" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Skriv in filerna som du vill jämföra här." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Spara a&lla" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Spara .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Byt källa och mål" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Visa statistik" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Webbadressen %1 kan inte laddas ner." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Webbadressen %1 finns inte på systemet." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Jämförelsealternativ" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Programfixar" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Spara .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Filen finns eller är skrivskyddad. Vill du skriva över den?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Filen finns" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Skriv över" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Skriv inte över" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "Kompare-del" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Kör jämförelse..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Tolkar jämförelseutmatning..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Jämför fil %1 med fil %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Jämför filer i %1 med filer i %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Visar jämförelseutmatning från %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Fogar ihop jämförelseutmatningen från %1 med filen %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Fogar ihop jämförelseutmatningen från %1 med katalogen %2" + +#: 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 "" +"Du har gjort ändringar i målfilen eller målfilerna.\n" +"Vill du spara dem?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Spara ändringar?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Förenat" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Sammanhang" + +#: 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 "Ed" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Ingen jämförelsefil finns eller två filer har inte jämförts. Därför finns " +"inte någon statistik tillgänglig." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Jämförelsestatistik" + +#: 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 "" +"Statistik:\n" +"\n" +"Gammal fil: %1\n" +"Ny fil: %2\n" +"\n" +"Format: %3\n" +"Antal block: %4\n" +"Antal skillnader: %5" + +#: 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 "" +"Statistik:\n" +"\n" +"Antal filer i diff-filen: %1\n" +"Format: %2\n" +"\n" +"Aktuell gammal fil: %3\n" +"Aktuell ny fil: %4\n" +"\n" +"Antal block: %5\n" +"Antal skillnader: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Inställningar" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textvy" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Visningsinställningar" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Jämför" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Jämförelseinställningar" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Filer" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Skriv in filerna som du vill jämföra här." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Här kan du ändra alternativ för att jämföra filer." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Utseende" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Här kan du ändra alternativ för visningen." @@ -592,8 +505,8 @@ msgid "" "you can select that version." msgstr "" "Du kan välja ett annat diff-program här. På Solaris känner inte det vanliga " -"diff-programmet till alla väljare, men GNU-versionen av diff gör det. På detta " -"sätt kan du välja den versionen." +"diff-programmet till alla väljare, men GNU-versionen av diff gör det. På " +"detta sätt kan du välja den versionen." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -605,9 +518,9 @@ msgstr "Utmatningsformat" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Välj format för utmatningen som skapas av diff. Förenat är det som oftast " "används eftersom det är mycket läsbart. TDE-utvecklarna tycker att det här " @@ -617,6 +530,11 @@ msgstr "" msgid "Lines of Context" msgstr "Sammanhangsrader" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Antal sammanhangsrader:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -624,8 +542,8 @@ msgid "" "unnecessarily." msgstr "" "Antal sammanhangsrader är normalt 2 eller 3. Det gör jämförelsen läsbar och " -"tillämpningsbar i de flesta fall. Mer än 3 rader gör bara jämförelsen onödigt " -"stor." +"tillämpningsbar i de flesta fall. Mer än 3 rader gör bara jämförelsen " +"onödigt stor." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -741,19 +659,19 @@ msgstr "Filmönster att undanta" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Om det här är markerat kan du skriva in ett skalmönster i redigeringsraden till " -"höger eller väljer poster i listan." +"Om det här är markerat kan du skriva in ett skalmönster i redigeringsraden " +"till höger eller väljer poster i listan." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Här kan du lägga till eller ta bort ett skalmönster, eller välja en eller flera " -"poster i listan." +"Här kan du lägga till eller ta bort ett skalmönster, eller välja en eller " +"flera poster i listan." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -763,24 +681,24 @@ msgstr "Fil med filnamn att undanta" msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"Om det här är markerat, kan du skriva in ett filnamn i kombinationsrutan till " -"höger." +"Om det här är markerat, kan du skriva in ett filnamn i kombinationsrutan " +"till höger." #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Här kan du skriva in en webbadress till en fil med skalmönster som ska " "ignoreras under jämförelse av katalogerna." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Alla filer som du väljer i dialogrutan som visas när du klickar här, läggs till " -"i dialogrutan till vänster om knappen." +"Alla filer som du väljer i dialogrutan som visas när du klickar här, läggs " +"till i dialogrutan till vänster om knappen." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -846,167 +764,278 @@ msgstr "Teckensnitt:" msgid "Size:" msgstr "Storlek:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Inställningar" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Visningsinställningar" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Teckensnitt:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Jämförelseinställningar" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Applicera skillnad" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Spara a&lla" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Ångra &applicera skillnad" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Spara .&diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "App&licera alla" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Byt källa och mål" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Å&ngra applicera alla" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Visa statistik" - -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Webbadressen %1 kan inte laddas ner." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Webbadressen %1 finns inte på systemet." - -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Jämförelsealternativ" - -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Programfixar" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fö®ående fil" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Spara .diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Nä&sta fil" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Filen finns eller är skrivskyddad. Vill du skriva över den?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Föregående skillnad" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Filen finns" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Nästa s&killnad" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Skriv över" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"Inga modeller eller inga skillnader. Den här filen: %1, är inte " +"en giltig jämförelsefil." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Skriv inte över" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Det uppstod problem att applicera jämförelsen %1 med filen %2." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "Kompare-del" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Det uppstod problem att applicera jämförelsen %1 med katalogen " +"%2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Kör jämförelse..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Kunde inte öppna en tillfällig fil." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Tolkar jämförelseutmatning..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Kunde inte skriva till den tillfälliga filen %1. Tar bort den." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Jämför fil %1 med fil %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Kunde inte skapa målkatalogen %1.\n" +"Filen har inte sparats." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Jämför filer i %1 med filer i %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Kunde inte ladda upp tillfällig fil till målplatsen %1. Den " +"tillfälliga filen är fortfarande tillgänglig under %2. Du kan kopiera " +"den till rätt plats för hand." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Visar jämförelseutmatning från %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Kunde inte tolka jämförelseutmatning." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Fogar ihop jämförelseutmatningen från %1 med filen %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Filerna är identiska." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Fogar ihop jämförelseutmatningen från %1 med katalogen %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Kunde inte skriva till den tillfälliga filen." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Du har gjort ändringar i målfilen eller målfilerna.\n" -"Vill du spara dem?" +"Program för att visa skillnaderna mellan filer och valfritt skapa en " +"jämförelsefil" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Spara ändringar?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Det här jämför webbadress 1 med webbadress 2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Ingen jämförelsefil finns eller två filer har inte jämförts. Därför finns inte " -"någon statistik tillgänglig." +"Detta öppnar webbadress 1 och förväntar sig att den är en " +"jämförelseutmatning. Webbadress 1 kan också vara \"-\", och läses då från " +"standardinmatningen. Detta kan till exempel användas med \"cvs diff | " +"kompare -o -\". Kompare kontrollerar om originalfilerna kan hittas, och " +"fogar sedan ihop originalfilerna med jämförelseutmatningen och visar det i " +"visningsfönstret. Väljaren \"-n\" stänger av kontrollen." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Jämförelsestatistik" +#: 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 "" +"Detta fogar ihop webbadress 2 med webbadress 1. Webbadress 2 förväntas vara " +"en jämförelseutmatning och webbadress 1 filen eller katalogen som " +"jämförelseutmatningen ska fogas ihop med. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Statistik:\n" -"\n" -"Gammal fil: %1\n" -"Ny fil: %2\n" -"\n" -"Format: %3\n" -"Antal block: %4\n" -"Antal skillnader: %5" +"Stänger av kontrollen för att automatiskt hitta originalfilerna när \"-\" " +"används som webbadress med väljaren -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." +msgstr "" +"Använd det här för att ange kodningen vid anrop från kommandoraden. Det får " +"den lokala kodningen som standardvärde om det inte anges." + +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "© 2001-2004, John Firebaugh och Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Upphovsman" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare ikongrafik" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Ett stort antal goda råd" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia-jämförelsevisning" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Jämför de här filerna eller katalogen" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Filer" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "S&killnad" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Visningsinställningar" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Kör jämförelse i" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Kommandorad" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd katalog && diff -udHprNa -- källa mål" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Al&ternativ" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Leta efter mindre ändringar" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Optimera för stora filer" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Ignorera skiftläge" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Expandera tabulator-tecken till mellanslag" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Ignorera tillagda eller borttagna tomma rader" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Ignorera ändringar i blanktecken" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Visa funktionsnamn" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Jämför kataloger rekursivt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Behandla nya filer som tomma" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Format" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Sida vid sida" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"Statistik:\n" -"\n" -"Antal filer i diff-filen: %1\n" -"Format: %2\n" -"\n" -"Aktuell gammal fil: %3\n" -"Aktuell ny fil: %4\n" -"\n" -"Antal block: %5\n" -"Antal skillnader: %6" diff --git a/tde-i18n-ta/messages/tdesdk/kompare.po b/tde-i18n-ta/messages/tdesdk/kompare.po index 47ca79a6ca9..4b3661fefdc 100644 --- a/tde-i18n-ta/messages/tdesdk/kompare.po +++ b/tde-i18n-ta/messages/tdesdk/kompare.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "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: 2004-08-06 04:51-0800\n" "Last-Translator: Tamil PC \n" "Language-Team: \n" @@ -20,340 +20,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "மாறுபாட்டை பயன்படுத்து" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "பயன்படுத்திய மாறுபாட்டை ரத்து செய்" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "அனைத்தையும் பயன்படுத்து" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "பயன்படுத்திய அனைத்தையும் ரத்து செய்" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "முன்னிருக்கும் கோப்பு" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "அடுத்திருக்கும் கோப்பு" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "முன்னிருக்கும் மாறுபாடு" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "அடுத்திருக்கும் மாறுபாடு" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"மாதிரிகளோ அல்லது மாறுபாடுகளோ இல்லை, இந்த கோப்பு: %1" -", ஒரு தக்க diff கோப்பு அல்ல" - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"%1diffல் இருந்து %2 கோப்புக்கு பயன்படுத்தும்போது பிரச்சினைகள் " -"ஏற்பட்டன." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"%1 diffல் இருந்து %2 ஆவணத்திருக்கு பயன்படுத்தும்போது பிரச்சினைகள் " -"ஏற்பட்டன." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "ஒரு தற்காலிக கோப்பினை திறக்க இயலவில்லை." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "தற்காலிக கோப்புக்குள் எழுத இயலவில்லை." - -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "தற்காலிக கோப்புக்குள் எழுத இயலவில்லை." - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"%1 சேருமிடத்தில் தற்காலிக கோப்பினை ஏற்ற இயலவில்லை. எனினும் தற்காலிக " -"கோப்பு %2 கீழ் இன்னும் உள்ளது. இதனை நீங்கள் கைமுறையாக சரியான இடத்துக்கு " -"படியேடுக்கலாம்." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "diffன் வெளியீட்டை பிரித்தாய இயலவில்லை." - -#: 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 "Diffஐ இதில் இயக்கு" - -#. 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 "cd dir && diff -udHprNa -- source destination" - -#. 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 "Ed" - -#. 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 "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 "" -"கோப்புகளுக்கிடையே மாறுபாடுகளை கண்டறிய, தேவையானால் ஒரு diff ஐ உருவாக்க, உதவும் " -"ஒரு நிரல்." - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "இது URL1ஐ URL2வோடு ஒப்பிடும்." - -#: 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 "" -"இது URL1ஐ diffன் வெளியீடாகக்கருதி திறக்கும். URL1 '-' ஆகவும் இருக்கலாம். " -"அப்போது இது வழக்க உள்ளீட்டுக்கருவியிலிருந்து படிக்கும். உதாரணமாக, cvs diff | " -"kompare -o - என்று உபயோகிக்கலாம். இந்த உபயோகத்தில், Kompare மூல கோப்புகளை " -"கண்டுபிடிக்க முடியுமா என சோதித்துவிட்டு, கண்டுபிடித்த மூல கோப்புகளை diffன் " -"வெளியீட்டோடு கலவை செய்து காட்சிகாட்டியில் காண்பிக்கும். -n சோதனையை செயலிழக்கச் " -"செய்துவிடும்." - -#: 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 "" -"இது URL2ஐ URL1க்குள் கலக்கும். URL2 diffன் வெளியீடாகவும், URL1 இவ்வெளியீடு " -"கலக்கப்பட வேண்டிய கோப்பு அல்லது ஆவணமாகவும் இருக்கும் என எதிர்பார்க்கப்படுகிறது." - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"-o தேர்வுடன் '-'ஐ URL ஆக பயன்படுத்தும் போது, மூலமான கோப்புகளை தானே " -"கண்டுபிடிக்கச் செய்யும் சோதனையை செயலிழக்கச் செய்துவிடும்." - -#: 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, ஜான் பையர்பாக் மற்றும் ஒட்டோ பிரக்மேன்" - -#: 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 "Cervisia diff காட்டீ" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "மு. கோபிகிருஷ்ணன்" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -459,28 +132,53 @@ msgstr "இந்த கோப்பு அல்லது ஆவணத்தி #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"இந்த உரையாடலின் புலங்களில் நீங்கள் ஒரு கோப்பின் அல்லது ஆவணத்தின் பெயரையும், " -"diffன் வெளியீட்டை கொண்டிருக்கும் ஒரு கோப்பின் பெயரையும் உள்ளிட்டிருந்தால் " -"இந்தப் பொத்தான் செயல்படுத்த ஏதுவாகும். இதனை அழுத்தினால், Kompareன் பிரதான " -"காட்சி திறக்கப்பட்டு, நீங்கள் உள்ளிட்ட கோப்பின் அல்லது ஆவணத்திலிருக்கும் " -"கோப்புகளின் வெளியீடுகள் diffன் வெளியீட்டோடு கலக்கப்படும். பிறகு நீங்கள் " -"மாறுபாடுகளை ஒரு கோப்புக்கோ/ கோப்புகளுக்கோ பயன்படுத்தலாம்." +"இந்த உரையாடலின் புலங்களில் நீங்கள் ஒரு கோப்பின் அல்லது ஆவணத்தின் பெயரையும், diffன் " +"வெளியீட்டை கொண்டிருக்கும் ஒரு கோப்பின் பெயரையும் உள்ளிட்டிருந்தால் இந்தப் பொத்தான் செயல்படுத்த " +"ஏதுவாகும். இதனை அழுத்தினால், Kompareன் பிரதான காட்சி திறக்கப்பட்டு, நீங்கள் உள்ளிட்ட " +"கோப்பின் அல்லது ஆவணத்திலிருக்கும் கோப்புகளின் வெளியீடுகள் diffன் வெளியீட்டோடு கலக்கப்படும். " +"பிறகு நீங்கள் மாறுபாடுகளை ஒரு கோப்புக்கோ/ கோப்புகளுக்கோ பயன்படுத்தலாம்." -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "இந்த கோப்புகளையோ ஆவணங்களையோ ஒப்பிடு" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "ஆவணங்களையோ கோப்புகளையோ ஒப்பிடு" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "உரைக்காட்சி" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "மூலம்" -#: komparenavtreepart/komparenavtreepart.cpp:61 +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "சேருமிடம்" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "ஒப்பிடு" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "இந்த கோப்புகளையோ ஆவணங்களையோ ஒப்பிடு" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"இந்த உரையாடலின் புலங்களில் இரண்டு கோப்புகளின் அல்லது இரண்டு ஆவணங்களின் பெயர்களை நீங்கள் " +"உள்ளிட்டிருந்தால், இந்த பொத்தான் செயல்படுத்த ஏதுவாகும். இதனை அழுத்தினால், உள்ளிட்ட " +"கோப்புகளின் அல்லது ஆவணங்களின் ஒப்பீடு ஆரம்பமாகும்." + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "உரைக்காட்சி" + +#: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" msgstr "மூல ஆவணம்" @@ -571,18 +269,232 @@ msgstr "தெரியாத" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -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 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr "URL %1ஐ இறக்குமதி செய்ய முடியவில்லை." + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "The URL %1 does not exist on your system." +msgstr " URL %1 உங்கள் முறைமையில் இல்லை." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff விருப்பங்கள்" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch files" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr ".வித்தியாசத்தையை சேமி" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "diff இயக்கப்படுகிறது..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "diffன் வெளியீடு பிரித்தாயப்படுகிறது..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "கோப்பு %1ம் கோப்பு %2ம் ஒப்பிடப்படுகின்றன " + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1ல் உள்ள கோப்புகள் %2ல் உள்ள கோப்புகளோடு ஒப்பிடப்படுகின்றன" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1லிருந்து diffன் வெளியீடு காணப்பிக்கப்படுகிறது" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "%1ல் இருக்கும் diffன் வெளியீடு கோப்பு %2க்குள் கலக்கப்படுகிறது" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "%1ல் இருக்கும் diffன் வெளியீடு ஆவணம் %2க்குள் கலக்கப்படுகிறது" + +#: 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 "" +"கோப்பு(கள்) சேருமிடத்துக்கு மாற்றங்கள் நீங்கள் செய்துள்ளீர்.\n" +"அவற்றை நீங்கள் சேமிக்க விரும்புகிறீர்களா?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"diff கோப்பு இல்லை, அல்லது எந்த இரு கோப்புகளும் diff செய்யப்படவில்லை. எனவே " +"புள்ளிவிவரங்கள் கிடையாது." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff புள்ளிவிவரம்" + +#: 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 "" +"புள்ளிவிவரங்கள்:\n" +"\n" +"பழைய கோப்பு: %1\n" +"புதிய கோப்பு: %2\n" +"\n" +"வடிவம்: %3\n" +"hunkகளின் எண்ணிக்கை: %4\n" +"மாறுபாடுகளின் எண்ணிக்கை: %5" + +#: 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 "" +"புள்ளிவிவரம்:\n" +"\n" +"diff கோப்பில் உள்ள கோப்புகளின் எண்ணிக்கை: %1\n" +"வடிவம்: %2\n" +"\n" +"த்ற்போதைய பழைய கோப்பு: %3 \n" +"தற்போதைய புதிய கோப்பு: %4\n" +"\n" +"hunkகளின் எண்ணிக்கை: %5\n" +"மாறுபாடுகளின் எண்ணிக்கை: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "விருப்பங்கள்" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "உரைக்காட்சி" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "அமைப்புகளை காணுங்கள்" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "வித்தியாசம்" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diffன் அமைப்புகள்" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&கோப்புகள்" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "இங்கு நீங்கள் ஒப்பிட விரும்புகிற கோப்புகளை பதிவு செய்யலாம்" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "கோப்புகளை ஒப்பிடுதலுக்கான விருப்பங்களை இங்கு மாற்றலாம்" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "தோற்றம்" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "காட்சி மாற்றத்திற்கான விருப்பங்களை இங்கு மாற்றலாம்." @@ -597,9 +509,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"பலவித diff நிரலை இங்கே நீங்கள் தேர்வு செய்யலாம். சொலாரிஸில் நிரந்தர diff நிரல் " -"GNU பதிப்பு தரும் அனைத்து தேர்வுகளையும் அனுமதிக்காது. இதில் நீங்கள் அந்த " -"பதிப்பை தேர்வு செய்யலாம்." +"பலவித diff நிரலை இங்கே நீங்கள் தேர்வு செய்யலாம். சொலாரிஸில் நிரந்தர diff நிரல் GNU " +"பதிப்பு தரும் அனைத்து தேர்வுகளையும் அனுமதிக்காது. இதில் நீங்கள் அந்த பதிப்பை தேர்வு " +"செய்யலாம்." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -611,27 +523,31 @@ msgstr "வெளியீட்டு வடிவம்" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"diff உருவாக்கிய வெளியீட்டின் வடிவத்தை தேர்வு செய்யவும். ஒன்றுசேர்ப்பு இதுதான் " -"அதிகமாக உபயோகிக்கப்படுகிறது ஏனென்றால் அது படிக்க சுலபமானது. ஒட்டுகளை அனுப்ப TDE " -"உருவாக்காளர் இந்த வடிவங்களை மிகவும் விரும்புவார்கள்." +"diff உருவாக்கிய வெளியீட்டின் வடிவத்தை தேர்வு செய்யவும். ஒன்றுசேர்ப்பு இதுதான் அதிகமாக " +"உபயோகிக்கப்படுகிறது ஏனென்றால் அது படிக்க சுலபமானது. ஒட்டுகளை அனுப்ப TDE உருவாக்காளர் " +"இந்த வடிவங்களை மிகவும் விரும்புவார்கள்." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "சூழல் வரிகள்" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "சூழல் வரிகளின் எண்ணிக்கை:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"சாதரணமாக சுழல் உறையில் 2 அல்லது 3 வரிகள் இருக்கும். இது diffஐ படிக்க மற்றும் " -"இணைக்க மிகவும் உதவுகிறது. 3 வரிகளுக்கு மேல் இருந்தால் தான் diff தேவையில்லாமல் " -"பாதிக்கப்படும்." +"சாதரணமாக சுழல் உறையில் 2 அல்லது 3 வரிகள் இருக்கும். இது diffஐ படிக்க மற்றும் இணைக்க " +"மிகவும் உதவுகிறது. 3 வரிகளுக்கு மேல் இருந்தால் தான் diff தேவையில்லாமல் பாதிக்கப்படும்." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -747,19 +663,19 @@ msgstr "அகற்ற வேண்டிய கோப்பு மாதிர #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"இது குறிக்கப்பட்டால் வலது உரை பெட்டியில் உறையக தோரணத்தை உள்ளிடலாம் அல்லது " -"பட்டியில் இருந்து உள்ளிடுகலை தேர்வு செய்யலாம்." +"இது குறிக்கப்பட்டால் வலது உரை பெட்டியில் உறையக தோரணத்தை உள்ளிடலாம் அல்லது பட்டியில் " +"இருந்து உள்ளிடுகலை தேர்வு செய்யலாம்." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"இங்கு நீங்கள் உறையக தோரணத்தை நீக்கவோ அல்லது உள்ளிடலாம் அல்லது ஒன்றுக்கு " -"மேற்பட்ட உள்ளிடுதலை பட்டியலில் இருந்து தேர்வு செய்யலாம்." +"இங்கு நீங்கள் உறையக தோரணத்தை நீக்கவோ அல்லது உள்ளிடலாம் அல்லது ஒன்றுக்கு மேற்பட்ட உள்ளிடுதலை " +"பட்டியலில் இருந்து தேர்வு செய்யலாம்." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -769,24 +685,24 @@ msgstr "அகற்றப்படவேண்டிய கோப்புப msgid "" "If this is checked you can enter a filename in the combo box on the right." msgstr "" -"நீங்கள் இதனை தேர்வு செய்து இருந்தால் வலது பக்கத்தில் இருக்கும் சேர்க்கைப் " -"பெட்டியில் கோப்பின் பெயரை பதிவு செய்யவும்" +"நீங்கள் இதனை தேர்வு செய்து இருந்தால் வலது பக்கத்தில் இருக்கும் சேர்க்கைப் பெட்டியில் கோப்பின் " +"பெயரை பதிவு செய்யவும்" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" -"அடைவு ஒற்றுமை பார்க்கையில் தவிர்க்க உறையக தோரணத்துடன் கோப்பின் URLலை நீங்கள் " -"இங்கேயே உள்ளிடலாம்." +"அடைவு ஒற்றுமை பார்க்கையில் தவிர்க்க உறையக தோரணத்துடன் கோப்பின் URLலை நீங்கள் இங்கேயே " +"உள்ளிடலாம்." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"தோன்றும் உரையாடலில் தேர்வு செய்யும் எந்த புலமாக இருந்தாலும் நீங்கள் சொடுக்கும் " -"பொழுது அது உரையாடலில் உள்ள இடது பொத்தானில் போடப்படும்." +"தோன்றும் உரையாடலில் தேர்வு செய்யும் எந்த புலமாக இருந்தாலும் நீங்கள் சொடுக்கும் பொழுது அது " +"உரையாடலில் உள்ள இடது பொத்தானில் போடப்படும்." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -852,171 +768,276 @@ msgstr "எழுத்துரு:" msgid "Size:" msgstr "அளவு:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "விருப்பங்கள்" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "அமைப்புகளை காணுங்கள்" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "எழுத்துரு:" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diffன் அமைப்புகள்" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "மாறுபாட்டை பயன்படுத்து" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "அனைத்தையும் சேமி" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "பயன்படுத்திய மாறுபாட்டை ரத்து செய்" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "சேமி. &வேறுபாடு..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +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 -#, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1ஐ இறக்குமதி செய்ய முடியவில்லை." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "பயன்படுத்திய அனைத்தையும் ரத்து செய்" -#: komparepart/kompare_part.cpp:281 -#, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr " URL %1 உங்கள் முறைமையில் இல்லை." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "முன்னிருக்கும் கோப்பு" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff விருப்பங்கள்" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "அடுத்திருக்கும் கோப்பு" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch files" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "முன்னிருக்கும் மாறுபாடு" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".வித்தியாசத்தையை சேமி" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "அடுத்திருக்கும் மாறுபாடு" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"கோப்பு உள்ளது அல்லது எழுது பாதுக்காக்கப்பட்டுள்ளது; அதின் மீது எழுத " -"விரும்புகிறீர்களா?" - -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "கோப்பு உள்ளது" +"மாதிரிகளோ அல்லது மாறுபாடுகளோ இல்லை, இந்த கோப்பு: %1, ஒரு தக்க diff கோப்பு " +"அல்ல" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" +"%1diffல் இருந்து %2 கோப்புக்கு பயன்படுத்தும்போது பிரச்சினைகள் ஏற்பட்டன." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" msgstr "" +"%1 diffல் இருந்து %2 ஆவணத்திருக்கு பயன்படுத்தும்போது பிரச்சினைகள் " +"ஏற்பட்டன." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" - -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "diff இயக்கப்படுகிறது..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "ஒரு தற்காலிக கோப்பினை திறக்க இயலவில்லை." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "diffன் வெளியீடு பிரித்தாயப்படுகிறது..." +#: libdiff2/komparemodellist.cpp:350 +#, fuzzy +msgid "Could not write to the temporary file %1, deleting it." +msgstr "தற்காலிக கோப்புக்குள் எழுத இயலவில்லை." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "கோப்பு %1ம் கோப்பு %2ம் ஒப்பிடப்படுகின்றன " +#: libdiff2/komparemodellist.cpp:368 +#, fuzzy +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "தற்காலிக கோப்புக்குள் எழுத இயலவில்லை." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1ல் உள்ள கோப்புகள் %2ல் உள்ள கோப்புகளோடு ஒப்பிடப்படுகின்றன" +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"%1 சேருமிடத்தில் தற்காலிக கோப்பினை ஏற்ற இயலவில்லை. எனினும் தற்காலிக கோப்பு " +"%2 கீழ் இன்னும் உள்ளது. இதனை நீங்கள் கைமுறையாக சரியான இடத்துக்கு படியேடுக்கலாம்." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1லிருந்து diffன் வெளியீடு காணப்பிக்கப்படுகிறது" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "diffன் வெளியீட்டை பிரித்தாய இயலவில்லை." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "%1ல் இருக்கும் diffன் வெளியீடு கோப்பு %2க்குள் கலக்கப்படுகிறது" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "இந்த கோப்புகள் ஒரே மாதிரியாக உள்ளன." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "%1ல் இருக்கும் diffன் வெளியீடு ஆவணம் %2க்குள் கலக்கப்படுகிறது" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "தற்காலிக கோப்புக்குள் எழுத இயலவில்லை." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"கோப்பு(கள்) சேருமிடத்துக்கு மாற்றங்கள் நீங்கள் செய்துள்ளீர்.\n" -"அவற்றை நீங்கள் சேமிக்க விரும்புகிறீர்களா?" +"கோப்புகளுக்கிடையே மாறுபாடுகளை கண்டறிய, தேவையானால் ஒரு diff ஐ உருவாக்க, உதவும் ஒரு " +"நிரல்." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "மாற்றங்களை சேமிக்கவா?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "இது URL1ஐ URL2வோடு ஒப்பிடும்." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"diff கோப்பு இல்லை, அல்லது எந்த இரு கோப்புகளும் diff செய்யப்படவில்லை. எனவே " -"புள்ளிவிவரங்கள் கிடையாது." +"இது URL1ஐ diffன் வெளியீடாகக்கருதி திறக்கும். URL1 '-' ஆகவும் இருக்கலாம். அப்போது இது " +"வழக்க உள்ளீட்டுக்கருவியிலிருந்து படிக்கும். உதாரணமாக, cvs diff | kompare -o - என்று " +"உபயோகிக்கலாம். இந்த உபயோகத்தில், Kompare மூல கோப்புகளை கண்டுபிடிக்க முடியுமா என " +"சோதித்துவிட்டு, கண்டுபிடித்த மூல கோப்புகளை diffன் வெளியீட்டோடு கலவை செய்து " +"காட்சிகாட்டியில் காண்பிக்கும். -n சோதனையை செயலிழக்கச் செய்துவிடும்." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff புள்ளிவிவரம்" +#: 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 "" +"இது URL2ஐ URL1க்குள் கலக்கும். URL2 diffன் வெளியீடாகவும், URL1 இவ்வெளியீடு கலக்கப்பட " +"வேண்டிய கோப்பு அல்லது ஆவணமாகவும் இருக்கும் என எதிர்பார்க்கப்படுகிறது." -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"புள்ளிவிவரங்கள்:\n" -"\n" -"பழைய கோப்பு: %1\n" -"புதிய கோப்பு: %2\n" -"\n" -"வடிவம்: %3\n" -"hunkகளின் எண்ணிக்கை: %4\n" -"மாறுபாடுகளின் எண்ணிக்கை: %5" +"-o தேர்வுடன் '-'ஐ URL ஆக பயன்படுத்தும் போது, மூலமான கோப்புகளை தானே கண்டுபிடிக்கச் " +"செய்யும் சோதனையை செயலிழக்கச் செய்துவிடும்." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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, ஜான் பையர்பாக் மற்றும் ஒட்டோ பிரக்மேன்" + +#: 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 "Cervisia diff காட்டீ" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "இந்த கோப்புகளையோ ஆவணங்களையோ ஒப்பிடு" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&கோப்புகள்" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "மாறுபாடு" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "அமைப்புகளை காணுங்கள்" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Diffஐ இதில் இயக்கு" + +#: 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 "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"புள்ளிவிவரம்:\n" -"\n" -"diff கோப்பில் உள்ள கோப்புகளின் எண்ணிக்கை: %1\n" -"வடிவம்: %2\n" -"\n" -"த்ற்போதைய பழைய கோப்பு: %3 \n" -"தற்போதைய புதிய கோப்பு: %4\n" -"\n" -"hunkகளின் எண்ணிக்கை: %5\n" -"மாறுபாடுகளின் எண்ணிக்கை: %6" diff --git a/tde-i18n-tg/messages/tdesdk/kompare.po b/tde-i18n-tg/messages/tdesdk/kompare.po index 72cd4026f34..76e9d33ed6a 100644 --- a/tde-i18n-tg/messages/tdesdk/kompare.po +++ b/tde-i18n-tg/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "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: 2005-09-23 17:16+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" @@ -17,336 +17,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Истифодабарии фарқиятҳо" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Барҳамдиҳии фарқиятҳо" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Ҳамаро &истифода баред" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Ҳамаро и&стифода набаред" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "&Файли пешина" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Файли оянда" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Фарқиятҳои пешина" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Фарқиятҳои оянда" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"На амсила ва на фарқият нест. Ин файл %1 файли андозаи diff намебошад." - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Чанд проблемаҳо буданд барои истифодабарии diff %1 ба файли %2." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Дар вақти истифодаи diff ба чанд проблемаҳо шуд%1 ба каталоги %2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Файли муввақатӣ кашода намешавад." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Ба файли муввақатӣ навишта намешавад." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Наметавонад файли мувафақро ба ҷои номгуфта%1" -"бор кунед. Файли ҷори буда ҳоло ҳам ҳақиқатан дар таг: %2" -". Шумо метавонед дастурро дастӣ нусхабардорӣ намоед." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Баромади diff такмил дода намешавад." - -#: 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 "Сар додани Diff ба" - -#. 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 "cd dir && diff -udHprNa - манбаъи фармон" - -#. 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 "Ed" - -#. 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 "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 "Барнома барои намоиши фарқият байни файлҳо ва эҷод кардани файли diff" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Баробаркунӣ \"Бадарға1\" бо \"Бадарғаи2\"" - -#: 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 "" -"Интихоб кунед формати парвариш аз тарафи diff барқарор ёфта шуда. Муттаҳид " -"онест,ки онро гоҳ-гоҳ истифода бурда мешавад барои он ,ки онро хондан " -"метавонед. Ба коркунандаҳои TDE ин формат хеле маъқул аст, аз зуртарин барои " -"фиристондани." - -#: 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 "" -"Ин метавонад URL2 бо URL1 омехта шавад, URL2 умед дорад, ки diff хуруҷ шавад ва " -"URL1 файл ё папка, ки diff хуруҷ омехта шуда мӯҳтоҷи мекашад. " - -#: 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 "" -"(c) 2001-2004, Джон Файербаух (John Firebaugh) ва Отто Брюггеман (Otto " -"Bruggeman)" - -#: 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 "Тамошои фарқият дар Cervisia" - -#: 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 "" -"Агар шумо 2 файли ё 2 каталоги дар фосилаи ин диалог ворид кардед, он вақт ин " -"тугма дастрас шуда ва дар вақти пахш кардани ӯ муқоисаи файлҳои ё каталогҳои " -"нишондодаро сар мекунад. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -"НПО \"Имкониятҳои ҷавонон\" ва Khujand Computer Technologies, Inc. USA, Роҷер " -"Ковакс, Виктор Ибрагимов, Марина Колючева" +"НПО \"Имкониятҳои ҷавонон\" ва Khujand Computer Technologies, Inc. USA, " +"Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -453,25 +132,51 @@ msgstr "Якҷоя кардани ин файл ё ин ки каталог бо #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Агар шумо ба файл ё номи папка ва файле, ки diff -и хуруҷ дар майдонҳо дар ин " -"диалог ворид гардед баъд ин тугма тавоно месозад ва зер карда мешавад,он кушода " -"мешавад намуди kompare-и асоси дар он ҷое,ки хуруҷи ворид гаштаи файл ё файлҳои " -"папка омехта мешавад бо diff хуруҷ,шумо метавонед баъд дигаргуниҳоро ба файл ё " -"файлҳо гузоред. " +"Агар шумо ба файл ё номи папка ва файле, ки diff -и хуруҷ дар майдонҳо дар " +"ин диалог ворид гардед баъд ин тугма тавоно месозад ва зер карда мешавад,он " +"кушода мешавад намуди kompare-и асоси дар он ҷое,ки хуруҷи ворид гаштаи файл " +"ё файлҳои папка омехта мешавад бо diff хуруҷ,шумо метавонед баъд " +"дигаргуниҳоро ба файл ё файлҳо гузоред. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Ин файлҳо ё ин ки каталогҳоро муқоиса кунед" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Муқоиса кардани файлҳо ё каталогҳо" -#: kompare_shell.cpp:439 -msgid "Text View" -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 "Муқоиса кардан" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Ин файлҳо ё ин ки каталогҳоро муқоиса кунед" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"Агар шумо 2 файли ё 2 каталоги дар фосилаи ин диалог ворид кардед, он вақт " +"ин тугма дастрас шуда ва дар вақти пахш кардани ӯ муқоисаи файлҳои ё " +"каталогҳои нишондодаро сар мекунад. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Аз назар гузаронидани матн" #: komparenavtreepart/komparenavtreepart.cpp:61 msgid "Source Folder" @@ -564,18 +269,229 @@ msgstr "Номаълум" msgid "KompareNavTreePart" msgstr "" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -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 "The URL %1 cannot be downloaded." +msgstr "Ин URL %1 фаровир карда намешавад." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Ин URL %1 дар системаи Шумо вуҷуд надорад." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Параметрҳои Diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr ".diff *.dif *.patch|Файлҳои фарқиятӣ" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Дар хотир гузоштани 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 "Файл аллакай вуҷуд дорад" + +#: 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 "Сар дода шуд diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Коркарди парвариши diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Муқоиса кардани файли %1 бо файли %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Муқоса кардани файлҳо дар %1 бо файлҳои дар %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Аз назар гузарондани парвариши diff аз %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Якҷо шавии парвариши diff аз файли %1 ба файли %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Якҷо шавии парвариши diff аз %1 ба папкаи %2" + +#: 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 "" +"Таъиноти файл иваз гардидааст \n" +"Шумо мехоҳед онро дар хотира гузоред?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Файли diff нест ё муқоисашави бароварда шуд на ба ду файлҳо.Статистика " +"дастрас нест." + +#: 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 "" +"Статистикаҳо:\n" +"\n" +"Файли кӯҳна: %1\n" +"Файли нав: %2\n" +"\n" +"Формат\t %3\n" +"Андозаи тағирнашуда: %4\n" +"Андозаи фарқиятҳо: %5" + +#: 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 "" +"Статистикаҳо:\n" +"\n" +"Андозаи файлҳо дар файли фарқияти: %1\n" +"Формат: %2\n" +"\n" +"Файли кӯҳнаи ҳозира: %3\n" +"Файли нави ҳозира: %4\n" +"\n" +"Андозаи тағир нашида: %5\n" +"Андозаи фарқиятҳо: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Параметрҳо" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Аз назар гузаронидани матн" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Ҷур кардани намудҳо" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Фарқият" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Ҷур кардани фарқиятҳо" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Файлҳо" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Дар инҷо файл барои муқоиса кардан ворид мешавад." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Дар инҷо параметрҳо барои муқоиса, танзим карда мешавад." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Т&ақдимот" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Дар инҷо параметрҳои визуалӣ танзим карда мешаванд." @@ -591,8 +507,8 @@ msgid "" "you can select that version." msgstr "" "Шумо метавонед интихоб кунед барномаи diff-и ҳархеларо дар инҷо.Дар Solaris " -"стандарти барномаи diff тарафдори намекунад ҳамаи интихоботро ,ки тафсири GNU " -"тарафдори мекунад.Бо ин роҳ шумо метавонед тафсирро интихоб намоед." +"стандарти барномаи diff тарафдори намекунад ҳамаи интихоботро ,ки тафсири " +"GNU тарафдори мекунад.Бо ин роҳ шумо метавонед тафсирро интихоб намоед." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -604,9 +520,9 @@ msgstr "Формат парвариши" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Интихоб кунед формати парвариш аз тарафи diff барқарор ёфта шуда. Муттаҳид " "онест,ки онро гоҳ-гоҳ истифода бурда мешавад барои он ,ки онро хондан " @@ -617,6 +533,11 @@ msgstr "" msgid "Lines of Context" msgstr "Хатҳои контекст" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Андозаи хатҳо контексти:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -624,8 +545,8 @@ msgid "" "unnecessarily." msgstr "" "Андозаи хатҳои контексти оддӣ 2-то ё 3-то мебошанд. Ин имкон медиҳад diff-ро " -"хондан ва дар бисёр корҳо зарур аст. Зиёда аз 3 хатҳо танҳо diff-ро беҳуда дам " -"мекунад." +"хондан ва дар бисёр корҳо зарур аст. Зиёда аз 3 хатҳо танҳо diff-ро беҳуда " +"дам мекунад." #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -672,7 +593,8 @@ msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" -"Якҷо кунед иборози мунтазамро дар инҷо барои ,ки шумо мехоҳед истифода бурдан \n" +"Якҷо кунед иборози мунтазамро дар инҷо барои ,ки шумо мехоҳед истифода " +"бурдан \n" "аҳамият надодан ба хатҳое,ки онро ҷамъ мекунанд." #: libdialogpages/diffpage.cpp:294 @@ -741,19 +663,19 @@ msgstr "Қолиб бо ном барои махсус" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "Агар ин тафтиш шуда бошад шумо метавонед ба намунаи пардозандаи фармонҳо дар " "қуттии матнии рост ё аз рӯйхат ҷудокардаи дохилшудаҳоро дохил кунед." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" -"Дар ин ҷо шумо метавонед ворид гардед ё намунаи пардозандаи фармонҳоро ё ин ки " -"як ё зиёда воридгаштаҳои ҷудо кардаро аз рӯйхат нест кунед." +"Дар ин ҷо шумо метавонед ворид гардед ё намунаи пардозандаи фармонҳоро ё ин " +"ки як ё зиёда воридгаштаҳои ҷудо кардаро аз рӯйхат нест кунед." #: libdialogpages/diffpage.cpp:338 msgid "File with Filenames to Exclude" @@ -768,19 +690,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Дар ин ҷо шумо метавонед ба файли URL дароед бо варақаи мисолҳо дар вақти " "муқоисакунии папкаҳо аҳамият дода нашавад." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Ягон файли шумо дар диалог ҷудокарда,ки дар боло ногаҳон пайдо мешавад вақте,ки " -"шумо онро дар диалог гузошта тугмаи чапи онро пахш мекунед." +"Ягон файли шумо дар диалог ҷудокарда,ки дар боло ногаҳон пайдо мешавад вақте," +"ки шумо онро дар диалог гузошта тугмаи чапи онро пахш мекунед." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -846,167 +768,274 @@ msgstr "Шрифт:" msgid "Size:" msgstr "Андоза:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Параметрҳо" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Шрифт:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Ҷур кардани намудҳо" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Истифодабарии фарқиятҳо" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Ҷур кардани фарқиятҳо" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Барҳамдиҳии фарқиятҳо" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Ҳамаро &дар хотир гузоштан" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Ҳамаро &истифода баред" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Дар хотир гузоштани &фарқият..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Ҳамаро и&стифода набаред" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Ивази ҷойҳои сарчашмаҳо ва таъинот" - -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Нишон додани статистикаҳо" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "&Файли пешина" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Ин URL %1 фаровир карда намешавад." +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Файли оянда" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Ин URL %1 дар системаи Шумо вуҷуд надорад." +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Фарқиятҳои пешина" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Параметрҳои Diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Фарқиятҳои оянда" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr ".diff *.dif *.patch|Файлҳои фарқиятӣ" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"На амсила ва на фарқият нест. Ин файл %1 файли андозаи diff намебошад." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Дар хотир гузоштани Diff" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Чанд проблемаҳо буданд барои истифодабарии diff %1 ба файли %2." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Файл аллакай вуҷуд дорад.Шумо мехоҳед онро иваз намоед?" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Дар вақти истифодаи diff ба чанд проблемаҳо шуд%1 ба каталоги %2." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Файл аллакай вуҷуд дорад" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Файли муввақатӣ кашода намешавад." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "" +#: libdiff2/komparemodellist.cpp:350 +#, fuzzy +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Ба файли муввақатӣ навишта намешавад." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" +"Наметавонад файли мувафақро ба ҷои номгуфта%1бор кунед. Файли ҷори " +"буда ҳоло ҳам ҳақиқатан дар таг: %2. Шумо метавонед дастурро дастӣ " +"нусхабардорӣ намоед." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Сар дода шуд diff..." - -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Коркарди парвариши diff..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Баромади diff такмил дода намешавад." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Муқоиса кардани файли %1 бо файли %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Файлҳо мутобиқ ҳастанд." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Муқоса кардани файлҳо дар %1 бо файлҳои дар %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Ба файли муввақатӣ навишта намешавад." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Аз назар гузарондани парвариши diff аз %1" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "Барнома барои намоиши фарқият байни файлҳо ва эҷод кардани файли diff" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Якҷо шавии парвариши diff аз файли %1 ба файли %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Баробаркунӣ \"Бадарға1\" бо \"Бадарғаи2\"" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Якҷо шавии парвариши diff аз %1 ба папкаи %2" +#: 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 "" +"Интихоб кунед формати парвариш аз тарафи diff барқарор ёфта шуда. Муттаҳид " +"онест,ки онро гоҳ-гоҳ истифода бурда мешавад барои он ,ки онро хондан " +"метавонед. Ба коркунандаҳои TDE ин формат хеле маъқул аст, аз зуртарин барои " +"фиристондани." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Таъиноти файл иваз гардидааст \n" -"Шумо мехоҳед онро дар хотира гузоред?" +"Ин метавонад URL2 бо URL1 омехта шавад, URL2 умед дорад, ки diff хуруҷ шавад " +"ва URL1 файл ё папка, ки diff хуруҷ омехта шуда мӯҳтоҷи мекашад. " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Тағиротҳоро хотиргузорӣ кунем?" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"Тафтиши ҷустуҷӯи худкорсозии файл(ҳо) аслӣ дар вақти истифодаи - дар сифати " +"манба бо интихоби -о, бекор мешавад." -#: komparepart/kompare_part.cpp:667 +#: main.cpp:43 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"Файли diff нест ё муқоисашави бароварда шуд на ба ду файлҳо.Статистика дастрас " -"нест." +"Инро барои нишон додани рамз гузори истифода баред,вақто,ки фарохондани он " +"аз рахи фармон аст.Ин пешфарз ба рамз гузории маҳалӣ агар нишон дода набошад." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Фарқияти статистикави" +#: main.cpp:52 +msgid "Kompare" +msgstr "" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" msgstr "" -"Статистикаҳо:\n" -"\n" -"Файли кӯҳна: %1\n" -"Файли нав: %2\n" -"\n" -"Формат\t %3\n" -"Андозаи тағирнашуда: %4\n" -"Андозаи фарқиятҳо: %5" +"(c) 2001-2004, Джон Файербаух (John Firebaugh) ва Отто Брюггеман (Otto " +"Bruggeman)" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp: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 "Тамошои фарқият дар Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Муқоиса кардани ин файлҳо ё каталогҳо" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Файлҳо" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Фарқият" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Ҷур кардани намудҳо" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Сар додани Diff ба" + +#: 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 "cd dir && diff -udHprNa - манбаъи фармон" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Статистикаҳо:\n" -"\n" -"Андозаи файлҳо дар файли фарқияти: %1\n" -"Формат: %2\n" -"\n" -"Файли кӯҳнаи ҳозира: %3\n" -"Файли нави ҳозира: %4\n" -"\n" -"Андозаи тағир нашида: %5\n" -"Андозаи фарқиятҳо: %6" diff --git a/tde-i18n-tr/messages/tdesdk/kompare.po b/tde-i18n-tr/messages/tdesdk/kompare.po index 01421dfa586..e9d1cd3e07b 100644 --- a/tde-i18n-tr/messages/tdesdk/kompare.po +++ b/tde-i18n-tr/messages/tdesdk/kompare.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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: 2005-07-16 15:47+0300\n" "Last-Translator: Cemil MUTLU \n" "Language-Team: Turkish \n" @@ -15,318 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "Değişiklikleri &Uygula" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "Değişiklikleri &Geri al" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Hepsini &Uygula" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "Hepsini &Geri al" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Önceki &Dosya" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "Sonraki &Dosya" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "&Önceki Değişiklikler" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "&Sonraki Değişklikler" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Modeller veya farklılıklar yok, %1 dosyası geçerli bir diff dosyası " -"değil." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Geçici dosya açılamadı." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "%1 geçici dosyasına yazılamadı, siliniyor." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"%1 hedef dizini yaratılamadı.\n" -"Dosya kaydedilemedi." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Geçici dosya %1 hedef konumuna yüklenemedi.Buna rağmen geçici dosya " -"%2 altında mevcut.Lütfen dosyayı elle yerine kopyalayın." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Diff çıktısı ayrıştırılamıyor." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Dosyalar birbiri ile aynı." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Geçici dosya yazılamıyor." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Farklılık" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "Diff çalıştır" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Komut Satırı" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- kaynak hedef" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Küçük değişklikleri ara" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Büyük dosyaları iyileştir" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Büyük/küçük harf değişikliklerini görmezden gel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "Sekmeleri boşluğa çevir" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Yeni ve silinmiş boş satırları görmezden gel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Boş satır değişikliklerini görmezden gel" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Fonksiyon isimlerini göster" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Dosyaları özyinelemeli karşılaştır" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Yeni dosyaları boş olarak algıla" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Biçim" - -#. 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 "İçerik" - -#. 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 "Ed-Script" - -#. 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 "Normal" - -#. 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 "Birleştirilmiş" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Yan yana" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Bağlam satır sayısı:" - -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Dosyalar arasındaki farklılıkları bulan ve diff dosyası oluşturan bir program" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Bu URL1 ile URL2'yi karşılaştıracak" - -#: 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 "Karşılaştır" - -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Yazar" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Simge sanatçısını karşılaştır" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Güzel öğütten bir hisse" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff göstericisi" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Dosya veya Dizinleri Karşılaştır" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Kaynak" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Hedef" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Karşılaştır" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Bu dosya veya dizinleri karşılaştır" - -#: 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 "" -"Eğer bu alandaki bu kutuda 2 dosya ismi veya 2 dizin ismi verirseniz, bu düğme " -"etkinleştirilecek ve tıklama ile dosya veya dizinlerin karşılaştırılması " -"başlar." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Cemil MUTLU" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -424,20 +119,46 @@ msgstr "Bu dosyayı veya dizini diff çıktısı ile harmanla" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"Eğer bu alandaki bu kutuda 2 dosya ismi veya 2 dizin ismi verirseniz, bu düğme " -"etkinleştirilecek ve tıklama ile dosya veya dizinlerin karşılaştırılması " -"başlar." +"Eğer bu alandaki bu kutuda 2 dosya ismi veya 2 dizin ismi verirseniz, bu " +"düğme etkinleştirilecek ve tıklama ile dosya veya dizinlerin " +"karşılaştırılması başlar." + +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Dosya veya Dizinleri Karşılaştır" + +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Kaynak" + +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Hedef" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Karşılaştır" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "Bu dosya veya dizinleri karşılaştır" +#: 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 "" +"Eğer bu alandaki bu kutuda 2 dosya ismi veya 2 dizin ismi verirseniz, bu " +"düğme etkinleştirilecek ve tıklama ile dosya veya dizinlerin " +"karşılaştırılması başlar." + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Metin Görünümü" @@ -521,18 +242,231 @@ msgstr "Bilinmiyor " msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Karşılaştırmak istediğiniz dosyaları buraya girin." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "&Hepsini kaydet" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr ".&diff olarak kaydet" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Kaynağı hedef ile değiştir" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "İstatistikleri göster" + +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "%1 bağlantısı indirilemedi." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "%1 bağlantısı sisteminizde mevcut değil." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff seçenekleri " + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Yama dosyaları" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr ".diff olarak kaydet" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Dosya mevcut veya yazmaya karşı korumalı; üzerine yazılsın mı?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Dosya Zaten Var" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "diff çalıştırılıyor..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "diff çıktısı çözümleniyor..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "%1 dosyası %2 dosyasıyla karşılaştırılıyor" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "%1 dosyaları %2 dosyaları ile karşılaştırılıyor" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1'den diff çıktısı görüntüleniyor" + +#: komparepart/kompare_part.cpp:558 +#, fuzzy +msgid "Blending diff output from %1 into file %2" +msgstr "diff çıktısı &1'den %2 dosyası içine karıştırılıyor" + +#: komparepart/kompare_part.cpp:563 +#, fuzzy +msgid "Blending diff output from %1 into folder %2" +msgstr "diff çıktısı &1'den %2 dizini içine karıştırılıyor" + +#: 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 "" +"Hedef dosyasını değiştirdiniz. \n" +"Değişiklikler kaydolsunmu ?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Değişiklikler kaydolsunmu ?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Birleştirilmiş" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "İçerik" + +#: 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 "Ed-Script" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Normal" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "" +"Diff dosyası veya diff yapılacak 2 dosya mevcut değil. Bu yüzden istatistik " +"mevcut değil" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff İstatistikleri" + +#: 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 "" +"İstatistikler:\n" +"\n" +"Eski dosya: %1\n" +"Yeni dosya: %2\n" +"\n" +"Format: %3\n" +"Grub sayısı (hunk): %4\n" +"Değişiklik sayısı: %5" + +#: 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 "" +"İstatistikler:\n" +"\n" +"Diff dosya sayısı: %1\n" +"Format: %2\n" +"\n" +"Aktuel eski dosya sayısı: %3\n" +"Aktuel yeni dosya sayısı: %4\n" +"\n" +"Grub sayısı(hunk): %5\n" +"Değişiklik sayısı: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Tercihler" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Metin Görünümü" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Ayarları Göster" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff ayarları" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Dosyalar" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Karşılaştırmak istediğiniz dosyaları buraya girin." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Dosyaları karşılaştırmak için tercihleri burada değiştirebilirsiniz." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "&Görünüm" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Görünüm için tercihleri burada değiştirebilirsiniz." @@ -561,9 +495,9 @@ msgstr "Çıktı Biçimi" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Diff tarafından oluşturulan çıktının biçimini seç. En sık kullanılan " "birleştirmedir, çünkü o çok anlaşılabilirdir. TDE geliştiricileri parçaları " @@ -573,6 +507,11 @@ msgstr "" msgid "Lines of Context" msgstr "Bağlam Satırları" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Bağlam satır sayısı:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -693,14 +632,14 @@ msgstr "Kabul Edilmeyecek Dosya Modeli" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -714,14 +653,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -788,169 +727,257 @@ msgstr "Yazıtipi:" msgid "Size:" msgstr "Boyut:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Tercihler" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Ayarları Göster" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff ayarları" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "&Hepsini kaydet" - -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr ".&diff olarak kaydet" - -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Kaynağı hedef ile değiştir" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Yazıtipi:" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "İstatistikleri göster" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "Değişiklikleri &Uygula" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "%1 bağlantısı indirilemedi." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "Değişiklikleri &Geri al" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "%1 bağlantısı sisteminizde mevcut değil." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Hepsini &Uygula" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff seçenekleri " +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "Hepsini &Geri al" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Yama dosyaları" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Önceki &Dosya" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".diff olarak kaydet" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Sonraki &Dosya" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Dosya mevcut veya yazmaya karşı korumalı; üzerine yazılsın mı?" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Önceki Değişiklikler" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Dosya Zaten Var" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "&Sonraki Değişklikler" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" +"Modeller veya farklılıklar yok, %1 dosyası geçerli bir diff " +"dosyası değil." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "diff çalıştırılıyor..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Geçici dosya açılamadı." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "diff çıktısı çözümleniyor..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "%1 geçici dosyasına yazılamadı, siliniyor." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "%1 dosyası %2 dosyasıyla karşılaştırılıyor" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"%1 hedef dizini yaratılamadı.\n" +"Dosya kaydedilemedi." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1 dosyaları %2 dosyaları ile karşılaştırılıyor" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Geçici dosya %1 hedef konumuna yüklenemedi.Buna rağmen geçici " +"dosya %2 altında mevcut.Lütfen dosyayı elle yerine kopyalayın." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1'den diff çıktısı görüntüleniyor" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Diff çıktısı ayrıştırılamıyor." -#: komparepart/kompare_part.cpp:558 -#, fuzzy -msgid "Blending diff output from %1 into file %2" -msgstr "diff çıktısı &1'den %2 dosyası içine karıştırılıyor" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Dosyalar birbiri ile aynı." -#: komparepart/kompare_part.cpp:563 -#, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "diff çıktısı &1'den %2 dizini içine karıştırılıyor" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Geçici dosya yazılamıyor." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Hedef dosyasını değiştirdiniz. \n" -"Değişiklikler kaydolsunmu ?" +"Dosyalar arasındaki farklılıkları bulan ve diff dosyası oluşturan bir program" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Değişiklikler kaydolsunmu ?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Bu URL1 ile URL2'yi karşılaştıracak" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Diff dosyası veya diff yapılacak 2 dosya mevcut değil. Bu yüzden istatistik " -"mevcut değil" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff İstatistikleri" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"İstatistikler:\n" -"\n" -"Eski dosya: %1\n" -"Yeni dosya: %2\n" -"\n" -"Format: %3\n" -"Grub sayısı (hunk): %4\n" -"Değişiklik sayısı: %5" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 "Karşılaştır" + +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Yazar" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Simge sanatçısını karşılaştır" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Güzel öğütten bir hisse" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff göstericisi" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Bu dosya veya dizinleri karşılaştır" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Dosyalar" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Farklılık" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Ayarları Göster" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Diff çalıştır" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Komut Satırı" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- kaynak hedef" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "&Seçenekler" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Küçük değişklikleri ara" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Büyük dosyaları iyileştir" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Büyük/küçük harf değişikliklerini görmezden gel" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "Sekmeleri boşluğa çevir" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Yeni ve silinmiş boş satırları görmezden gel" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Boş satır değişikliklerini görmezden gel" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Fonksiyon isimlerini göster" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Dosyaları özyinelemeli karşılaştır" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Yeni dosyaları boş olarak algıla" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Biçim" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Yan yana" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"İstatistikler:\n" -"\n" -"Diff dosya sayısı: %1\n" -"Format: %2\n" -"\n" -"Aktuel eski dosya sayısı: %3\n" -"Aktuel yeni dosya sayısı: %4\n" -"\n" -"Grub sayısı(hunk): %5\n" -"Değişiklik sayısı: %6" diff --git a/tde-i18n-uk/messages/tdesdk/kompare.po b/tde-i18n-uk/messages/tdesdk/kompare.po index 0e6eb434e95..6cc89576150 100644 --- a/tde-i18n-uk/messages/tdesdk/kompare.po +++ b/tde-i18n-uk/messages/tdesdk/kompare.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "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: 2005-10-21 15:53-0700\n" "Last-Translator: Ivan Petrouchtchak \n" "Language-Team: Ukrainian \n" @@ -15,337 +15,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.1\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Застосувати різницю" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Відмінити різницю" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Застос&увати все" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "&Відмінити все" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&опередній фал" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Наступний файл" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Поп&ередня різниця" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "На&ступна різниця" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -"Немає моделей або відмінностей. Файл: %1 не є чинним файлом формату " -"diff." - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "" -"Виникли проблеми під час застосування diff %1 до файла %2" -"." - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "" -"Виникли проблеми під час застосування diff %1 до теки%2." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Не вдалось відкрити тимчасовий файл." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "" -"Не вдалось записати до тимчасового файла %1, його буде видалено." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"Не вдалось створити каталог призначення %1.\n" -"Файл не було збережено." - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "" -"Не вдалось вивантажити тимчасовий файл по адресі призначення%1" -". Тимчасовий файл ще доступний під: %2. Можна його вручну скопіювати у " -"потрібне місце." - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Не вдалося проаналізувати вивід diff." - -#: 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 "Запустити Diff в" - -#. 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 "cd dir && diff -udHprNa -- джерело призначення" - -#. 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 "Ed" - -#. 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 "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 "Буде порівняно URL1 з URL2" - -#: 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 "" -"Відкриє URL1, сподіваючись, що це вивід diff. URL1 також може бути \"-\" і тоді " -"воно буде читатись із стандартного вводу. Можна використовувати, наприклад, у " -"cvs diff | kompare -o -. Kompare перевірить чи можливо знайти оригінальний " -"файл(и), а тоді змішає оригінальний файл(и) з виводом diff і покаже його у " -"переглядачі. -n відміняє перевірку." - -#: 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 "" -"Цим змішується URL2 з URL1, URL2 має бути виводом diff, а URL1 -- файлом або " -"текою у який(у) необхідно змішати вивід diff. " - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"Вимикає перевірку автоматичного пошуку оригінальних файлів при використанні " -"\"-\" як адресу URL з параметром -o." - -#: 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 і Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Автор" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Намалював піктограму Kompare" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Багато добрих порад" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Перегляд відмінностей в Cervisia" - -#: 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 "" -"Якщо ви ввели 2 назви файлів або 2 теки в поля цього вікна, то кнопка буде " -"уможливлена, і натискання на неї почне порівняння введених файлів або тек. " - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Іван Петрущак" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -455,28 +134,53 @@ msgstr "Змішати цей файл або теку з виводом diff" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" "Якщо ви ввели назву файла або теки та файла, що містить вивід diff, у поля " "цього вікна, то кнопка буде уможливлена і натискання на неї відкриє головне " "вікно kompare, в якому вивід введеного файла або файлів з теки змішуються з " "виводом diff, щоб потім можна було застосувати різницю до файла або файлів. " -#: kompare_shell.cpp:402 -msgid "Compare these files or folders" -msgstr "Порівняти ці файли або теки" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Порівняти файли або теки" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Перегляд тексту" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Джерело" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Тека джерела" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Призначення" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Порівняти" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Порівняти ці файли або теки" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"Якщо ви ввели 2 назви файлів або 2 теки в поля цього вікна, то кнопка буде " +"уможливлена, і натискання на неї почне порівняння введених файлів або тек. " + +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Перегляд тексту" + +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Тека джерела" #: komparenavtreepart/komparenavtreepart.cpp:66 msgid "Destination Folder" @@ -571,18 +275,229 @@ msgstr "Невідомо" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "Сюди можна ввести файли для порівняння." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Зберегти &все" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Зберегти .&diff..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "Не вдалось звантажити URL %1." + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Адреси URL %1 у вашій системі не існує." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Параметри diff" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Файли латок" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Зберегти .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 "Файл існує" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Запуск diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Розбір виводу diff..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Порівнюється файл %1 з файлом %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Порівнюються файли в %1 з файлами в %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Перегляд виводу diff з %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Змішування виводу diff з %1 у файл %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Змішування виводу diff %1 у теку %2" + +#: 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 "" +"Ви зробили зміни до файла(-ів) призначення.\n" +"Хочете їх зберегти?" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "" +"Немає файлf diff або не було порівняно 2 файли. Отже, статистика недоступна." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Статистика diff" + +#: 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 "" +"Статистика:\n" +"\n" +"Старий файл: %1\n" +"Новий файл: %2\n" +"\n" +"Формат: %3\n" +"Кількість не змінених: %4\n" +"Кількість відмінностей: %5" + +#: 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 "" +"Статистика:\n" +"\n" +"Кількість файлів у файлі відмінностей: %1\n" +"Формат: %2\n" +"\n" +"Поточний старий файл: %3\n" +"Поточний новий файл: %4\n" +"\n" +"Кількість не змінених: %5\n" +"Кількість відмінностей: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Вподобання" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Перегляд тексту" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Параметри перегляду" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Відмінності" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Параметри відмінностей" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Файли" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Сюди можна ввести файли для порівняння." + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "Тут можна змінити параметри для порівняння файлів." +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Ви&гляд" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "Тут можна змінити параметри для перегляду." @@ -597,9 +512,9 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Тут можна вибрати іншу програму diff. На ОС Solaris стандартна програма diff не " -"підтримує всіх параметрів програми версії GNU. Так ви можете вибрати необхідну " -"версію." +"Тут можна вибрати іншу програму diff. На ОС Solaris стандартна програма diff " +"не підтримує всіх параметрів програми версії GNU. Так ви можете вибрати " +"необхідну версію." #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -611,18 +526,24 @@ msgstr "Формат виводу" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" "Виберіть формат виводу, що створюється програмою diff. Найчастіше " -"використовується \"об'єднаний\", оскільки він легко читається. Розробники TDE " -"надають перевагу цьому формату, отже використовуйте його для надсилання латок." +"використовується \"об'єднаний\", оскільки він легко читається. Розробники " +"TDE надають перевагу цьому формату, отже використовуйте його для надсилання " +"латок." #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Рядки контексту" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Кількість рядків контексту:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -746,16 +667,16 @@ msgstr "Шаблон файла для виключення" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" -"Якщо увімкнено, ви зможете ввести шаблон оболонки в текстове поле праворуч або " -"вибрати зі списку." +"Якщо увімкнено, ви зможете ввести шаблон оболонки в текстове поле праворуч " +"або вибрати зі списку." #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Тут можна ввести або видалити шаблон оболонки або вибрати один чи більше зі " "списку." @@ -772,19 +693,19 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Сюди можна ввести адресу URL файла з шаблонами оболонки, які необхідно " "ігнорувати під час порівняння тек." #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" -"Файли, які ви вибираєте у вікні, що з'являється при клацанні, будуть показані у " -"вікні ліворуч від цієї кнопки." +"Файли, які ви вибираєте у вікні, що з'являється при клацанні, будуть " +"показані у вікні ліворуч від цієї кнопки." #: libdialogpages/diffpage.cpp:352 msgid "&Exclude" @@ -850,167 +771,276 @@ msgstr "Шрифт:" msgid "Size:" msgstr "Розмір:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Вподобання" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Шрифт:" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Параметри перегляду" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Застосувати різницю" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Параметри відмінностей" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Відмінити різницю" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Зберегти &все" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Застос&увати все" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Зберегти .&diff..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +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 "The URL %1 cannot be downloaded." -msgstr "Не вдалось звантажити URL %1." - -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Адреси URL %1 у вашій системі не існує." +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&опередній фал" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Параметри diff" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Наступний файл" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Файли латок" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Поп&ередня різниця" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Зберегти .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "На&ступна різниця" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." msgstr "" -"Файл існує або в нього заборонено записувати. Хочете його перезаписати?" +"Немає моделей або відмінностей. Файл: %1 не є чинним файлом " +"формату diff." -#: 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 "Не перезаписувати" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "" +"Виникли проблеми під час застосування diff %1 до файла %2." +"" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "" +"Виникли проблеми під час застосування diff %1 до теки%2." -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Запуск diff..." +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Не вдалось відкрити тимчасовий файл." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Розбір виводу diff..." +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Не вдалось записати до тимчасового файла %1, його буде видалено." -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Порівнюється файл %1 з файлом %2" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Не вдалось створити каталог призначення %1.\n" +"Файл не було збережено." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Порівнюються файли в %1 з файлами в %2" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"Не вдалось вивантажити тимчасовий файл по адресі призначення%1. " +"Тимчасовий файл ще доступний під: %2. Можна його вручну скопіювати у " +"потрібне місце." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Перегляд виводу diff з %1" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Не вдалося проаналізувати вивід diff." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Змішування виводу diff з %1 у файл %2" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Ці файли однакові." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Змішування виводу diff %1 у теку %2" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Помилка запису в тимчасовий файл." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:33 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"A program to view the differences between files and optionally generate a " +"diff" msgstr "" -"Ви зробили зміни до файла(-ів) призначення.\n" -"Хочете їх зберегти?" +"Програма для перегляду відмінностей між файлами і, додатково, створення " +"файла різниці" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Зберегти зміни?" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Буде порівняно URL1 з URL2" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:40 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"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 "" -"Немає файлf diff або не було порівняно 2 файли. Отже, статистика недоступна." +"Відкриє URL1, сподіваючись, що це вивід diff. URL1 також може бути \"-\" і " +"тоді воно буде читатись із стандартного вводу. Можна використовувати, " +"наприклад, у cvs diff | kompare -o -. Kompare перевірить чи можливо знайти " +"оригінальний файл(и), а тоді змішає оригінальний файл(и) з виводом diff і " +"покаже його у переглядачі. -n відміняє перевірку." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика diff" +#: 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 "" +"Цим змішується URL2 з URL1, URL2 має бути виводом diff, а URL1 -- файлом або " +"текою у який(у) необхідно змішати вивід diff. " -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Статистика:\n" -"\n" -"Старий файл: %1\n" -"Новий файл: %2\n" -"\n" -"Формат: %3\n" -"Кількість не змінених: %4\n" -"Кількість відмінностей: %5" +"Вимикає перевірку автоматичного пошуку оригінальних файлів при використанні " +"\"-\" як адресу URL з параметром -o." -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 і Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Автор" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Намалював піктограму Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Багато добрих порад" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Перегляд відмінностей в Cervisia" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Порівняти ці файли або теки" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Файли" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Різниця" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Параметри перегляду" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "Запустити Diff в" + +#: 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 "cd dir && diff -udHprNa -- джерело призначення" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, 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 "" -"Статистика:\n" -"\n" -"Кількість файлів у файлі відмінностей: %1\n" -"Формат: %2\n" -"\n" -"Поточний старий файл: %3\n" -"Поточний новий файл: %4\n" -"\n" -"Кількість не змінених: %5\n" -"Кількість відмінностей: %6" diff --git a/tde-i18n-zh_CN/messages/tdesdk/kompare.po b/tde-i18n-zh_CN/messages/tdesdk/kompare.po index f755e5ca7d0..d195a31fabe 100644 --- a/tde-i18n-zh_CN/messages/tdesdk/kompare.po +++ b/tde-i18n-zh_CN/messages/tdesdk/kompare.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "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: 2005-12-10 11:24+0800\n" "Last-Translator: Levin Du \n" "Language-Team: zh_CN \n" @@ -17,314 +17,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "应用差异(&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "不应用差异(&A)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "全部应用(&L)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "全部不应用(&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "上一个文件(&R)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "下一个文件(&E)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "上一处差异(&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "下一处差异(&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "没有模型(model)或比较结果，此文件：%1不是合法的 diff 文件。" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "应用 diff 结果%1到文件%2时出现问题。" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "应用 diff 结果%1到文件夹%2时出现问题。" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "无法打开临时文件。" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "无法写入临时文件%1，将删除该文件。" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "" -"无法创建目标目录 %1。\n" -"文件未保存。" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "无法上传临时文件到目标位置%1。在%2下的临时文件仍然可用，可以手工复制到正确的地方。" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "无法分析 diff 输出。" - -#: 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 "差异(&D)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "运行 diff 在" - -#. 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 "cd 目录 && diff -udHprNa -- 源 目标" - -#. 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 "Ed" - -#. 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 "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 "本程序查看文件间的差异，并可以生成 diff 结果" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "这将比较 URL1 和 URL2" - -#: 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 "" -"这将打开 URL1，并假定其为 diff 结果。URL1 亦可以是“-”，表示从标准输入读取，应用例子为“cvs diff | kompare -o " -"-”。Kompare 会检查能否找到原始文件，然后合并原始文件并将结果显示在查看器中，“-n”选项关闭此检查。" - -#: 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 "这将合并 URL2 到 URL1，URL2 应为 diff 结果而 URL1 则是要被合并的文件或文件夹。" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "当使用“-o”选项且 URL 为“-”时，不自动检查原始文件的存在。" - -#: 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 和 Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "作者" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare 图标制作者" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "许多好建议" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff 查看器" - -#: 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 "" -"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n" -"按下它，将开始比较所输入的文件或文件夹。" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -422,19 +121,45 @@ msgstr "合并 diff 输出到此文件或文件夹" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮可以使用。单击此按钮后，将打开 kompare " -"的主视图，输入的文件或文件夹中的文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。" +"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮" +"可以使用。单击此按钮后，将打开 kompare 的主视图，输入的文件或文件夹中的文件将" +"会与 diff 输出混合，这样您就可以将差异应用到文件了。" + +#: 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 "比较" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "比较这些文件或文件夹" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n" +"按下它，将开始比较所输入的文件或文件夹。" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "文本视图" @@ -518,18 +243,227 @@ msgstr "未知" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "您可以在此输入您想要比较的文件。" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "全部保存(&A)" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "保存.diff 文件(&D)..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "URL %1 无法下载。" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 在您的系统上不存在。" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff 选项" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|补丁文件" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "保存 .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 "文件已存在" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "运行 diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "分析 diff 输出..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "正在比较文件 %1 和 %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "正在比较 %1 和 %2 中的文件" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "查看 %1 的 diff 结果" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "合并 %1 的 diff 结果到文件 %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "合并 %1 的 diff 结果到文件夹 %2" + +#: 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 "" +"目标文件已经修改,\n" +"要保存吗？" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff 统计" + +#: 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 "" +"统计：\n" +"\n" +"旧文件：%1\n" +"新文件：%2\n" +"\n" +"格式：%3\n" +"相同个数：%4\n" +"差异个数：%5" + +#: 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 "" +"统计：\n" +"\n" +"diff结果中的文件个数：%1\n" +"格式：%2\n" +"\n" +"当前旧文件：%3\n" +"当前新文件：%4\n" +"\n" +"相同个数：%5\n" +"差异个数：%6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "首选项" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "文本视图" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "查看设置" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff 设置" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "文件(&F)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "您可以在此输入您想要比较的文件。" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "您可以在此更改要比较文件的选项。" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "外观(&P)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "您可以在此更改视图选项。" @@ -544,7 +478,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"在此可以选择另外一个 diff 程序。在 Solaris 上，标准 diff 程序不支持 GNU 版本的所有选项，因此可以选择 GNU 版本。" +"在此可以选择另外一个 diff 程序。在 Solaris 上，标准 diff 程序不支持 GNU 版本" +"的所有选项，因此可以选择 GNU 版本。" #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -556,21 +491,30 @@ msgstr "输出格式" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." -msgstr "选择 diff 产生结果的格式。统一(unified)是种经常使用的格式，它非常容易阅读，因此 TDE 开发者发送补丁时最喜欢这种格式。" +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." +msgstr "" +"选择 diff 产生结果的格式。统一(unified)是种经常使用的格式，它非常容易阅读，因" +"此 TDE 开发者发送补丁时最喜欢这种格式。" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "上下文行数" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "上下文行数：" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." -msgstr "上下文的行数通常是 2 或 3，这样使得 diff 容易阅读，且能应用于大多数场合。多于 3 行一般是不需要的。" +msgstr "" +"上下文的行数通常是 2 或 3，这样使得 diff 容易阅读，且能应用于大多数场合。多" +"于 3 行一般是不需要的。" #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -684,14 +628,14 @@ msgstr "要排除的文件模式" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "如果选上，可以在右边文本框输入 shell 模式或从列表中选择。" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "这里可以输入或删除 shell 模式或从列表中选择一个或多个模式。" #: libdialogpages/diffpage.cpp:338 @@ -705,14 +649,14 @@ msgstr "如果选上，可以在右边的组合框输入文件名。" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "这里可以输入在文件夹比较时要忽略的文件的 URL，该 URL 含有 shell 模式。" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "任何在弹出的对话框中点击选择的文件将会放入此按钮左边的对话框中。" #: libdialogpages/diffpage.cpp:352 @@ -779,165 +723,261 @@ msgstr "字体：" msgid "Size:" msgstr "大小：" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "首选项" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "字体：" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "查看设置" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "应用差异(&A)" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff 设置" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "不应用差异(&A)" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "全部保存(&A)" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "全部应用(&L)" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "保存.diff 文件(&D)..." +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "全部不应用(&U)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "交换源文件和目标文件" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "上一个文件(&R)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "显示统计信息" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "下一个文件(&E)" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 无法下载。" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "上一处差异(&P)" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 在您的系统上不存在。" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "下一处差异(&N)" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff 选项" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +"没有模型(model)或比较结果，此文件：%1不是合法的 diff 文件。" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|补丁文件" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "应用 diff 结果%1到文件%2时出现问题。" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "保存 .diff 文件" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "应用 diff 结果%1到文件夹%2时出现问题。" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "文件已经存在或有写保护，要覆盖吗？" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "无法打开临时文件。" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "文件已存在" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "无法写入临时文件%1，将删除该文件。" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "覆盖" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"无法创建目标目录 %1。\n" +"文件未保存。" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "不覆盖" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"无法上传临时文件到目标位置%1。在%2下的临时文件仍然可用，可" +"以手工复制到正确的地方。" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "无法分析 diff 输出。" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "运行 diff..." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "文件是相同的。" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "分析 diff 输出..." +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "无法写入临时文件。" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "正在比较文件 %1 和 %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "本程序查看文件间的差异，并可以生成 diff 结果" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "正在比较 %1 和 %2 中的文件" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "这将比较 URL1 和 URL2" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "查看 %1 的 diff 结果" +#: 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 "" +"这将打开 URL1，并假定其为 diff 结果。URL1 亦可以是“-”，表示从标准输入读取，应" +"用例子为“cvs diff | kompare -o -”。Kompare 会检查能否找到原始文件，然后合并原" +"始文件并将结果显示在查看器中，“-n”选项关闭此检查。" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "合并 %1 的 diff 结果到文件 %2" +#: main.cpp:41 +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 " +"the file or folder that the diffoutput needs to be blended into. " +msgstr "" +"这将合并 URL2 到 URL1，URL2 应为 diff 结果而 URL1 则是要被合并的文件或文件" +"夹。" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "合并 %1 的 diff 结果到文件夹 %2" +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "当使用“-o”选项且 URL 为“-”时，不自动检查原始文件的存在。" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:43 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -"目标文件已经修改,\n" -"要保存吗？" +"使用此处指定从命令行调用时所用的编码。如果未指定，则默认为系统的本地编码。" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "保存修改？" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh 和 Otto Bruggeman" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff 统计" +#: main.cpp:55 main.cpp:56 +msgid "Author" +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 "" -"统计：\n" -"\n" -"旧文件：%1\n" -"新文件：%2\n" -"\n" -"格式：%3\n" -"相同个数：%4\n" -"差异个数：%5" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare 图标制作者" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "许多好建议" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff 查看器" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "比较这些文件或文件夹" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "文件(&F)" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "差异(&D)" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "查看设置" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "运行 diff 在" + +#: 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 "cd 目录 && diff -udHprNa -- 源 目标" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "选项(&P)" + +#: 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 "" -"统计：\n" -"\n" -"diff结果中的文件个数：%1\n" -"格式：%2\n" -"\n" -"当前旧文件：%3\n" -"当前新文件：%4\n" -"\n" -"相同个数：%5\n" -"差异个数：%6" diff --git a/tde-i18n-zh_TW/messages/tdesdk/kompare.po b/tde-i18n-zh_TW/messages/tdesdk/kompare.po index 29b33de3e6e..678b8290df6 100644 --- a/tde-i18n-zh_TW/messages/tdesdk/kompare.po +++ b/tde-i18n-zh_TW/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "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: 2006-06-20 15:31+0800\n" "Last-Translator: Frank Weng (a.k.a. Franklin) \n" @@ -15,310 +15,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "套用差異處(&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "取消套用差異處(&A)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "全部套用(&L)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "全部取消套用(&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "上一個檔案(&R)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "下一個檔案(&E)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "上一個差異(&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "下一個差異(&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "檔案 %1 不是合法的 diff 檔，沒有任何模式或差異處。" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "套用 %1到檔案 %2 時發生問題。" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "套用 %1到資料夾 %2 時發生問題。" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "無法開啟暫存檔。" - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." -msgstr "無法寫入暫存檔 %1，暫存檔將被刪除。" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." -msgstr "無法建立目標資料夾 %1。檔案尚未儲存。" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." -msgstr "無法將暫存檔上傳到目標位置 %1。暫存檔仍然在 %2。您可以手動複製到正確的地方。" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "無法分析 diff 輸出。" - -#: 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 "差異(&D)" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "執行 Diff 於" - -#. 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 "cd dir && diff -udHprNa -- source destination" - -#. 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 "將 tab 展開為空白" - -#. 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 "Ed" - -#. 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 "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 "這會比較 URL1 與 URL2" - -#: 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 "" -"這會開啟 URL1，它應該是 diff 的輸出。URL1 也可以是 '-'，這種狀況下它會從標準輸入讀取。它可以這樣用：cvs diff | compare " -"-o -。Kompare 會檢查是否可以找到原始檔，並套用 diff 輸出，再顯示在檢視器內。 -n 關閉此檢查。" - -#: 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 "這會將 URL2 套用到 URL1。URL2 應該是 diff 的輸出，URL1 則是要套用的檔案或資料夾。" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "在使用 '-' 為讀取的 URL，並與 -o 一起使用時，關閉自動尋找原始檔案的檢查。" - -#: 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 與 Otto Bruggeman" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "作者" - -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare 圖示製作" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "許多好點子" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff 檢視器" - -#: 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 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Frank Weng (a.k.a. Franklin)" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -416,19 +119,45 @@ msgstr "對此檔案或資料夾套用 diff 輸出" #: kompare_shell.cpp:373 msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"If you have entered a file or folder name and a file that contains diff " +"output in the fields in this dialog then this button will be enabled and " +"pressing it will open kompare's main view where the output of the entered " +"file or files from the folder are mixed with the diff output so you can then " +"apply the difference(s) to a file or to the files. " msgstr "" -"如果您在此對話框中輸入一個檔案或資料夾名稱，以及包含 diff 輸出的檔案，按下此鍵會開啟 Kompare 的主檢視視窗，讓您檢視此 diff " -"輸出套用到指定的檔案或資料夾後的結果。" +"如果您在此對話框中輸入一個檔案或資料夾名稱，以及包含 diff 輸出的檔案，按下此" +"鍵會開啟 Kompare 的主檢視視窗，讓您檢視此 diff 輸出套用到指定的檔案或資料夾後" +"的結果。" + +#: 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 "比較" #: kompare_shell.cpp:402 msgid "Compare these files or folders" msgstr "比較這些檔案或資料夾" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog " +"then this button will be enabled and pressing it will start a comparison of " +"the entered files or folders. " +msgstr "" +"如果您在此對話框的欄位中輸入了兩個檔名或兩個資料夾，按下這個按鈕就會開始比" +"較。" + #: kompare_shell.cpp:439 msgid "Text View" msgstr "文字檢視" @@ -512,18 +241,227 @@ msgstr "未知" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "您可以在此輸入要比較的檔案。" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "全部儲存(&A)" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "儲存 .diff(&D)..." + +#: 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 "The URL %1 cannot be downloaded." +msgstr "無法下載 URL %1。" + +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 不存在於您的系統中。" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff 選項" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|修補檔案" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "儲存 .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 "檔案已存在" + +#: 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" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "執行 diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "分析 diff 輸出..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "比較檔案 %1 與檔案 %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "比較在 %1 中的檔案與在 %2 中的檔案" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "檢視從 %1 的 diff 的輸出" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "將從 %1 出來的 diff 輸出套入檔案 %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "將從 %1 出來的 diff 輸出套入資料夾 %2" + +#: 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 "" +"您已修改目的檔。\n" +"要儲存嗎？" + +#: 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 "RCS" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "Ed" + +#: 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 "沒有 diff 檔，或沒有兩個檔案可比較。因此無法統計。" + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff 統計" + +#: 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 "" +"統計：\n" +"\n" +"舊檔：%1\n" +"相檔：%2\n" +"\n" +"格式：%3\n" +"區塊數量：%4\n" +"差異數量：%5" + +#: 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 "" +"統計：\n" +"\n" +"diff 檔中的檔案數量：%1\n" +"格式：%2\n" +"\n" +"目前的舊檔：%3\n" +"目前的新檔：%4\n" +"\n" +"區塊數量：%5\n" +"差異數量：%6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "喜好設定" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "文字檢視" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "顯示設定" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff 設定" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "檔案(&F)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "您可以在此輸入要比較的檔案。" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "您可以在此改變比較檔案的選項。" +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "外觀(&P)" + #: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "您可以在此改變檢視的選項。" @@ -538,7 +476,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"您可以選擇不同的 diff 程式。在 Solaris 上標準的 diff 程式，支援選項沒有像 GNU 版本那麼多。您可以在此選擇其他的版本。" +"您可以選擇不同的 diff 程式。在 Solaris 上標準的 diff 程式，支援選項沒有像 " +"GNU 版本那麼多。您可以在此選擇其他的版本。" #: libdialogpages/diffpage.cpp:221 msgid "&Diff" @@ -550,22 +489,30 @@ msgstr "輸出格式" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"選擇 diff 輸出的格式。「統一」（Unified）是最常用的，因為可讀性很高。TDE 開發團隊最喜歡用這個格式，所以要傳送修補檔用這個格式最好。" +"選擇 diff 輸出的格式。「統一」（Unified）是最常用的，因為可讀性很高。TDE 開發" +"團隊最喜歡用這個格式，所以要傳送修補檔用這個格式最好。" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "內容行數" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "內容的行數：" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." -msgstr "內容行數通常是 2 或 3。這會提高 diff 輸出的可讀性，並且在大部份狀況都可使用。三行以上只會讓 diff 輸出產生不必要的膨脹。" +msgstr "" +"內容行數通常是 2 或 3。這會提高 diff 輸出的可讀性，並且在大部份狀況都可使用。" +"三行以上只會讓 diff 輸出產生不必要的膨脹。" #: libdialogpages/diffpage.cpp:259 msgid "&Format" @@ -677,14 +624,15 @@ msgstr "要排除的檔案樣式" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." -msgstr "勾選此選項的話，您可以在右方文字欄內輸入一個文稿樣式，或是從清單中選擇。" +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." +msgstr "" +"勾選此選項的話，您可以在右方文字欄內輸入一個文稿樣式，或是從清單中選擇。" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "您可以在此輸入或移除文稿樣式，或是從清單中選擇樣式。" #: libdialogpages/diffpage.cpp:338 @@ -698,14 +646,14 @@ msgstr "勾選此選項的話，您可以在右方的選單中輸入檔名。" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "您可以在此輸入檔案路徑，檔案中含有在比較資料夾時要忽略的文稿樣式。" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "您在此對話框中所選擇的任何檔案將會被放到左方的對話框中。" #: libdialogpages/diffpage.cpp:352 @@ -772,165 +720,258 @@ msgstr "字型：" msgid "Size:" msgstr "大小：" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "喜好設定" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "顯示設定" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Diff 設定" - -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "全部儲存(&A)" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "字型：" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "儲存 .diff(&D)..." +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "套用差異處(&A)" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "將來源與目的地交換" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "取消套用差異處(&A)" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "顯示統計" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "全部套用(&L)" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "無法下載 URL %1。" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "全部取消套用(&U)" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 不存在於您的系統中。" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "上一個檔案(&R)" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff 選項" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "下一個檔案(&E)" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|修補檔案" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "上一個差異(&P)" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "儲存 .diff" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "下一個差異(&N)" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "檔案已存在，或是有寫入保護。您確定要覆寫它嗎？" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "檔案 %1 不是合法的 diff 檔，沒有任何模式或差異處。" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "檔案已存在" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "套用 %1到檔案 %2 時發生問題。" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "覆寫" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr "套用 %1到資料夾 %2 時發生問題。" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "不要覆寫" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "無法開啟暫存檔。" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "無法寫入暫存檔 %1，暫存檔將被刪除。" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "執行 diff..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "無法建立目標資料夾 %1。檔案尚未儲存。" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "分析 diff 輸出..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." +msgstr "" +"無法將暫存檔上傳到目標位置 %1。暫存檔仍然在 %2。您可以手動" +"複製到正確的地方。" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "比較檔案 %1 與檔案 %2" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "無法分析 diff 輸出。" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "比較在 %1 中的檔案與在 %2 中的檔案" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "檔案完全相同。" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "檢視從 %1 的 diff 的輸出" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "無法寫入暫存檔。" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "將從 %1 出來的 diff 輸出套入檔案 %2" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "檢視檔案間的不同，還有產生修補檔的程式。" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "將從 %1 出來的 diff 輸出套入資料夾 %2" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "這會比較 URL1 與 URL2" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:40 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"您已修改目的檔。\n" -"要儲存嗎？" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "儲存修改？" +"這會開啟 URL1，它應該是 diff 的輸出。URL1 也可以是 '-'，這種狀況下它會從標準" +"輸入讀取。它可以這樣用：cvs diff | compare -o -。Kompare 會檢查是否可以找到原" +"始檔，並套用 diff 輸出，再顯示在檢視器內。 -n 關閉此檢查。" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:41 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "沒有 diff 檔，或沒有兩個檔案可比較。因此無法統計。" - -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff 統計" +"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 "" +"這會將 URL2 套用到 URL1。URL2 應該是 diff 的輸出，URL1 則是要套用的檔案或資料" +"夾。" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:42 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" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"統計：\n" -"\n" -"舊檔：%1\n" -"相檔：%2\n" -"\n" -"格式：%3\n" -"區塊數量：%4\n" -"差異數量：%5" +"在使用 '-' 為讀取的 URL，並與 -o 一起使用時，關閉自動尋找原始檔案的檢查。" -#: komparepart/kompare_part.cpp:686 +#: main.cpp:43 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" +"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 與 Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "作者" + +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare 圖示製作" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "許多好點子" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff 檢視器" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "比較這些檔案或資料夾" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "檔案(&F)" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "差異(&D)" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "顯示設定" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "執行 Diff 於" + +#: 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 "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "選項(&P)" + +#: 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 "將 tab 展開為空白" + +#: 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 "" -"統計：\n" -"\n" -"diff 檔中的檔案數量：%1\n" -"格式：%2\n" -"\n" -"目前的舊檔：%3\n" -"目前的新檔：%4\n" -"\n" -"區塊數量：%5\n" -"差異數量：%6"