diff options
Diffstat (limited to 'tde-i18n-pa/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-pa/messages/tdesdk/kompare.po | 924 |
1 files changed, 462 insertions, 462 deletions
diff --git a/tde-i18n-pa/messages/tdesdk/kompare.po b/tde-i18n-pa/messages/tdesdk/kompare.po index 311feeb721e..b9b8a899944 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 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\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,101 +17,6 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "aalam@redhat.com,aalam@users.sf.net" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "ਸਰੋਤ ਫੋਲਡਰ" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "ਨਿਯਤ ਫੋਲਡਰ" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "ਸਰੋਤ ਫਾਇਲ" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "ਨਿਯਤ ਫਾਇਲ" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "ਸਰੋਤ ਸਤਰ" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "ਨਿਯਤ ਸਤਰ" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "ਅੰਤਰ" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "" -"%n ਸਤਰ ਸ਼ਾਮਿਲ ਕੀਤੀ\n" -"%n ਸਤਰ ਸ਼ਾਮਿਲ ਕੀਤੀਆਂ" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"%n ਸਤਰ ਹਟਾਈ\n" -"%n ਸਤਰਾਂ ਹਟਾਈਆਂ" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "ਅਣਜਾਣ" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "ਅੰਤਰ ਲਾਗੂ(&A)" @@ -194,160 +99,6 @@ msgstr "ਫਾਇਲਾਂ ਇੱਕੋ ਜਿਹੀਆਂ ਹੀ ਹਨ।" msgid "Could not write to the temporary file." msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "ਸਾਡਾ KompareViewPart ਨਹੀਂ ਮਿਲ ਸਕਿਆ ਹੈ।" - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "ਸਾਡਾ KompareViewPart ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "ਸਾਡਾ KompareNavigationPart ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।" - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "ਸਾਡਾ KompareNavigationPart ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" - -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "ਅੰਤਰ ਖੋਲੋ(&O)..." - -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "ਫਾਇਲ ਤੁਲਨਾ(&C)..." - -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "ਅੰਤਰ ਨਾਲ URL ਰਲਾਓ(&B)..." - -#: kompare_shell.cpp:246 -msgid "Show T&ext View" -msgstr "ਪਾਠ ਵੇਖਣ ਵੇਖਾਓ(&e)" - -#: kompare_shell.cpp:248 -msgid "Hide T&ext View" -msgstr "ਪਾਠ ਵੇਖਣ ਓਹਲੇ(&e)" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr "0 ਵਿੱਚੋਂ 0 ਅੰਤਰ " - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr "0 ਵਿੱਚੋਂ 0 ਫਾਇਲਾਂ " - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -" %n ਵਿੱਚੋਂ %1 ਫਾਇਲ \n" -" %n ਫਾਇਲਾਂ ਵਿੱਚੋਂ %1 " - -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n ਫਾਇਲ \n" -" %n ਫਾਇਲਾਂ " - -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -"%n ਅੰਤਰ ਵਿੱਚੋਂ %1, %2 ਲਾਗੂ \n" -"%n ਅੰਤਰਾਂ ਵਿੱਚੋਂ %1, %2 ਲਾਗੂ " - -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n ਅੰਤਰ \n" -" %n ਅੰਤਰ " - -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "ਫਾਇਲ/ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ" - -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "ਫਾਇਲ/ਫੋਲਡਰ" - -#: kompare_shell.cpp:371 -msgid "Diff Output" -msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "ਘੋਲੋ" - -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" -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. " -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 "ਪਾਠ ਝਲਕ" - -#: 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 -msgid "Here you can change the options for the view." -msgstr "ਇੱਥੇ ਤੁਸੀਂ ਵੇਖਣ ਸਬੰਧੀ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।" - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -474,226 +225,320 @@ msgstr "ਨਾਲੋ ਨਾਲ" msgid "Number of context lines:" msgstr "ਪਰਸੰਗ ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "ਮੇਰੀ ਪਸੰਦ" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"ਇੱਕ ਪਰੋਗਰਾਮ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਫਾਇਲਾਂ ਵਿੱਚ ਅੰਤਰ ਵੇਖਾ ਸਕਦਾ ਹੈ ਅਤੇ ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ " +"ਅੰਤਰ ਤਿਆਰ ਕਰ ਸਕਦਾ ਹੈ।" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "ਵੇਖਣ ਸਥਾਪਨ" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -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 "" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "ਸਭ ਚੁਣੋ(&A)" +#: 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:168 -msgid "Save .&diff..." -msgstr "ਅੰਤਰ ਸੰਭਾਲੋ(&d)..." +#: 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:171 -msgid "Swap Source with Destination" +#: 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:174 -msgid "Show Statistics" -msgstr "ਅੰਕੜੇ ਵੇਖਾਓ" +#: main.cpp:52 +msgid "Kompare" +msgstr "ਕੇ-ਅੰਤਰ" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh ਅਤੇ Otto Bruggeman" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "ਲੇਖਕ" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "ਅੰਤਰ ਚੋਣਾਂ" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "ਕੇ-ਤੁਲਨਾ ਆਈਕਾਨ ਕਲਾਕਾਰ" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|ਪੈਂਚ ਫਾਇਲਾਂ" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "ਕਾਫ਼ੀ ਚੰਗੀਆਂ ਸਲਾਹਾਂ" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr ".diff ਸੰਭਾਲੋ" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "ਸਰਵੀਸੀਆ diff ਦਰਸ਼ਕ" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: 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 "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "ਉੱਪਰ ਲਿਖੋ" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "aalam@redhat.com,aalam@users.sf.net" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "ਉੱਪਰ ਨਾ ਲਿਖੋ" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." +msgstr "ਸਾਡਾ KompareViewPart ਨਹੀਂ ਮਿਲ ਸਕਿਆ ਹੈ।" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." +msgstr "ਸਾਡਾ KompareViewPart ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..." +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "ਸਾਡਾ KompareNavigationPart ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "" +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "ਸਾਡਾ KompareNavigationPart ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "ਫਾਇਲ %1 ਦੀ ਫਾਇਲ %2 ਨਾਲ ਤੁਲਨਾ..." +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "ਅੰਤਰ ਖੋਲੋ(&O)..." -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "%1 ਵਿੱਚੋਂ ਫਾਇਲਾਂ ਦੀ %2 ਵਿਚਲੀਆਂ ਫਾਇਲਾਂ ਨਾਲ ਤੁਲਨਾ" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "ਫਾਇਲ ਤੁਲਨਾ(&C)..." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 ਤੋਂ ਅੰਤਰ ਆਉਟਪੁੱਟ ਵੇਖੋ" +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." +msgstr "ਅੰਤਰ ਨਾਲ URL ਰਲਾਓ(&B)..." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "" +#: kompare_shell.cpp:246 +msgid "Show T&ext View" +msgstr "ਪਾਠ ਵੇਖਣ ਵੇਖਾਓ(&e)" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "" +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "ਪਾਠ ਵੇਖਣ ਓਹਲੇ(&e)" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "0 ਵਿੱਚੋਂ 0 ਅੰਤਰ " + +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr "0 ਵਿੱਚੋਂ 0 ਫਾਇਲਾਂ " + +#: kompare_shell.cpp:273 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" +" %n ਵਿੱਚੋਂ %1 ਫਾਇਲ \n" +" %n ਫਾਇਲਾਂ ਵਿੱਚੋਂ %1 " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਹਨ?" - -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:275 +#, c-format msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"_n: %n file \n" +" %n files " msgstr "" +" %n ਫਾਇਲ \n" +" %n ਫਾਇਲਾਂ " -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "ਅੰਤਰ ਅੰਕੜੇ" +#: kompare_shell.cpp:278 +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +"%n ਅੰਤਰ ਵਿੱਚੋਂ %1, %2 ਲਾਗੂ \n" +"%n ਅੰਤਰਾਂ ਵਿੱਚੋਂ %1, %2 ਲਾਗੂ " -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:281 +#, c-format 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" +"_n: %n difference \n" +" %n differences " msgstr "" -"ਅੰਕੜੇ:\n" -"\n" -"ਪੁਰਾਣੀ ਫਾਇਲ: %1\n" -"ਨਵੀਂ ਫਾਇਲ: %2\n" -"\n" -"ਫਾਰਮੈਟ: %3\n" -"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %4\n" -"ਅੰਤਰਾਂ ਦੀ ਗਿਣਤੀ: %5" +" %n ਅੰਤਰ \n" +" %n ਅੰਤਰ " -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "ਫਾਇਲ/ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ" + +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "ਫਾਇਲ/ਫੋਲਡਰ" + +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ" + +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "ਘੋਲੋ" + +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" +msgstr "ਇਸ ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ" + +#: kompare_shell.cpp:373 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" +"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 "" -"ਅੰਕੜੇ:\n" -"\n" -"ਅੰਤਰ ਫਾਇਲਾਂ ਵਿੱਚ ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ: %1\n" -"ਫਾਰਮੈਟ: %2\n" -"\n" -"ਮੌਜੂਦਾ ਪੁਰਾਣੀ ਫਾਇਲ: %3\n" -"ਮੌਜੂਦਾ ਨਵੀਂ ਫਾਇਲ: %4\n" -"\n" -"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %5\n" -"ਅੰਤਰਾਂ ਗਿਣਤੀ: %6" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "ਇਕੋਡਿੰਗ" +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "ਇਹ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "ਫਾਇਲਾਂ(&F)" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "ਪਾਠ ਝਲਕ" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "ਰੰਗ" +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "ਸਰੋਤ ਫੋਲਡਰ" -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "ਹਟਾਉਣ ਰੰਗ:" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "ਨਿਯਤ ਫੋਲਡਰ" -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "ਤਬਦੀਲੀ ਰੰਗ:" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "ਸਰੋਤ ਫਾਇਲ" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "ਜੋੜਨ ਰੰਗ:" +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "ਨਿਯਤ ਫਾਇਲ" -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "ਲਾਗੂ ਰੰਗ:" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "ਸਰੋਤ ਸਤਰ" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "ਮਾਊਸ ਪਹੀਆ" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "ਨਿਯਤ ਸਤਰ" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "ਅੰਤਰ" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" msgstr "" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" msgstr "" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "ਦਿੱਖ(&p)" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "ਪਾਠ ਫੋਂਟ" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"%n ਸਤਰ ਸ਼ਾਮਿਲ ਕੀਤੀ\n" +"%n ਸਤਰ ਸ਼ਾਮਿਲ ਕੀਤੀਆਂ" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "ਫੋਂਟ:" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr "" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "ਆਕਾਰ:" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"%n ਸਤਰ ਹਟਾਈ\n" +"%n ਸਤਰਾਂ ਹਟਾਈਆਂ" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "ਅਣਜਾਣ" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: 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 +msgid "Here you can change the options for the view." +msgstr "ਇੱਥੇ ਤੁਸੀਂ ਵੇਖਣ ਸਬੰਧੀ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।" #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" @@ -877,68 +722,223 @@ msgstr "" msgid "&Exclude" msgstr "ਅੱਡ ਰੱਖੋ(&E)" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "ਇਕੋਡਿੰਗ" + +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "ਫਾਇਲਾਂ(&F)" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "ਰੰਗ" + +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "ਹਟਾਉਣ ਰੰਗ:" + +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "ਤਬਦੀਲੀ ਰੰਗ:" + +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "ਜੋੜਨ ਰੰਗ:" + +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "ਲਾਗੂ ਰੰਗ:" + +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "ਮਾਊਸ ਪਹੀਆ" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:" + +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" msgstr "" -"ਇੱਕ ਪਰੋਗਰਾਮ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਫਾਇਲਾਂ ਵਿੱਚ ਅੰਤਰ ਵੇਖਾ ਸਕਦਾ ਹੈ ਅਤੇ ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ " -"ਅੰਤਰ ਤਿਆਰ ਕਰ ਸਕਦਾ ਹੈ।" -#: main.cpp:39 -msgid "This will compare URL1 with URL2" +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" 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." +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "ਦਿੱਖ(&p)" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "ਪਾਠ ਫੋਂਟ" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "ਫੋਂਟ:" + +#: libdialogpages/viewpage.cpp:112 +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)" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "ਅੰਤਰ ਸੰਭਾਲੋ(&d)..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" 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. " +#: 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 "" -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" 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." +#: 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 "" -#: main.cpp:52 -msgid "Kompare" -msgstr "ਕੇ-ਅੰਤਰ" +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh ਅਤੇ Otto Bruggeman" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "ਉੱਪਰ ਲਿਖੋ" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "ਲੇਖਕ" +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "ਉੱਪਰ ਨਾ ਲਿਖੋ" -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "ਕੇ-ਤੁਲਨਾ ਆਈਕਾਨ ਕਲਾਕਾਰ" +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "ਕਾਫ਼ੀ ਚੰਗੀਆਂ ਸਲਾਹਾਂ" +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..." -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "ਸਰਵੀਸੀਆ diff ਦਰਸ਼ਕ" +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "" -#: main.cpp:189 -msgid "Compare these files or folder" -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: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" |