diff options
Diffstat (limited to 'tde-i18n-hi/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-hi/messages/tdesdk/kompare.po | 937 |
1 files changed, 480 insertions, 457 deletions
diff --git a/tde-i18n-hi/messages/tdesdk/kompare.po b/tde-i18n-hi/messages/tdesdk/kompare.po index 3fbad46dc09..afc12b3df46 100644 --- a/tde-i18n-hi/messages/tdesdk/kompare.po +++ b/tde-i18n-hi/messages/tdesdk/kompare.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2014-09-29 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2004-08-24 13:32+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n" "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n" @@ -14,320 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "भिन्नताएँ लागू करें (&A)" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "भिन्नताएँ लागू नहीं करें (&a)" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "सभी लागू करें (&l)" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "सभी लागू नहीं करें (&U)" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "पिछली फ़ाइल (&r)" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "अगली फ़ाइल (&e)" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "पिछली भिन्नता (&P)" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "अगली भिन्नता (&N)" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"<qt>No models or no differences, this file: <b>%1</b>" -", is not a valid diff file.</qt>" -msgstr "" -"कोई मॉडल नहीं या कोई भिन्नता नहीं, यह फ़ाइल: %1, एक वैध डिफ़ फ़ाइल नहीं है" - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" -msgstr "डिफ़ (%1) को फ़ाइल (%2) पर लागू करने में समस्या आई." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>" -".</qt>" -msgstr "डिफ़ (%1) को फ़ोल्डर (%2) पर लागू करने में समस्या आई." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "अस्थायी फ़ाइल खोल नहीं सकते." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." - -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy -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 -- स्रोत गंतव्य" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "छोटे परिवर्तनों के लिए देखें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "विशाल फ़ाइलों के लिए ऑप्टीमाइज़ करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "केस में परिवर्तनों को नज़र अंदाज़ करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "टैब्स को स्पेसेस के रूप में एक्सपांड करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "जोड़ी गई या मिटाई गई खाली पंक्तियोँ को नज़र अंदाज़ करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "श्वेतस्थान में परिवर्तनों को नज़र अंदाज़ करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "फ़ंक्शन नाम दिखाएँ" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "फ़ोल्डर रीकर्सिवली तुलना करें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "नई फ़ाइलों को खाली समझें" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "फॉर्मेट" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, no-c-format -msgid "Context" -msgstr "कॉन्टेक्स्ट" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, no-c-format -msgid "Ed" -msgstr "ईडी" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, no-c-format -msgid "Normal" -msgstr "साधारण" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, no-c-format -msgid "RCS" -msgstr "आरसीएस" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, no-c-format -msgid "Unified" -msgstr "एकीकृत" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "अगल-बगल में" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "कॉन्टेक्स्ट पंक्तियोँ की संख्याः" - -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"एक प्रोग्राम जो फ़ाइलों के बीच भिन्नताओं को देखता है तथा वैकल्पिक रूप से डिफ़ " -"तैयार करता है." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "यह यूआरएल1 को यूआरएल2 के साथ तुलना करता है." - -#: main.cpp:40 -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." -msgstr "" - -#: main.cpp:41 -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " -msgstr "" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" - -#: main.cpp:43 -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." -msgstr "" - -#: main.cpp:52 -msgid "Kompare" -msgstr "काम्पेयर" - -#: main.cpp:54 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, जॉन फायरबॉग तथा ओटो ब्रगमेन" - -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "लेखक" - -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "काम्पेयर-पार्ट" - -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "बहुत से अच्छे परामर्श" - -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "सर्विसिया डिफ़ प्रदर्शक" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "फ़ाइलों या फ़ोल्डरों में तुलना करें" - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "स्रोत" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "गंतव्य" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "तुलना करें" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "इन फ़ाइलों या फ़ोल्डर में तुलना करें" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "रविशंकर श्रीवास्तव" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -439,17 +132,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 "पाठ दृश्य" @@ -539,19 +255,233 @@ msgstr "अज्ञात" msgid "KompareNavTreePart" msgstr "कॉम्पेयर-नेव-ट्री-पार्ट" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "सभी सहेजें (&A)" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "सहेजें .&diff" + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "स्रोत तथा गंतव्य अदला-बदली करें" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "आंकड़े दिखाएँ" + +#: komparepart/kompare_part.cpp:269 +#, fuzzy +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "यूआरएल %1 डाउनलोड नहीं किया जा सकता." + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "यूआरएल %1 आपके तंत्र पर मौज़ूद नहीं है." + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "डिफ विकल्प" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|पैच फ़ाइलें" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "सहेजें .diff" + +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" msgstr "" +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "काम्पेयर-पार्ट" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "डिफ चला रहे..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "डिफ़ आउटपुट पारसिंग कर रहे..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "फ़ाइल %1 को फ़ाइल %2 से तुलना किया जा रहा है" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "फ़ाइलों को %1 में से %2 की फ़ाइलों से तुलना किया जा रहा है" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "%1 से डिफ़ आउटपुट देख रहे" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "डिफ़ आउटपुट %1 से फ़ाइल %2 में ब्लैंड किया जा रहा है" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "डिफ़ आउटपुट %1 से फ़ोल्डर %2 में ब्लैंड किया जा रहा है" + +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#, fuzzy +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"आपने गंतव्य में परिवर्तन किए हैं.\n" +"क्या आप इसे सहेजना चाहते हैं?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "परिवर्तन सहेजें?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "एकीकृत" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "कॉन्टेक्स्ट" + +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, no-c-format +msgid "RCS" +msgstr "आरसीएस" + +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, no-c-format +msgid "Ed" +msgstr "ईडी" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "साधारण" + +#: komparepart/kompare_part.cpp:667 +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "कोई डिफ़ फ़ाइल नहीं, या कोई 2 फ़ाइलें डिफ़्ड नहीं. अतः कोई आंकड़े उपलब्ध नहीं." + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "डिफ आंकड़े" + +#: komparepart/kompare_part.cpp:673 +msgid "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" +msgstr "" +"आंकड़े:\n" +"\n" +"पुरानी फ़ाइल: %1\n" +"नई फ़ाइल: %2\n" +"\n" +"फ़ार्मेट: %3\n" +"हंक्स की संख्या: %4\n" +"भिन्नताओं की संख्या: %5" + +#: komparepart/kompare_part.cpp:686 +msgid "" +"Statistics:\n" +"\n" +"Number of files in diff file: %1\n" +"Format: %2\n" +"\n" +"Current old file: %3\n" +"Current new file: %4\n" +"\n" +"Number of hunks: %5\n" +"Number of differences: %6" +msgstr "" +"आंकड़े:\n" +"\n" +"डिफ़ फ़ाइल में फ़ाइलों की संख्या: %1\n" +"फ़ार्मेट: %2\n" +"\n" +"मौज़ूदा पुरानी फ़ाइल: %3\n" +"मौज़ूदा नई फ़ाइल: %4\n" +"\n" +"हंक्स की संख्या: %5\n" +"भिन्नताओं की संख्या: %6" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "प्राथमिकताएँ" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "पाठ दृश्य" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "दृश्य विन्यास" + #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "डिफ" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "डिफ विन्यास" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "अगली फ़ाइल (&e)" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" #: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "शक्ल-सूरत (&p)" + +#: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -576,15 +506,20 @@ msgstr "आउटपुट फॉर्मेट" #: libdialogpages/diffpage.cpp:233 msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "कॉन्टेक्स्ट की पंक्तियाँ" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "कॉन्टेक्स्ट पंक्तियोँ की संख्याः" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -705,14 +640,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:330 msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" #: libdialogpages/diffpage.cpp:332 msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" #: libdialogpages/diffpage.cpp:338 @@ -726,14 +661,14 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" #: libdialogpages/diffpage.cpp:344 msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" #: libdialogpages/diffpage.cpp:352 @@ -801,174 +736,262 @@ msgstr "" msgid "Size:" msgstr "" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "प्राथमिकताएँ" +#: libdialogpages/viewpage.cpp:119 +msgid "&Fonts" +msgstr "" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "दृश्य विन्यास" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "भिन्नताएँ लागू करें (&A)" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "डिफ विन्यास" +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "भिन्नताएँ लागू नहीं करें (&a)" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "सभी सहेजें (&A)" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "सभी लागू करें (&l)" -#: komparepart/kompare_part.cpp:168 +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "सभी लागू नहीं करें (&U)" + +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "पिछली फ़ाइल (&r)" + +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "अगली फ़ाइल (&e)" + +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "पिछली भिन्नता (&P)" + +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "अगली भिन्नता (&N)" + +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 #, fuzzy -msgid "Save .&diff..." -msgstr "सहेजें .&diff" +msgid "" +"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " +"file.</qt>" +msgstr "कोई मॉडल नहीं या कोई भिन्नता नहीं, यह फ़ाइल: %1, एक वैध डिफ़ फ़ाइल नहीं है" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "स्रोत तथा गंतव्य अदला-बदली करें" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" +"qt>" +msgstr "डिफ़ (%1) को फ़ाइल (%2) पर लागू करने में समस्या आई." -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "आंकड़े दिखाएँ" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." +"</qt>" +msgstr "डिफ़ (%1) को फ़ोल्डर (%2) पर लागू करने में समस्या आई." -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "अस्थायी फ़ाइल खोल नहीं सकते." + +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "यूआरएल %1 डाउनलोड नहीं किया जा सकता." +msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" +msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "यूआरएल %1 आपके तंत्र पर मौज़ूद नहीं है." +msgid "" +"<qt>Could not create destination directory <b>%1</b>.\n" +"The file has not been saved.</qt>" +msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -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 "" -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "डिफ़ आउटपुट पार्से नहीं कर सका." + +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "फ़ाइलें एक जैसी हैं." + +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." + +#: main.cpp:33 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|पैच फ़ाइलें" +msgid "" +"A program to view the differences between files and optionally generate a " +"diff" +msgstr "" +"एक प्रोग्राम जो फ़ाइलों के बीच भिन्नताओं को देखता है तथा वैकल्पिक रूप से डिफ़ तैयार करता है." -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "सहेजें .diff" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "यह यूआरएल1 को यूआरएल2 के साथ तुलना करता है." -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: main.cpp:40 +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' " +"and then it will read from standard input. Can be used for instance for cvs " +"diff | kompare -o -. Kompare will do a check to see if it can find the " +"original file(s) and then blend the original file(s) into the diffoutput and " +"show that in the viewer. -n disables the check." msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" +#: 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:446 -msgid "Overwrite" +#: 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:446 -msgid "Do Not Overwrite" +#: main.cpp:43 +msgid "" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" +#: main.cpp:52 +msgid "Kompare" +msgstr "काम्पेयर" + +#: main.cpp:54 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, जॉन फायरबॉग तथा ओटो ब्रगमेन" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "लेखक" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" msgstr "काम्पेयर-पार्ट" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "डिफ चला रहे..." +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "बहुत से अच्छे परामर्श" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "डिफ़ आउटपुट पारसिंग कर रहे..." +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "सर्विसिया डिफ़ प्रदर्शक" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "फ़ाइल %1 को फ़ाइल %2 से तुलना किया जा रहा है" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "इन फ़ाइलों या फ़ोल्डर में तुलना करें" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "फ़ाइलों को %1 में से %2 की फ़ाइलों से तुलना किया जा रहा है" +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "अगली फ़ाइल (&e)" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "%1 से डिफ़ आउटपुट देख रहे" +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "भिन्नता (&D)" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "डिफ़ आउटपुट %1 से फ़ाइल %2 में ब्लैंड किया जा रहा है" +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "दृश्य विन्यास" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "डिफ़ आउटपुट %1 से फ़ोल्डर %2 में ब्लैंड किया जा रहा है" +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "डिफ़ इसमें चलाएँ" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 -#, fuzzy -msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"आपने गंतव्य में परिवर्तन किए हैं.\n" -"क्या आप इसे सहेजना चाहते हैं?" +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "कमांड लाइन" -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "परिवर्तन सहेजें?" +#: komparepart/komparesaveoptionsbase.ui:108 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- स्रोत गंतव्य" -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"कोई डिफ़ फ़ाइल नहीं, या कोई 2 फ़ाइलें डिफ़्ड नहीं. अतः कोई आंकड़े उपलब्ध नहीं." +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "विकल्प (&p)" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "डिफ आंकड़े" +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "छोटे परिवर्तनों के लिए देखें" -#: komparepart/kompare_part.cpp:673 -msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" -msgstr "" -"आंकड़े:\n" -"\n" -"पुरानी फ़ाइल: %1\n" -"नई फ़ाइल: %2\n" -"\n" -"फ़ार्मेट: %3\n" -"हंक्स की संख्या: %4\n" -"भिन्नताओं की संख्या: %5" +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "विशाल फ़ाइलों के लिए ऑप्टीमाइज़ करें" -#: komparepart/kompare_part.cpp:686 -msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "केस में परिवर्तनों को नज़र अंदाज़ करें" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, no-c-format +msgid "Expand tabs to spaces" +msgstr "टैब्स को स्पेसेस के रूप में एक्सपांड करें" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "जोड़ी गई या मिटाई गई खाली पंक्तियोँ को नज़र अंदाज़ करें" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "श्वेतस्थान में परिवर्तनों को नज़र अंदाज़ करें" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "फ़ंक्शन नाम दिखाएँ" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "फ़ोल्डर रीकर्सिवली तुलना करें" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "नई फ़ाइलों को खाली समझें" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "फॉर्मेट" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "अगल-बगल में" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" msgstr "" -"आंकड़े:\n" -"\n" -"डिफ़ फ़ाइल में फ़ाइलों की संख्या: %1\n" -"फ़ार्मेट: %2\n" -"\n" -"मौज़ूदा पुरानी फ़ाइल: %3\n" -"मौज़ूदा नई फ़ाइल: %4\n" -"\n" -"हंक्स की संख्या: %5\n" -"भिन्नताओं की संख्या: %6" #~ msgid "%1" #~ msgstr "%1" |