diff options
Diffstat (limited to 'tde-i18n-pa/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-pa/messages/tdesdk/kompare.po | 933 |
1 files changed, 467 insertions, 466 deletions
diff --git a/tde-i18n-pa/messages/tdesdk/kompare.po b/tde-i18n-pa/messages/tdesdk/kompare.po index 0ab15cfeec5..311feeb721e 100644 --- a/tde-i18n-pa/messages/tdesdk/kompare.po +++ b/tde-i18n-pa/messages/tdesdk/kompare.po @@ -6,16 +6,474 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2007-12-20 01:16+0100\n" +"POT-Creation-Date: 2014-09-29 00:48-0500\n" "PO-Revision-Date: 2007-01-17 10:57+0530\n" "Last-Translator: A S Alam <[email protected]>\n" "Language-Team: Punjabi <[email protected]>\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" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" + +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "[email protected],[email protected]" + +#: 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)" + +#: 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 "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" + +#: 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 +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 "ਪਰਸੰਗ ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:" + #: komparepart/kompareprefdlg.cpp:33 msgid "Preferences" msgstr "ਮੇਰੀ ਪਸੰਦ" @@ -24,10 +482,6 @@ msgstr "ਮੇਰੀ ਪਸੰਦ" msgid "View Settings" msgstr "ਵੇਖਣ ਸਥਾਪਨ" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "ਅੰਤਰ(Diff)" - #: komparepart/kompareprefdlg.cpp:43 msgid "Diff Settings" msgstr "ਅੰਤਰ ਸਥਾਪਨ" @@ -127,41 +581,6 @@ msgstr "" msgid "Save Changes?" 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 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 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 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 "ਸਧਾਰਨ" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "ਅਣਜਾਣ" - #: komparepart/kompare_part.cpp:667 msgid "" "No diff file, or no 2 files have been diffed. Therefore no stats are available." @@ -216,6 +635,14 @@ msgstr "" "ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %5\n" "ਅੰਤਰਾਂ ਗਿਣਤੀ: %6" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "ਇਕੋਡਿੰਗ" + +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "ਫਾਇਲਾਂ(&F)" + #: libdialogpages/viewpage.cpp:51 msgid "Colors" msgstr "ਰੰਗ" @@ -298,12 +725,6 @@ msgstr "" msgid "Lines of Context" msgstr "ਪਰਸੰਗ ਦੀਆਂ ਸਤਰਾਂ" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, 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 " @@ -456,26 +877,6 @@ msgstr "" msgid "&Exclude" msgstr "ਅੱਡ ਰੱਖੋ(&E)" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "ਇਕੋਡਿੰਗ" - -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "ਫਾਇਲਾਂ(&F)" - -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "[email protected],[email protected]" - #: main.cpp:33 msgid "" "A program to view the differences between files and optionally generate a diff" @@ -538,406 +939,6 @@ msgstr "ਕਾਫ਼ੀ ਚੰਗੀਆਂ ਸਲਾਹਾਂ" msgid "Cervisia diff viewer" msgstr "ਸਰਵੀਸੀਆ diff ਦਰਸ਼ਕ" -#: kompare_shell.cpp:397 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਤੁਲਨਾ" - -#: kompare_shell.cpp:398 main.cpp:186 -msgid "Source" -msgstr "ਸਰੋਤ" - -#: kompare_shell.cpp:399 main.cpp:187 -msgid "Destination" -msgstr "ਨਿਯਤ" - -#: kompare_shell.cpp:401 main.cpp:189 -msgid "Compare" -msgstr "ਤੁਲਨਾ" - #: main.cpp:189 msgid "Compare these files or folder" msgstr "ਇਹਨਾ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ" - -#: kompare_shell.cpp:401 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 "" - -#: 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 "ਇੱਥੇ ਤੁਸੀਂ ਵੇਖਣ ਸਬੰਧੀ ਚੋਣਾਂ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।" - -#: 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:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - -#. 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 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -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:232 -msgid "&Open Diff..." -msgstr "ਅੰਤਰ ਖੋਲੋ(&O)..." - -#: kompare_shell.cpp:233 -msgid "&Compare Files..." -msgstr "ਫਾਇਲ ਤੁਲਨਾ(&C)..." - -#: kompare_shell.cpp:236 -msgid "&Blend URL with Diff..." -msgstr "ਅੰਤਰ ਨਾਲ URL ਰਲਾਓ(&B)..." - -#: kompare_shell.cpp:245 -msgid "Show T&ext View" -msgstr "ਪਾਠ ਵੇਖਣ ਵੇਖਾਓ(&e)" - -#: kompare_shell.cpp:247 -msgid "Hide T&ext View" -msgstr "ਪਾਠ ਵੇਖਣ ਓਹਲੇ(&e)" - -#: kompare_shell.cpp:256 -msgid " 0 of 0 differences " -msgstr "0 ਵਿੱਚੋਂ 0 ਅੰਤਰ " - -#: kompare_shell.cpp:257 -msgid " 0 of 0 files " -msgstr "0 ਵਿੱਚੋਂ 0 ਫਾਇਲਾਂ " - -#: kompare_shell.cpp:272 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -" %n ਵਿੱਚੋਂ %1 ਫਾਇਲ \n" -" %n ਫਾਇਲਾਂ ਵਿੱਚੋਂ %1 " - -#: kompare_shell.cpp:274 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -" %n ਫਾਇਲ \n" -" %n ਫਾਇਲਾਂ " - -#: kompare_shell.cpp:277 -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:280 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -" %n ਅੰਤਰ \n" -" %n ਅੰਤਰ " - -#: kompare_shell.cpp:368 -msgid "Blend File/Folder with diff Output" -msgstr "ਫਾਇਲ/ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ" - -#: kompare_shell.cpp:369 -msgid "File/Folder" -msgstr "ਫਾਇਲ/ਫੋਲਡਰ" - -#: kompare_shell.cpp:370 -msgid "Diff Output" -msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ" - -#: kompare_shell.cpp:372 -msgid "Blend" -msgstr "ਘੋਲੋ" - -#: kompare_shell.cpp:372 -msgid "Blend this file or folder with the diff output" -msgstr "ਇਸ ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ" - -#: kompare_shell.cpp:372 -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:401 -msgid "Compare these files or folders" -msgstr "ਇਹ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ" - -#: kompare_shell.cpp:439 -msgid "Text View" -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 "ਆਰਜ਼ੀ ਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" |