|
|
|
|
# translation of kompare.po to Punjabi
|
|
|
|
|
#
|
|
|
|
|
# Amanpreet Singh Brar <aalam@redhat.com>, 2005.
|
|
|
|
|
# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
|
|
|
|
|
# A S Alam <aalam@users.sf.net>, 2007.
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: kompare\n"
|
|
|
|
|
"POT-Creation-Date: 2021-07-07 18:23+0000\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"
|
|
|
|
|
"Language: pa\n"
|
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
"X-Generator: KBabel 1.11.4\n"
|
|
|
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
|
|
|
|
|
|
|
|
|
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
|
|
|
|
|
msgid ""
|
|
|
|
|
"_: NAME OF TRANSLATORS\n"
|
|
|
|
|
"Your names"
|
|
|
|
|
msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
|
|
|
|
|
|
|
|
|
|
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
|
|
|
|
|
msgid ""
|
|
|
|
|
"_: EMAIL OF TRANSLATORS\n"
|
|
|
|
|
"Your emails"
|
|
|
|
|
msgstr "aalam@redhat.com,aalam@users.sf.net"
|
|
|
|
|
|
|
|
|
|
#: 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 "ਪਾਠ ਝਲਕ"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
|
|
|
|
|
#: 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
|
|
|
|
|
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
|
|
|
|
|
msgid "Here you can enter the files you want to compare."
|
|
|
|
|
msgstr "ਇੱਥੇ ਤੁਸੀਂ ਤੁਲਨਾ ਕਰਨ ਲਈ ਫਾਇਲਾਂ ਦੇ ਸਕਦੇ ਹੋ।"
|
|
|
|
|
|
|
|
|
|
#: kompareurldialog.cpp:47
|
|
|
|
|
msgid "Here you can change the options for comparing the files."
|
|
|
|
|
msgstr "ਇੱਥੇ ਤੁਸੀਂ ਤੁਲਨਾ ਕਰਨ ਵਾਲੀਆਂ ਫਾਇਲਾਂ ਲਈ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।"
|
|
|
|
|
|
|
|
|
|
#: kompareurldialog.cpp:53
|
|
|
|
|
msgid "Here you can change the options for the view."
|
|
|
|
|
msgstr "ਇੱਥੇ ਤੁਸੀਂ ਵੇਖਣ ਸਬੰਧੀ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:211
|
|
|
|
|
msgid "Diff Program"
|
|
|
|
|
msgstr "ਅੰਤਰ ਪਰੋਗਰਾਮ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:216
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can select a different diff program here. On Solaris the standard diff "
|
|
|
|
|
"program does not support all the options that the GNU version does. This way "
|
|
|
|
|
"you can select that version."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:221
|
|
|
|
|
msgid "&Diff"
|
|
|
|
|
msgstr "ਅੰਤਰ(&Diff)"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:232
|
|
|
|
|
msgid "Output Format"
|
|
|
|
|
msgstr "ਆਉਟਪੁੱਟ ਫਾਰਮਿਟ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:233
|
|
|
|
|
msgid ""
|
|
|
|
|
"Select the format of the output generated by diff. Unified is the one that "
|
|
|
|
|
"is used most frequently because it is very readable. The TDE developers like "
|
|
|
|
|
"this format the best so use it for sending patches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:247
|
|
|
|
|
msgid "Lines of Context"
|
|
|
|
|
msgstr "ਪਰਸੰਗ ਦੀਆਂ ਸਤਰਾਂ"
|
|
|
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
msgstr "ਫਾਰਮਿਟ(&F)"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:270
|
|
|
|
|
msgid "General"
|
|
|
|
|
msgstr "ਸਧਾਰਨ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:274
|
|
|
|
|
msgid "&Look for smaller changes"
|
|
|
|
|
msgstr "ਛੋਟੀਆਂ ਤਬਦੀਲੀਆਂ ਲਈ ਖੋਜ(&L)"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:275
|
|
|
|
|
msgid "This corresponds to the -d diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:276
|
|
|
|
|
msgid "O&ptimize for large files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:277
|
|
|
|
|
msgid "This corresponds to the -H diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:278
|
|
|
|
|
msgid "&Ignore changes in case"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:279
|
|
|
|
|
msgid "This corresponds to the -i diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:284
|
|
|
|
|
msgid "Ignore regexp:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:285
|
|
|
|
|
msgid "This option corresponds to the -I diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:288
|
|
|
|
|
msgid ""
|
|
|
|
|
"Add the regular expression here that you want to use\n"
|
|
|
|
|
"to ignore lines that match it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:294
|
|
|
|
|
msgid "&Edit..."
|
|
|
|
|
msgstr "ਸੋਧ(&E)..."
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:295
|
|
|
|
|
msgid ""
|
|
|
|
|
"Clicking this will open a regular expression dialog where\n"
|
|
|
|
|
"you can graphically create regular expressions."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:300
|
|
|
|
|
msgid "Whitespace"
|
|
|
|
|
msgstr "ਖਾਲੀ ਥਾਂ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:304
|
|
|
|
|
msgid "E&xpand tabs to spaces in output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:305
|
|
|
|
|
msgid "This option corresponds to the -t diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:306
|
|
|
|
|
msgid "I&gnore added or removed empty lines"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:307
|
|
|
|
|
msgid "This option corresponds to the -B diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:308
|
|
|
|
|
msgid "Ig&nore changes in the amount of whitespace"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:309
|
|
|
|
|
msgid "This option corresponds to the -b diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:310
|
|
|
|
|
msgid "Ign&ore all whitespace"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:311
|
|
|
|
|
msgid "This option corresponds to the -w diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:312
|
|
|
|
|
msgid "Igno&re changes due to tab expansion"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:313
|
|
|
|
|
msgid "This option corresponds to the -E diff option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:318
|
|
|
|
|
msgid "O&ptions"
|
|
|
|
|
msgstr "ਚੋਣ(&p)"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:328
|
|
|
|
|
msgid "File Pattern to Exclude"
|
|
|
|
|
msgstr "ਅੱਡ ਰੱਖਣ ਲਈ ਫਾਇਲ ਤਰਤੀਬ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:330
|
|
|
|
|
msgid ""
|
|
|
|
|
"If this is checked you can enter a shell pattern in the text box on the "
|
|
|
|
|
"right or select entries from the list."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:332
|
|
|
|
|
msgid ""
|
|
|
|
|
"Here you can enter or remove a shell pattern or select one or more entries "
|
|
|
|
|
"from the list."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:338
|
|
|
|
|
msgid "File with Filenames to Exclude"
|
|
|
|
|
msgstr "ਅੱਡ ਰੱਖਣ ਲਈ ਫਾਇਲ ਨਾਂ ਨਾਲ ਫਾਇਲ"
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:340
|
|
|
|
|
msgid ""
|
|
|
|
|
"If this is checked you can enter a filename in the combo box on the right."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:342
|
|
|
|
|
msgid ""
|
|
|
|
|
"Here you can enter the URL of a file with shell patterns to ignore during "
|
|
|
|
|
"the comparison of the folders."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:344
|
|
|
|
|
msgid ""
|
|
|
|
|
"Any file you select in the dialog that pops up when you click it will be put "
|
|
|
|
|
"in the dialog to the left of this button."
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/diffpage.cpp:352
|
|
|
|
|
msgid "&Exclude"
|
|
|
|
|
msgstr "ਅੱਡ ਰੱਖੋ(&E)"
|
|
|
|
|
|
|
|
|
|
#: 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 ""
|
|
|
|
|
|
|
|
|
|
#: libdialogpages/viewpage.cpp:90
|
|
|
|
|
msgid "Number of spaces to convert a tab character to:"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: 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 "ਆਕਾਰ:"
|
|
|
|
|
|
|
|
|
|
#: 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 "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
|
|
|
|
|
|
|
|
|
|
#: 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 ਦਰਸ਼ਕ"
|
|
|
|
|
|
|
|
|
|
#: main.cpp:189
|
|
|
|
|
msgid "Compare these files or folder"
|
|
|
|
|
msgstr "ਇਹਨਾ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ"
|
|
|
|
|
|
|
|
|
|
#: komparepart/komparepartui.rc:13
|
|
|
|
|
#, no-c-format
|
|
|
|
|
msgid "&Difference"
|
|
|
|
|
msgstr "ਅੰਤਰ(&D)"
|
|
|
|
|
|
|
|
|
|
#: 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: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 "ਨਾਲੋ ਨਾਲ"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "View"
|
|
|
|
|
#~ msgstr "ਪਾਠ ਝਲਕ"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "Files"
|
|
|
|
|
#~ msgstr "ਫਾਇਲਾਂ(&F)"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "Appearance"
|
|
|
|
|
#~ msgstr "ਦਿੱਖ(&p)"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "&Fonts"
|
|
|
|
|
#~ msgstr "ਫੋਂਟ:"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "&File"
|
|
|
|
|
#~ msgstr "ਫਾਇਲਾਂ(&F)"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "&Settings"
|
|
|
|
|
#~ msgstr "ਵੇਖਣ ਸਥਾਪਨ"
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
#~ msgid "Options"
|
|
|
|
|
#~ msgstr "ਚੋਣ(&p)"
|
