From 242434109c14a494dee7738b9c343f5947d20506 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Sep 2014 03:08:03 -0500 Subject: Automated l10n update (.po files) --- tde-i18n-mk/messages/tdesdk/kompare.po | 1427 ++++++++++++++++---------------- 1 file changed, 714 insertions(+), 713 deletions(-) (limited to 'tde-i18n-mk/messages/tdesdk/kompare.po') diff --git a/tde-i18n-mk/messages/tdesdk/kompare.po b/tde-i18n-mk/messages/tdesdk/kompare.po index f40d2cde8e5..9e6594d3520 100644 --- a/tde-i18n-mk/messages/tdesdk/kompare.po +++ b/tde-i18n-mk/messages/tdesdk/kompare.po @@ -5,971 +5,972 @@ 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: 2006-01-26 23:14+0100\n" "Last-Translator: Bozidar Proevski \n" "Language-Team: Macedonian \n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Параметри" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Божидар Проевски" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Поставувања за преглед" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "bobibobi@freemail.com.mk" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Разлика" +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "Изворишна папка" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Поставувања за разлика" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Одредишна папка" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "З&ачувај ги сите" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "Изворишна датотека" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Зачу&вај .diff..." +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "Одредишна датотека" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Размени извор со одредиште" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "Изворишна линија" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Прикажи статистика" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "Одредишна линија" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "URL %1 не може да биде симнато." +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Разлика" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "URL %1 не постои на вашиот систем." +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" +"Применето: Измените на %n линија се вратени назад\n" +"Применето: Измените на %n линии се вратени назад\n" +"Применето: Измените на %n линии се вратени назад" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Опции за разлики" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Изменета е %n линија\n" +"Изменети се %n линии\n" +"Изменети се %n линии" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Датотеки со закрпи" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" +"Применето: Вметнувањето на %n линија е вратено назад\n" +"Применето: Вметнувањето на %n линии е вратено назад\n" +"Применето: Вметнувањето на %n линии е вратено назад" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Зачувајте .diff" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"Вметната е %n линија\n" +"Вметнати се %n линии\n" +"Вметнати се %n линии" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" msgstr "" -"Датотеката постои или е заштитена од запис. Дали сакате да запишете врз неа?" +"Применето: Бришењето на %n линија е вратено назад\n" +"Применето: Бришењето на %n линии е вратено назад\n" +"Применето: Бришењето на %n линии е вратено назад" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Датотеката постои" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"Избришана е %n линија\n" +"Избришани се %n линии\n" +"Избришани се %n линии" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Запиши" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Непознат" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Не запишувај" +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Извршувам diff..." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Анализирам излез од diff..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Ја споредувам датотеката %1 со датотеката %2" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Ги споредувам датотеките во %1 со датотеките во %2" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "П&ретходна датотека" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Прегледувам излез на diff од %1" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "Сл&една датотека" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "&Претходна разлика" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "След&на разлика" + +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +msgid "" +"No models or no differences, this file: %1" +", is not a valid diff file." msgstr "" +"Нема модели или нема разлики, оваа датотека: %1 " +"не е валидна датотека со разлики." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: libdiff2/komparemodellist.cpp:246 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"There were problems applying the diff %1 to the file %2." msgstr "" -"Направивте измени во одредишните датотеки.\n" -"Дали сакате да ги зачувате?" +"Имаше проблеми при применувањето на разликата %1 на датотеката " +"%2." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Зачувувате промени" +#: libdiff2/komparemodellist.cpp:271 +msgid "" +"There were problems applying the diff %1 to the folder %2" +"." +msgstr "" +"Имаше проблеми при применувањето на разликата %1 на папката %2" +"." -#. 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 "Унифициран" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +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 "Контекстуален" +#: libdiff2/komparemodellist.cpp:350 +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +"Не можев да запишам во привремената датотека %1, ја бришам." -#. 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" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +"Не можев да ја креирам одредишната папка %1.\n" +"Датотеката не беше зачувана." -#. 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" +#: libdiff2/komparemodellist.cpp:383 +msgid "" +"Could not upload the temporary file to the destination location %1" +". The temporary file is still available under: %2" +". You can manually copy it to the right place." +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 "Нормален" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Непознат" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Не можев да го анализирам излезот на diff." -#: komparepart/kompare_part.cpp:667 -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"Нема diff-датотека или не биле споредени 2 датотеки. Поради тоа нема достапна " -"статистика." +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Датотеките се идентични." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Статистика за разликите" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +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" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." 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" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." msgstr "" -"Статистика:\n" -"\n" -"Број на линии во дат. со разлика: %1\n" -"Формат: %2\n" -"\n" -"Тековна стара датотека: %3\n" -"Тековна нова датотека: %4\n" -"\n" -"Број на парчиња: %5\n" -"Број на разлики: %6" - -#: 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 "Тркалце на глушецот" +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Број на линии:" +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" -msgstr "Табулатори во празни места" +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "&Отвори разлика..." -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" -msgstr "Број на празни места за претворање на знак за табулатор:" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "&Спореди датотеки..." -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "&Изглед" +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." +msgstr "" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "Фонт за текст" +#: kompare_shell.cpp:246 +msgid "Show T&ext View" +msgstr "" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Фонт:" +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Големина:" +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr " 0 од 0 разлики " -#: libdialogpages/diffpage.cpp:211 -msgid "Diff Program" -msgstr "Програма за разлики" +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr " 0 од 0 датотеки " -#: libdialogpages/diffpage.cpp:216 +#: kompare_shell.cpp:273 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." +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -"Тука може да изберете друга програма за правење разлики. Стандардната програма " -"diff на Соларис не ги поддржува сите опции што ги има верзијата на ГНУ." - -#: libdialogpages/diffpage.cpp:221 -msgid "&Diff" -msgstr "&Разлика" - -#: libdialogpages/diffpage.cpp:232 -msgid "Output Format" -msgstr "Излезен формат" +" %1 од %n датотека \n" +" %1 од %n датотеки \n" +" %1 од %n датотеки " -#: libdialogpages/diffpage.cpp:233 +#: kompare_shell.cpp:275 +#, c-format 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." +"_n: %n file \n" +" %n files " msgstr "" +" %n датотека \n" +" %n датотеки \n" +" %n датотеки " -#: libdialogpages/diffpage.cpp:247 -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 "Број на контекстни линии:" +#: kompare_shell.cpp:278 +msgid "" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr "" +" %1 од %n разлика, %2 применети \n" +" %1 од %n разлики, %2 применети \n" +" %1 од %n разлики, %2 применети " -#: libdialogpages/diffpage.cpp:253 +#: kompare_shell.cpp:281 +#, c-format 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." +"_n: %n difference \n" +" %n differences " msgstr "" +" %n разлика \n" +" %n разлики \n" +" %n разлики " -#: libdialogpages/diffpage.cpp:259 -msgid "&Format" -msgstr "&Формат" +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "" -#: libdialogpages/diffpage.cpp:270 -msgid "General" -msgstr "Општо" +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "Датотека/папка" -#: libdialogpages/diffpage.cpp:274 -msgid "&Look for smaller changes" +#: kompare_shell.cpp:371 +msgid "Diff Output" msgstr "" -#: libdialogpages/diffpage.cpp:275 -msgid "This corresponds to the -d diff option." +#: kompare_shell.cpp:373 +msgid "Blend" msgstr "" -#: libdialogpages/diffpage.cpp:276 -msgid "O&ptimize for large files" +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" msgstr "" -#: libdialogpages/diffpage.cpp:277 -msgid "This corresponds to the -H diff option." +#: 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 "" -#: libdialogpages/diffpage.cpp:278 -msgid "&Ignore changes in case" -msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Споредете датотеки или папки" -#: libdialogpages/diffpage.cpp:279 -msgid "This corresponds to the -i diff option." -msgstr "" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Извор" -#: libdialogpages/diffpage.cpp:284 -msgid "Ignore regexp:" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Одредиште" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" msgstr "" -#: libdialogpages/diffpage.cpp:285 -msgid "This option corresponds to the -I diff option." +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" msgstr "" -#: libdialogpages/diffpage.cpp:288 +#: kompare_shell.cpp:402 main.cpp:189 msgid "" -"Add the regular expression here that you want to use\n" -"to ignore lines that match it." +"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 "" -#: libdialogpages/diffpage.cpp:294 -msgid "&Edit..." -msgstr "Ур&еди..." - -#: libdialogpages/diffpage.cpp:295 -msgid "" -"Clicking this will open a regular expression dialog where\n" -"you can graphically create regular expressions." +#: kompare_shell.cpp:439 +msgid "Text View" msgstr "" -#: libdialogpages/diffpage.cpp:300 -msgid "Whitespace" -msgstr "Празни места" +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "Тука може да ги внесете датотеките што сакате да ги споредите." -#: libdialogpages/diffpage.cpp:304 -msgid "E&xpand tabs to spaces in output" -msgstr "" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Разлика" -#: libdialogpages/diffpage.cpp:305 -msgid "This option corresponds to the -t diff option." -msgstr "" +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." +msgstr "Тука може да ги смените опциите за споредбата на датотеките." -#: libdialogpages/diffpage.cpp:306 -msgid "I&gnore added or removed empty lines" -msgstr "" +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." +msgstr "Тука може да ги смените опциите за прегледот." -#: libdialogpages/diffpage.cpp:307 -msgid "This option corresponds to the -B diff option." -msgstr "" +#. i18n: file komparepart/komparepartui.rc line 13 +#: rc.cpp:15 +#, no-c-format +msgid "&Difference" +msgstr "&Разлика" -#: libdialogpages/diffpage.cpp:308 -msgid "Ig&nore changes in the amount of whitespace" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 +#: rc.cpp:21 +#, no-c-format +msgid "Run Diff In" msgstr "" -#: libdialogpages/diffpage.cpp:309 -msgid "This option corresponds to the -b diff option." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 +#: rc.cpp:24 +#, no-c-format +msgid "Command Line" msgstr "" -#: libdialogpages/diffpage.cpp:310 -msgid "Ign&ore all whitespace" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 +#: rc.cpp:27 +#, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" msgstr "" -#: libdialogpages/diffpage.cpp:311 -msgid "This option corresponds to the -w diff option." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 +#: rc.cpp:33 +#, no-c-format +msgid "Look for smaller changes" msgstr "" -#: libdialogpages/diffpage.cpp:312 -msgid "Igno&re changes due to tab expansion" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 +#: rc.cpp:36 +#, no-c-format +msgid "Optimize for large files" msgstr "" -#: libdialogpages/diffpage.cpp:313 -msgid "This option corresponds to the -E diff option." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 +#: rc.cpp:39 +#, no-c-format +msgid "Ignore changes in case" msgstr "" -#: libdialogpages/diffpage.cpp:318 -msgid "O&ptions" -msgstr "О&пции" - -#: libdialogpages/diffpage.cpp:328 -msgid "File Pattern to Exclude" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 +#: rc.cpp:42 +#, no-c-format +msgid "Expand tabs to spaces" 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." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 +#: rc.cpp:45 +#, no-c-format +msgid "Ignore added or removed empty lines" msgstr "" -#: libdialogpages/diffpage.cpp:332 -msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 +#: rc.cpp:48 +#, no-c-format +msgid "Ignore changes in whitespace" msgstr "" -#: libdialogpages/diffpage.cpp:338 -msgid "File with Filenames to Exclude" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 +#: rc.cpp:51 +#, no-c-format +msgid "Show function names" msgstr "" -#: libdialogpages/diffpage.cpp:340 -msgid "" -"If this is checked you can enter a filename in the combo box on the right." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 +#: rc.cpp:54 +#, no-c-format +msgid "Compare folders recursively" +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." +#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 +#: rc.cpp:57 +#, no-c-format +msgid "Treat new files as empty" 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 "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 +#: rc.cpp:60 +#, no-c-format +msgid "Format" +msgstr "Формат" -#: libdialogpages/diffpage.cpp:352 -msgid "&Exclude" -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 "Контекстуален" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -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" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -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 "Нормален" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -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" -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "bobibobi@freemail.com.mk" +#. 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 "Унифициран" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 +#: rc.cpp:78 +#, no-c-format +msgid "Side-by-side" msgstr "" -"Програма за прегледување на разликите меѓу датотеки и евентуално генерирање на " -"разлика" - -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "Ова ќе го спореди URL1 со URL2" -#: 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 "" +#. 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: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/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Параметри" -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +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 "" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Поставувања за разлика" -#: main.cpp:52 -msgid "Kompare" -msgstr "" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +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:168 +msgid "Save .&diff..." +msgstr "Зачу&вај .diff..." -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Автор" +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Размени извор со одредиште" -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Уметникот што ја изработи иконата на Kompare" +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Прикажи статистика" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Многу добри совети" +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "URL %1 не може да биде симнато." -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "" - -#: kompare_shell.cpp:397 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Споредете датотеки или папки" - -#: kompare_shell.cpp:398 main.cpp:186 -msgid "Source" -msgstr "Извор" +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "URL %1 не постои на вашиот систем." -#: kompare_shell.cpp:399 main.cpp:187 -msgid "Destination" -msgstr "Одредиште" +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Опции за разлики" -#: kompare_shell.cpp:401 main.cpp:189 -msgid "Compare" -msgstr "" +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Датотеки со закрпи" -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "" +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Зачувајте .diff" -#: 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. " +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" 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 "Тука може да ги смените опциите за прегледот." +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Датотеката постои" -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "Изворишна папка" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Запиши" -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "Одредишна папка" +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Не запишувај" -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "Изворишна датотека" +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "Одредишна датотека" +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Извршувам diff..." -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "Изворишна линија" +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Анализирам излез од diff..." -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "Одредишна линија" +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ја споредувам датотеката %1 со датотеката %2" -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Разлика" +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ги споредувам датотеките во %1 со датотеките во %2" -#: komparenavtreepart/komparenavtreepart.cpp:426 +#: komparepart/kompare_part.cpp:555 #, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" +msgid "Viewing diff output from %1" +msgstr "Прегледувам излез на diff од %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" msgstr "" -"Применето: Измените на %n линија се вратени назад\n" -"Применето: Измените на %n линии се вратени назад\n" -"Применето: Измените на %n линии се вратени назад" -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" msgstr "" -"Изменета е %n линија\n" -"Изменети се %n линии\n" -"Изменети се %n линии" -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" -"Применето: Вметнувањето на %n линија е вратено назад\n" -"Применето: Вметнувањето на %n линии е вратено назад\n" -"Применето: Вметнувањето на %n линии е вратено назад" +"Направивте измени во одредишните датотеки.\n" +"Дали сакате да ги зачувате?" -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Зачувувате промени" + +#: komparepart/kompare_part.cpp:667 msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." msgstr "" -"Вметната е %n линија\n" -"Вметнати се %n линии\n" -"Вметнати се %n линии" +"Нема diff-датотека или не биле споредени 2 датотеки. Поради тоа нема достапна " +"статистика." -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format +#: 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 "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" +"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" -"Применето: Бришењето на %n линии е вратено назад\n" -"Применето: Бришењето на %n линии е вратено назад" +"Статистика:\n" +"\n" +"Стара датотека: %1\n" +"Нова датотека: %2\n" +"\n" +"Формат: %3\n" +"Број на парчиња: %4\n" +"Број на разлики: %5" -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format +#: komparepart/kompare_part.cpp:686 msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" +"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" -"Избришани се %n линии\n" -"Избришани се %n линии" +"Статистика:\n" +"\n" +"Број на линии во дат. со разлика: %1\n" +"Формат: %2\n" +"\n" +"Тековна стара датотека: %3\n" +"Тековна нова датотека: %4\n" +"\n" +"Број на парчиња: %5\n" +"Број на разлики: %6" -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "Кодирање" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Разлика" +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "&Датотеки" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "" +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Бои" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "" +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "Боја за избришано:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "" +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "Боја за изменето:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "" +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Боја за додадено:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "" +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "Боја за применето:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "" +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Тркалце на глушецот" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, no-c-format -msgid "Expand tabs to spaces" -msgstr "" +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Број на линии:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "" +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" +msgstr "Табулатори во празни места" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "Број на празни места за претворање на знак за табулатор:" + +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "&Изглед" + +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "Фонт за текст" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Фонт:" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +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 "" +"Тука може да изберете друга програма за правење разлики. Стандардната програма " +"diff на Соларис не ги поддржува сите опции што ги има верзијата на ГНУ." -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" +#: libdialogpages/diffpage.cpp:221 +msgid "&Diff" +msgstr "&Разлика" + +#: 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 "" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Спореди ги папките рекурзивно" +#: libdialogpages/diffpage.cpp:247 +msgid "Lines of Context" +msgstr "Контекстни линии" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" +#: 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 "" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Формат" +#: libdialogpages/diffpage.cpp:259 +msgid "&Format" +msgstr "&Формат" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" +#: libdialogpages/diffpage.cpp:270 +msgid "General" +msgstr "Општо" + +#: libdialogpages/diffpage.cpp:274 +msgid "&Look for smaller changes" msgstr "" -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." +#: libdialogpages/diffpage.cpp:275 +msgid "This corresponds to the -d diff option." msgstr "" -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." +#: libdialogpages/diffpage.cpp:276 +msgid "O&ptimize for large files" msgstr "" -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." +#: libdialogpages/diffpage.cpp:277 +msgid "This corresponds to the -H diff option." msgstr "" -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." +#: libdialogpages/diffpage.cpp:278 +msgid "&Ignore changes in case" msgstr "" -#: kompare_shell.cpp:232 -msgid "&Open Diff..." -msgstr "&Отвори разлика..." - -#: kompare_shell.cpp:233 -msgid "&Compare Files..." -msgstr "&Спореди датотеки..." - -#: kompare_shell.cpp:236 -msgid "&Blend URL with Diff..." +#: libdialogpages/diffpage.cpp:279 +msgid "This corresponds to the -i diff option." msgstr "" -#: kompare_shell.cpp:245 -msgid "Show T&ext View" +#: libdialogpages/diffpage.cpp:284 +msgid "Ignore regexp:" msgstr "" -#: kompare_shell.cpp:247 -msgid "Hide T&ext View" +#: libdialogpages/diffpage.cpp:285 +msgid "This option corresponds to the -I diff option." msgstr "" -#: 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 +#: libdialogpages/diffpage.cpp:288 msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " +"Add the regular expression here that you want to use\n" +"to ignore lines that match it." msgstr "" -" %1 од %n датотека \n" -" %1 од %n датотеки \n" -" %1 од %n датотеки " -#: kompare_shell.cpp:274 -#, c-format +#: libdialogpages/diffpage.cpp:294 +msgid "&Edit..." +msgstr "Ур&еди..." + +#: libdialogpages/diffpage.cpp:295 msgid "" -"_n: %n file \n" -" %n files " +"Clicking this will open a regular expression dialog where\n" +"you can graphically create regular expressions." msgstr "" -" %n датотека \n" -" %n датотеки \n" -" %n датотеки " -#: kompare_shell.cpp:277 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " +#: libdialogpages/diffpage.cpp:300 +msgid "Whitespace" +msgstr "Празни места" + +#: libdialogpages/diffpage.cpp:304 +msgid "E&xpand tabs to spaces in output" msgstr "" -" %1 од %n разлика, %2 применети \n" -" %1 од %n разлики, %2 применети \n" -" %1 од %n разлики, %2 применети " -#: kompare_shell.cpp:280 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " +#: libdialogpages/diffpage.cpp:305 +msgid "This option corresponds to the -t diff option." msgstr "" -" %n разлика \n" -" %n разлики \n" -" %n разлики " -#: kompare_shell.cpp:368 -msgid "Blend File/Folder with diff Output" +#: libdialogpages/diffpage.cpp:306 +msgid "I&gnore added or removed empty lines" msgstr "" -#: kompare_shell.cpp:369 -msgid "File/Folder" -msgstr "Датотека/папка" +#: libdialogpages/diffpage.cpp:307 +msgid "This option corresponds to the -B diff option." +msgstr "" -#: kompare_shell.cpp:370 -msgid "Diff Output" +#: libdialogpages/diffpage.cpp:308 +msgid "Ig&nore changes in the amount of whitespace" msgstr "" -#: kompare_shell.cpp:372 -msgid "Blend" +#: libdialogpages/diffpage.cpp:309 +msgid "This option corresponds to the -b diff option." msgstr "" -#: kompare_shell.cpp:372 -msgid "Blend this file or folder with the diff output" +#: libdialogpages/diffpage.cpp:310 +msgid "Ign&ore all whitespace" 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. " +#: libdialogpages/diffpage.cpp:311 +msgid "This option corresponds to the -w diff option." msgstr "" -#: kompare_shell.cpp:401 -msgid "Compare these files or folders" +#: libdialogpages/diffpage.cpp:312 +msgid "Igno&re changes due to tab expansion" msgstr "" -#: kompare_shell.cpp:439 -msgid "Text View" +#: libdialogpages/diffpage.cpp:313 +msgid "This option corresponds to the -E diff option." msgstr "" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" +#: libdialogpages/diffpage.cpp:318 +msgid "O&ptions" +msgstr "О&пции" + +#: libdialogpages/diffpage.cpp:328 +msgid "File Pattern to Exclude" msgstr "" -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" +#: 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 "" -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" +#: libdialogpages/diffpage.cpp:332 +msgid "" +"Here you can enter or remove a shell pattern or select one or more entries from " +"the list." msgstr "" -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" +#: libdialogpages/diffpage.cpp:338 +msgid "File with Filenames to Exclude" msgstr "" -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "П&ретходна датотека" +#: libdialogpages/diffpage.cpp:340 +msgid "" +"If this is checked you can enter a filename in the combo box on the right." +msgstr "" -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -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 "" -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -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 "" -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "След&на разлика" +#: libdialogpages/diffpage.cpp:352 +msgid "&Exclude" +msgstr "" -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#: main.cpp:33 msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." +"A program to view the differences between files and optionally generate a diff" msgstr "" -"Нема модели или нема разлики, оваа датотека: %1 " -"не е валидна датотека со разлики." +"Програма за прегледување на разликите меѓу датотеки и евентуално генерирање на " +"разлика" -#: libdiff2/komparemodellist.cpp:246 +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "Ова ќе го спореди URL1 со URL2" + +#: main.cpp:40 msgid "" -"There were problems applying the diff %1 to the file %2." +"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 "" -"Имаше проблеми при применувањето на разликата %1 на датотеката " -"%2." -#: libdiff2/komparemodellist.cpp:271 +#: main.cpp:41 msgid "" -"There were problems applying the diff %1 to the folder %2" -"." +"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 "" -"Имаше проблеми при применувањето на разликата %1 на папката %2" -"." -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Не можев да отворам привремена датотека." - -#: libdiff2/komparemodellist.cpp:350 -msgid "Could not write to the temporary file %1, deleting it." +#: main.cpp:42 +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Не можев да запишам во привремената датотека %1, ја бришам." -#: libdiff2/komparemodellist.cpp:368 +#: main.cpp:43 msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." +"Use this to specify the encoding when calling it from the command line. It will " +"default to the local encoding if not specified." msgstr "" -"Не можев да ја креирам одредишната папка %1.\n" -"Датотеката не беше зачувана." -#: libdiff2/komparemodellist.cpp:383 -msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +#: main.cpp:52 +msgid "Kompare" msgstr "" -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Не можев да го анализирам излезот на diff." +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh и Otto Bruggeman" -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Датотеките се идентични." +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Автор" -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Не можев да запишам во привремената датотека." +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Уметникот што ја изработи иконата на Kompare" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Многу добри совети" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "" -- cgit v1.2.1