diff options
Diffstat (limited to 'tde-i18n-pa/messages/tdesdk')
| -rw-r--r-- | tde-i18n-pa/messages/tdesdk/kompare.po | 913 |
1 files changed, 470 insertions, 443 deletions
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 <aalam@users.sf.net>\n" "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\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 "" -"<qt>No models or no differences, this file: <b>%1</b>" -", is not a valid diff file.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:246 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:271 -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>" -".</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "ਇੱਕ ਆਰਜ਼ੀ ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" - -#: libdiff2/komparemodellist.cpp:350 -msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"<qt>Could not create destination directory <b>%1</b>.\n" -"The file has not been saved.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"<qt>Could not upload the temporary file to the destination location <b>%1</b>" -". The temporary file is still available under: <b>%2</b>" -". You can manually copy it to the right place.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "ਫਾਇਲਾਂ ਇੱਕੋ ਜਿਹੀਆਂ ਹੀ ਹਨ।" - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "ਅੰਤਰ(&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,19 +250,226 @@ 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 "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "" + +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "ਅੰਤਰ ਚੋਣਾਂ" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.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 "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "ਸਭ ਲਾਗੂ ਵਾਪਸ(&U)" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -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 "" +"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " +"file.</qt>" msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" +#: libdiff2/komparemodellist.cpp:246 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" +"qt>" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "ਉੱਪਰ ਲਿਖੋ" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." +"</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "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 "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..." +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"<qt>Could not create destination directory <b>%1</b>.\n" +"The file has not been saved.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"<qt>Could not upload the temporary file to the destination location <b>%1</" +"b>. The temporary file is still available under: <b>%2</b>. You can manually " +"copy it to the right place.</qt>" msgstr "" -#: komparepart/kompare_part.cpp: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" |