Mercurial > hg > easyhg-kdiff3
changeset 92:4e6ebbbae925 0.9.95
KDiff3 0.9.95
line wrap: on
line diff
--- a/kdiff3/ChangeLog Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/ChangeLog Tue Mar 03 23:50:12 2009 +0000 @@ -1,10 +1,32 @@ -Version 0.9.93 - 2008/01/06 +Version 0.9.95 - 2009/03/03 +=========================== +- Show line end style for each file. +- Updated message translations. +- Fixed permissions when writing executable file. (Un*x only) +- Fixed IgnorableCmdLineOptions (important for SVNs '-u'-option) +- Directory merge: Error when either B or C is changed and the other is deleted. (User choice required.) +- Qt-only Un*x-version looks for translations in /usr/share/locale/<lang>/LC_MESSAGES/kdiff3.qm + (for Debian, by Eike Sauer) +- New script: po/create_qm_files: To create and install translations for Qt-only version. + +Version 0.9.94 - 2009/01/17 +=========================== +- Fix for hidden text windows with --auto-flag. +- Fix for pasting clipboard truncated text if it contained characters that needed more than one byte in UTF-8 encoding. +- Fix for horizontal scrolling if word wrap is enabled. +- Directory tree: files hidden due to options (e.g. patterns etc.) don't affect folder equality any more. +- KDE: KIO-progress dialog is now hidden. (KDiff3 has its own progress dialog.) +- Directory merge: Default op for change in either B or C and delete in the other is now merge (previously copy). +- Directory merge: Not preserving merge operation after reload, because it might have changed. + +Version 0.9.93 - 2009/01/06 =========================== - Support for KDE4 (with much porting help from Valentin Rusu) - Fix for diff_ext_for_kdiff3 (by Sergey Zorin) - Win32-Installation: SendTo-integration fixed for Vista. - Optional auto detection of line end style for saving. - Option to close on ESC (default is off) +- Option to align B and C for 3 input files (default is off which is usually better for merging). Version 0.9.92 - 2007/04/15 ===========================
--- a/kdiff3/README Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/README Tue Mar 03 23:50:12 2009 +0000 @@ -2,14 +2,14 @@ ============= Author: Joachim Eibl (joachim.eibl at gmx.de) -Copyright: (C) 2002-2008 by Joachim Eibl -KDiff3-Version: 0.9.93 +Copyright: (C) 2002-2009 by Joachim Eibl +KDiff3-Version: 0.9.94 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. These are available for Un*x, Windows, Mac. Thus there are many setup possibilities to consider. -From version 0.9.93 on the main target platform is KDE4/Qt4. +From version 0.9.94 on the main target platform is KDE4/Qt4. For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older. Contents @@ -24,6 +24,7 @@ - for Windows - Debugging with MinGW under Windows: - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary + - Creating and installing translation messages - Additional hints @@ -75,7 +76,7 @@ --------------------------- - for KDE4: - From version 0.9.93 on KDiff3 supports KDE4. + From version 0.9.94 on KDiff3 supports KDE4. For installation on most distributions you usually also require these packages (names as on opensuse): - g++ (g++, version 3.4 or newer) - libqt4-devel (Qt4-libs, version 4.4.0 or newer) @@ -113,10 +114,10 @@ - for Windows - for Mac - The version 0.9.93 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. + The version 0.9.94 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. You always need - - kdiff3-0.9.93.tar.gz + - kdiff3-0.9.94.tar.gz - for Un*x: gcc, g++ with version >=3.4.2 Qt-X11-libraries @@ -141,14 +142,14 @@ Build-instructions (Un*x): - Make sure your shell-variable QTDIR is correct and that your path contains the Qt4-bin-directory. - - cd into the directory kdiff3-0.9.93/src-QT4 and type + - cd into the directory kdiff3-0.9.94/src-QT4 and type - qmake kdiff3.pro - make (or "gmake" for GNU-Make) Build-instructions (Windows): - set QTDIR=<QT4-dir> e.g.: c:\qt\4.4.1 set "PATH=%QTDIR%\bin;%PATH%" - - cd into the directory kdiff3-0.9.93\src-Qt4 and type + - cd into the directory kdiff3-0.9.94\src-Qt4 and type - qmake kdiff3.pro - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have. @@ -157,7 +158,7 @@ - Debugging without gdb on the console: - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make". - - cd into the directory kdiff3-0.9.93\src-Qt4 + - cd into the directory kdiff3-0.9.94\src-Qt4 - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" (this is necessary so that gdb can send a break signal to the running program) - mingw32-make debug (create a debuggable executable) @@ -170,16 +171,28 @@ Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.) - 2) cd .../kdiff3-0.9.93/src-QT4 + 2) cd .../kdiff3-0.9.94/src-QT4 3a) Create a makefile for kdiff3 by executing: qmake kdiff3.pro 3b) optionally generate XCode-Project (for debugging purposes only) by executing: qmake -spec macx-xcode kdiff3.pro 4) Execute: make - 5) After the build completes copy kdiff3 from the kdiff3-0.9.93/src-QT4 directory to + 5) After the build completes copy kdiff3 from the kdiff3-0.9.94/src-QT4 directory to /Applications + Creating and installing the translation messages + The po directory contains translations from the KDE-translation teams. + If you use the Qt-only-version of KDiff3, then the installation described above + won't install translations automatically. + To create and install the translations: + 0) Make sure /usr/lib/qt3/bin/msg2qm exists + (comes with qt3-devel-tools. [Yes, really Qt3. There is no Qt4 replacement yet.]) + 1) cd .../kdiff3-0.9.95/po + 2) sh create_qm_files install (asks for a super user password) + Just to create the files in the po directory (as needed for the windows version): + 2) sh create_qm_files local + (End of KDiff3 with Qt4-instructions) ------------------------------------------------------------------------
--- a/kdiff3/kdiff3.spec Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/kdiff3.spec Tue Mar 03 23:50:12 2009 +0000 @@ -1,5 +1,5 @@ Name: kdiff3 -Version: 0.9.93 +Version: 0.9.95 Release: 1 URL: http://www.kde-apps.org/content/show.php?content=9807 @@ -15,6 +15,7 @@ BuildRequires: xorg-x11-devel BuildRequires: qt-devel >= 4.4 BuildRequires: kdelibs-devel >= 4.1 +BuildRequires: libkonq-devel >= 4.1 %description Shows the differences line by line and character by character (!). @@ -56,7 +57,7 @@ %{_libdir}/kde4/libkdiff3* %changelog -* Fri Nov 21 2008 Joachim Eibl - 0.9.93-1 +* Fri Nov 21 2008 Joachim Eibl - 0.9.94-1 - Untested changes for KDE4. * Mon May 15 2006 Vadim Likhota <vadim-lvv@yandex.ru> - 0.9.90-1.fc - write spec for fc/rhel/centos/asp for kdiff3
--- a/kdiff3/kdiff3plugin-QT4/kdiff3_plugin.desktop Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/kdiff3plugin-QT4/kdiff3_plugin.desktop Tue Mar 03 23:50:12 2009 +0000 @@ -3,8 +3,10 @@ Type=Service Name=Compare/Merge Files/Directories Name[bg]=Сравняване/Сливане на файлове/директории +Name[cs]=Porovnat/spojit soubory/adresáře +Name[de]=Dateien und Ordner vergleichen und zusammenführen Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων -Name[es]=Comparar/mezclar archivos/carpetas +Name[es]=Comparar/fusionar archivos/directorios Name[et]=Failide/kataloogide võrdlemine/liitmine Name[fr]=Comparer / Fusionner les fichiers / dossiers Name[ga]=Comhaid/Comhadlanna a Chur i gComparáid/a Chumasc
--- a/kdiff3/kdiff3plugin-QT4/kdiff3plugin.desktop Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/kdiff3plugin-QT4/kdiff3plugin.desktop Tue Mar 03 23:50:12 2009 +0000 @@ -3,8 +3,10 @@ Type=Service Name=Compare/Merge Files/Directories with KDiff3 Name[bg]=Сравняване/Сливане на файлове/директории с KDiff3 +Name[cs]=Porovnat/spojit soubory/adresáře pomocí KDiff3 +Name[de]=Dateien und Ordner vergleichen und zusammenführen mit KDiff3 Name[el]=Σύγκριση/Συγχώνευση αρχείων/καταλόγων με το KDiff3 -Name[es]=Comparar/mezclar archivos/carpetas con KDiff3 +Name[es]=Comparar/fusionar archivos/directorios con KDiff3 Name[et]=Failide/kataloogide võrdlemine/liitmine KDiff3-ga Name[fr]=Comparer / Fusionner les fichiers / dossiers à l'aide de KDiff3 Name[ga]=Comhaid/Comhadlanna a Chur i gComparáid/a Chumasc le KDiff3
--- a/kdiff3/po/ar/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ar/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2006-12-03 19:06+0100\n" "Last-Translator: محمد سعد Mohamed SAAD <metehyi@free.fr>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" @@ -16,435 +16,457 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "جاهز." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "يخرج من التطبيق" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "جاهز." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "" + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "السطر الأعلى" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Delete A" +msgid "Selection" +msgstr "أمحي A" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "" @@ -533,28 +555,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "فشل كتابة بيانات الحافظة إلى الملف المؤقت." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "من الحافظة" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -569,7 +591,7 @@ "\n" "سيتم تعطيل الإجراء التمهيدي الآن." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -579,13 +601,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "خطأ داخلي فادح" @@ -607,8 +629,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "" @@ -731,7 +753,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -906,7 +928,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1145,8 +1167,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +#, fuzzy +#| msgid "Reading Directory A" +msgid "Directory" +msgstr "قراءة الدليل A" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1710,7 +1734,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "" @@ -1724,10 +1748,6 @@ msgid "Line not available" msgstr "غير متوفر" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "السطر الأعلى" - #: difftextwindow.cpp:1731 msgid "End" msgstr "النهاية" @@ -1795,81 +1815,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1880,232 +1900,232 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "القياس: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "التاريخ و القياس: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "فشل إنشاء نسخة مؤقتة من %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "فشل فتح %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "جاري مقارنة الملف..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "خطأ عند القراءة من %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "الإسم" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "العملية" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "الحالة" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "أبيض" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "إعادة المسح" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "فشل فتح المجلّدات:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "الدليل A \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "الدليل B \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "الدليل C \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "خطأ فتح الدليل" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "تحذير بشأن الضوابط" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "جاري مسح المجلّدات...." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "قراءة الدليل A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "قراءة الدليل B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "قراءة الدليل C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "إفحص الأذون للمجلّدات الفرعية." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "حالة مقارنة المجلّدات" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "عدد المجلّدات الفرعية:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "عدد الملفات المتساوية:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "عدد الملفات المختلفة:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "جاري الإجراء " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "واجب العمل." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "أنسخ A إلى B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "أنسخ B إلى A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "أمحي A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "أمحي B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "أمحي A و B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "أمحي ( إذا كان موجود )" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "هذه العملية ليست ممكنة حالياً." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "العملية غير ممكنة" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2114,48 +2134,48 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "خطأ في البرنامج" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "حصل خطأ عند النسخ.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "خطأ." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "خطأ." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "إنتهيت." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "غير محفوظ." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2167,280 +2187,280 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "إفعله" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "تابع بلبند الأخير" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "جاري..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "حصل خطأ. إضغط موافق لترى المعلومات المفصلة.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "نسخ( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "إعادة تسمية( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "خطأ: فشلت إعادة التسمية." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "خطأ عند إنشاء الدليل." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "الهدف" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "الدليل" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "النوع" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "الحجم" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "آخر تغيير" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "غير متوفر" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "الهدف: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "نفّذ العملية للبند الحالي" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "قارن الملفات المختارة" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "عملية إختيار تلقائية لكل البنود" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "لا عملية لكل البنود" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 #, fuzzy #| msgid "Show Identical Files" msgid "" @@ -2448,15 +2468,15 @@ "Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "أعرض الملفات المختلفة" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 #, fuzzy #| msgid "Show Files only in A" msgid "" @@ -2464,11 +2484,11 @@ "only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 #, fuzzy #| msgid "Show Files only in B" msgid "" @@ -2476,11 +2496,11 @@ "only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 #, fuzzy #| msgid "Show Files only in C" msgid "" @@ -2488,35 +2508,35 @@ "only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "لا تفعل أي شيئ" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "أ" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "ب" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "س" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "أمحي أ و ب" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2528,13 +2548,13 @@ msgid "KDiff3Part" msgstr "" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&تابع" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2764,49 +2784,68 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr ""
--- a/kdiff3/po/bg/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/bg/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-12-30 15:27+0000\n" "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -15,98 +15,98 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Текуща конфигурация:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Грешка на опция за конфигурация:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Използвана е настройка --auto, но не е указан изходен файл." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Игнорирана е настройка --auto за сравняване на директории." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Записът беше неуспешен." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Отварянето на тези файлове беше неуспешно:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Грешка при отваряне на файл" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Отваря документ за сравняване..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "В готовност." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Запис на резултатът от сливането. Всички конфликти трябва да са решени!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Запис на текущият документ като..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Отпечатване на разликите" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Излиза от програмата" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Изрязва маркираната част и я слага в системния буфер" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Копира маркираната част в системния буфер" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Вмъква съдържанието на системния буфер на посоченото място" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Маркиране на всичко в текущия прозорец" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Търсене на низ" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Повторно търсене на низа" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Включва/Изключва лентата за състоянието" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Настройване на KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Отиване на текущата операция" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -114,11 +114,11 @@ "Delta" msgstr "Отиване на текущата операция" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Отиване на първата операция" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -126,11 +126,11 @@ "Delta" msgstr "Отиване на първата операция" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Отиване на последната операция" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -138,13 +138,13 @@ "Delta" msgstr "Отиване на последната операция" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Прескача разликата в интервалите, когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -152,11 +152,11 @@ "(Прескача разликата в интервалите, дори когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Отиване на предишната операция" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -164,11 +164,11 @@ "Delta" msgstr "Отиване на предишната операция" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Отиване на следващата операция" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -176,11 +176,11 @@ "Delta" msgstr "Отиване на следващата операция" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Отиване на предишния конфликт" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -188,11 +188,11 @@ "Conflict" msgstr "Конфликти" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Отиване на следващия конфликт" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -200,11 +200,11 @@ "Conflict" msgstr "Отиване на следващия конфликт" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Отиване на предишния неразрешен конфликт" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -212,11 +212,11 @@ "Unsolved" msgstr "Нерешен" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Отиване на следващия неразрешен конфликт" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -224,43 +224,43 @@ "Unsolved" msgstr "Нерешен" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Маркирайте ред(ове) от А" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Маркирайте ред(ове) от Б" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Маркирайте ред(ове) от В" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Автоматично прехвърляне към следващия нерешен конфликт, след избиране на " "източник" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy #| msgid "Auto Select" msgid "" @@ -268,31 +268,31 @@ "Next" msgstr "Автоматично маркиране" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Показване на символите за интервал и табулация за разлика" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Показване на интервалите" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Показване на номерата на редовете" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -300,181 +300,207 @@ "Numbers" msgstr "Показване на номерата на редовете" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Избиране на А навсякъде" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Избиране на Б навсякъде" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Избиране на В навсякъде" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Избиране на А за всички нерешени конфликти" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Избиране на Б за всички нерешени конфликти" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Избиране на В за всички нерешени конфликти" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Избиране на А за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Избиране на Б за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Избиране на В за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Автоматично разрешаване на простите конфликти" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Задаване на действията за конфликти" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Изпълнение на автосливане на регулярни изрази" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Автоматично разрешаване на конфликтите в историята" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Разделяне на разликата при маркираното" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Сливане на маркираните файлове" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Показване на прозорец А" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Показване на прозорец Б" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Показване на прозорец В" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Фокусиране на следващия прозорец" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Нормален изглед" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Изглед на А срещу Б" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Изглед на А срещу В" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Изглед на Б срещу В" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Пренасяне на думите за различните прозорци" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Добавяне на ръчно подравняване на разликите" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Изчистване на на ръчно подравняване на разликите" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Фокусиране върху предишния прозорец" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Превключване към разделена подредба" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Разделен изглед на директория и текст" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Превключване между изглед на директория и текст" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "В готовност." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Резултатът от сливането не е записан." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Запис и изход" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Изход без запис" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Записът на резултата от сливането беше неуспешен." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "В момента извършвате сливане на директории. Сигурни ли сте, че искате да го " "прекъснете?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Запис на файл..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Запис на файл с ново име..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Printing..." +msgid "Printing..." +msgstr "Отпечатване..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Най-горна линия" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Selection" +msgid "Selection" +msgstr "Маркираното" + +#: kdiff3.cpp:977 +#, fuzzy +#| msgid "Merge operation complete." +msgid "Printing completed." +msgstr "Операцията по сливане завърши." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Излизане..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Превключване на лентата с инструменти..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Превключване на лентата за състоянието..." @@ -573,29 +599,29 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Грешка по време на копиране: Записът беше неуспешен. Име на файл: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Четене на директория: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Списък на директория: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" "Записът на данните от системния буфер във временния файл беше неуспешен." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "От системния буфер" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -611,7 +637,7 @@ "\n" "Командата за предварителна обработка ще бъде неактивна." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -628,7 +654,7 @@ "Командата за предварителна обработка за сравняване на редове ще бъде " "неактивна." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -636,7 +662,7 @@ "Грешка от загуба на данни:\n" "Ако продължава, моля, свържете се с автора.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Сериозна вътрешна грешка" @@ -658,8 +684,8 @@ msgid "C (Optional):" msgstr "В (по избор):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Сливане" @@ -786,7 +812,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -969,7 +995,7 @@ "Включено: Всичко маркирано се записва веднага в системния буфер.\n" "Изключено: Трябва изрично да копирате, например с Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Стил за край на реда:" @@ -1255,8 +1281,10 @@ "(Подобно на командата \"--auto\".)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Сливане на директории" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Директория" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1917,7 +1945,7 @@ msgid "file3 to open" msgstr "да се отвори файл 3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1935,10 +1963,6 @@ msgid "Line not available" msgstr "не е наличен" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Най-горна линия" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Край" @@ -2009,26 +2033,26 @@ msgid "Linediff: A <-> C" msgstr "Разлика на ред: A <-> B" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Всички входни файлове са двоично еднакви." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "Входните файлове съдържат еднакъв текст, но не са двоично еднакви." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файлове %1 и %2 са двоично еднакви.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Файлове %1 и %2 са с еднакъв текст, но не са двоично еднакви. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2039,55 +2063,55 @@ "информация.\n" "Продължавате на собствена отговорност." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Прекъсване" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Продължение на сливането" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Отваряне на файлове..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Грешка при отваряне на файл" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Изрязване на маркираното..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Копиране на маркираното в системния буфер..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Вмъкване съдържанието на системния буфер..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Запис и продължение" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Продължение без запис" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Търсенето завърши." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Търсенето завърши" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Нищо не е избрано в прозореца за разлики." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Грешка при ръчно добавяне на охват за разликите" @@ -2106,70 +2130,70 @@ "Това обикновено се случва поради проблеми с инсталацията. за повече " "информация, моля, прочетете README-файла в инсталационния пакет." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Комбинация от препратки и нормални файлове." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Препратка: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Създаването на временно копие на %1 беше неуспешно." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Отварянето на %1 беше неуспешно." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Сравняване на файл..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Грешка по време на четене от %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Статус" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Запълнено" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Празно" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2177,34 +2201,34 @@ "В момента извършвате сливане на директория. Сигурни ли сте, че искате да " "прекъснете сливането и да сканирате отново директорията?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Ново сканиране" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Отварянето на директориите беше неуспешно:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Директория А \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Директория Б \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Директория В \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Грешка при отваряне на директория" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2214,129 +2238,129 @@ "същата като А или Б.\n" "Проверете отново преди да продължите." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Предупреждение за параметър" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Сканиране на директориите..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Четене на директория А" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Четене на директория Б" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Четене на директория В" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Някои от поддиректориите са нечетими" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Проверете правата на поддиректориите." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Статус на сравняването на директории" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Бройка на поддиректориите:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Бройка на еднаквите файлове:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Бройка на различните файлове:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Бройка на ръчните сливания:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Това засяга всички операции по сливане." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Промяна на всички операции по сливане" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Задача." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Копиране на А в Б" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Копиране на Б в А" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Изтриване на А" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Изтриване на Б" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Сливане с А" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Сливане с Б" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Сливане с А и Б" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Изтриване (ако съществува)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Сливане (ръчно)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Грешка: Конфликт в типовете на файлове" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датите са еднакви, но файловете не са." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Това действие в момента не е възможно." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Действието не е възможно" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2351,48 +2375,48 @@ "Ако знаете как да го направите отново, моля, свържете се с автора на " "програмата." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Програмна грешка" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Възникна грешка по време на копирането.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Грешка." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Грешка при сливане" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Грешка." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Изпълнено." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Не е записан." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операция за сливане. (Това не трябва да се случва никога!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Непозната операция за сливане." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2411,19 +2435,19 @@ "Имайте предвид, че тази програма е все още бета версия и изобщо НЯМА " "ГАРАНЦИЯ! Правете резервни копия на важната информация!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Стартиране на сливането" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Изпълнение" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Симулация" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2431,7 +2455,7 @@ "Осветеният елемент има различни типове в различните директории. Изберете " "какво да се направи." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2439,7 +2463,7 @@ "Датите на последна промяна на файловете са еднакви, но файловете не са. " "Изберете какво да се направи." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2447,7 +2471,7 @@ "В момента действието е невъзможно, тъй като тече процес на сливане на " "директории." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2457,222 +2481,222 @@ "Искате ли да продължите с елемента, който е причинил тази грешка или ще го " "прескочите?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Продължаване на сливането след грешката" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Продължаване с последния елемент" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Прескачане на елемент" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Прескочен." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Изпълнява се..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Операцията по сливане завърши." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Сливането завърши" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симулацията на сливане завърши: Проверете дали сте съгласни с предложените " "действия." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Възникнала е грешка. Натиснете \"ОК\", за да видите подробна информация.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Грешка: По време на изтриването на %1: Създаването на резервно копие беше " "неуспешно." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурсивно изтриване на директория( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "изтриване( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: операцията по изтриване беше неуспешна при опит за четене на " "директорията." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: операцията по изтриване на директория( %1 ) беше неуспешна." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Грешка: операцията по изтриване беше неуспешна." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ръчно сливане( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Забележка: След ръчно сливане, потребителят трябва да натисне клавиш " "F7, за да продължи." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирането на ( %1 -> %2 ) беше неуспешно. Изтриването на " "съществуващото местоназначение е неуспешно." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "копиране на препратка( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: копирането на препратка беше неуспешно: Отдалечени препратки не се " "поддържат." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Грешка: копирането на препратка беше неуспешно." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "копиране( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка по време на преименуване( %1 -> %2 ): Изтриването на съществуващото " "местоназначение беше неуспешно." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "преименуване( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Грешка: Преименуването беше неуспешно." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка по време на създаване на директория %1. Не може да се изтрие " "съществуващ файл." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "създаване на директория( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Грешка по време на създаване на директория." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Местоназначение" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Директория" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Атрибути" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Последна промяна" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Местоназначение на препратката" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "не е наличен" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "А (местоназначение): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "Б (местоназначение): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "В (местоназначение): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Местоназначение: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Запис състоянието при сливане като..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Стартиране/Продължение на сливането на директория" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Стартиране на операцията за текущия елемент" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Сливане на текущия файл" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2680,39 +2704,39 @@ "File" msgstr "Сливане" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Скриване на всички поддиректории" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Показване на всички поддиректории" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Изберете А за всички елементи" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Изберете Б за всички елементи" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Изберете В за всички елементи" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Автоматично избиране на операция за всички елементи" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Без операция за всички елементи" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Показване на идентични файлове" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 #, fuzzy #| msgid "Show Identical Files" msgid "" @@ -2720,15 +2744,15 @@ "Files" msgstr "Показване на идентични файлове" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Показване на различните файлове" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Показване на файлове само в A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 #, fuzzy #| msgid "Show Files only in A" msgid "" @@ -2736,11 +2760,11 @@ "only in A" msgstr "Показване на файлове само в A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Показване на файлове само в B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 #, fuzzy #| msgid "Show Files only in B" msgid "" @@ -2748,11 +2772,11 @@ "only in B" msgstr "Показване на файлове само в B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Показване на файлове само в C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 #, fuzzy #| msgid "Show Files only in C" msgid "" @@ -2760,35 +2784,35 @@ "only in C" msgstr "Показване на файлове само в C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Сливане на маркираните файлове" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Да не се прави нищо" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "А" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "Б" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "В" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Сливане в А и Б" @@ -2800,13 +2824,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Продължение" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -3071,11 +3095,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Сливане на конфликт (Само интервали)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Сливане на конфликт>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3083,12 +3107,19 @@ "Все още не всички конфликти са решени.\n" "Файлът не е записан.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Оставащи конфликти" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3097,28 +3128,42 @@ "\n" "Създаването на резервно копие беше неуспешно. Файлът не е записан." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Грешка при запис на файл" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Грешка по време на запис." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Резултат" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Променен]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Кодова таблица" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Конфликти" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Кодек от" @@ -3155,3 +3200,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "отправна" + +#~ msgid "Directory Merge" +#~ msgstr "Сливане на директории"
--- a/kdiff3/po/br/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/br/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n" "Language-Team: br <LL@li.org>\n" @@ -13,227 +13,227 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fazi er dibarzh kefluniañ :" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Fazi en ur enrollañ." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fazi en ur zigeriñ ar restr" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Prest." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Enrollañ a ra an teul red e ..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Kuitaat a ra ar meziant" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Eilañ a ra an dachenn dibabet er golver" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Kuzhat/Diskouez ar varenn stad" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Kefluniañ KDiff3 ..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy #| msgid "Auto Select" msgid "" @@ -241,31 +241,31 @@ "Next" msgstr "Dibab ent emgefreek" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Diskouez niverennoù linenn" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -273,179 +273,203 @@ "Numbers" msgstr "Diskouez niverennoù linenn" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Diskouez ar prenestr A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Diskouez ar prenestr B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Diskouez ar prenestr C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Fokuz ouzh ar brenestr a-heul" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Fokuz ouzh ar brenestr diaraok" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Prest." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Enrollañ && kuitaat" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Kuitaat hep enrollañ" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Emaon oc'h enrollañ ar restr ..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Oc'h enrollañ ar restr gant un anv restr nevez ..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Printing..." +msgid "Printing..." +msgstr "Emaon o voulañ ..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Selection" +msgid "Selection" +msgstr "Diuzadenn" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Echu eo moulañ." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Nullet eo ar voulañ." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Emaon o kuitaat ..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Emaon o kuzhat/diskouez ar varenn ostilh ..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Diskouez/Kuzhat ar varenn stad ..." @@ -534,28 +558,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Emaon o lenn ar renkell :" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Eus ar golver" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -565,7 +589,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -575,13 +599,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Fazi diabarzh grevus" @@ -603,8 +627,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Dastum" @@ -727,7 +751,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -902,7 +926,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1145,8 +1169,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Renkell" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1712,7 +1738,7 @@ msgid "file3 to open" msgstr "restr3 da zigeriñ" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1730,10 +1756,6 @@ msgid "Line not available" msgstr "n'eo ket da gaout" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Dibenn" @@ -1801,81 +1823,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Paouez" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Emaon o tigeriñ ar restroù ..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fazi en ur zigeriñ ar restr" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "O troc'hañ an dibab ..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Oc'h eilañ an dibab d'ar golver ..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Enrollañ && Kenderc'hel" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Echu eo ar glask." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1886,232 +1908,232 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Liamm : " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Ment. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Deiziad ha ment : " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Sac'het eo digeiñ ar restr %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Fazi en ur less eus %1." -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Anv" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Ober" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Stad" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Gwenn" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Sac'het eo digeriñ ar renkelloù :" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Fazi en ur zigeriñ ar renkell" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Emaon o tielfennañ ar renkelloù ..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Emaon o lenn ar renkell A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Emaon o lenn ar renkell B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Emaon o lenn ar renkell C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Niver a is-renkelloù :" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "O treterez " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Traoù d'ober." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Eilañ A da B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Eilañ B da A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Lemel A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Lemel B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Lemel A & B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2120,48 +2142,48 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Fazi gant ar meziant" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Degouezhet ez eus ar fazi en ur eilañ.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Fazi." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Fazi en ur dastum" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fazi." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Graet." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "N'eo ket enrollet." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2173,242 +2195,242 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Tremen an dra" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Tremenet." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Ober a ran ..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Degouezhet ez eus ar fazi. Gwaskit OK da welet an titouroù munut.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "dilemel( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fazi : sac'het eo lemel." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "eilañ( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "adenvel( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Fazi en ur c'hrouiñ ur renkell." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dehaez." -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Renkell" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Seurt" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Ment" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Kemm diwezhañ" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Liamm dehaezadur" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "n'eo ket da gaout" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dehaez. : " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2416,53 +2438,53 @@ "File" msgstr "Dastum" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 #, fuzzy #| msgid "Show Files only in A" msgid "" @@ -2470,11 +2492,11 @@ "only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 #, fuzzy #| msgid "Show Files only in B" msgid "" @@ -2482,11 +2504,11 @@ "only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 #, fuzzy #| msgid "Show Files only in C" msgid "" @@ -2494,35 +2516,35 @@ "only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ober netra" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "G" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Lemel A && B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2534,13 +2556,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Kenderc'hel" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2790,49 +2812,68 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fazi en ur skrivañ." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Ezkas" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Kemmet]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -2886,12 +2927,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Diskouez/Kuzhat ar varrenn &ostilhoù" -#~ msgid "Printing aborted." -#~ msgstr "Nullet eo ar voulañ." - -#~ msgid "Printing completed." -#~ msgstr "Echu eo moulañ." - #~ msgid "Swap" #~ msgstr "Disloañ"
--- a/kdiff3/po/cs/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/cs/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-10-12 20:02+0200\n" "Last-Translator: Vit Pelcak <vit@pelcak.org>\n" "Language-Team: Český <cs@li.org>\n" @@ -19,155 +19,155 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Aktuální nastavení:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Chyba volby nastavení:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Chyba otvírání souboru" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Otevře dokumenty pro porovnání..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Obnovit" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Uloží výsledek spojení. Musí být vyřešeny všechny konflikty!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Uloží aktuální dokument jako..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Ukončí aplikaci" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Vyjme současný výběr a umístí jej do schránky" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Zkopíruje vybranou sekci do schránky" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Vloží současný obsah schránky na aktuální pozici" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Hledání řetězce" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Další hledání řetězce" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Povolí/zakáže stavovou lištu" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Nastavit: KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -175,11 +175,11 @@ "Conflict" msgstr "Konfilkty" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Conflicts" msgid "" @@ -187,11 +187,11 @@ "Conflict" msgstr "Konfilkty" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -199,11 +199,11 @@ "Unsolved" msgstr "Nevyřešeno" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -211,41 +211,41 @@ "Unsolved" msgstr "Nevyřešeno" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy #| msgid "Auto Select" msgid "" @@ -253,209 +253,235 @@ "Next" msgstr "Automatický výběr" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Připraven." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Ukládám soubor..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Ukládám soubor pod jiným názvem..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Printing..." +msgid "Printing..." +msgstr "Tisknu..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Selection" +msgid "Selection" +msgstr "Výběr" + +#: kdiff3.cpp:977 +#, fuzzy +#| msgid "Merge Complete" +msgid "Printing completed." +msgstr "Slučování dokončeno" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Ukončuji..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Přepínání panelu nástrojů..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Přepnout stavovou lištu..." @@ -544,28 +570,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Zápis dat schránky do dočasného souboru selhal." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Ze schránky" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -575,7 +601,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -585,7 +611,7 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -593,7 +619,7 @@ "Chyba, ztracená data:\n" "Pokud lze chybu reprodukovat, kontaktujte autora.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Závažná interní chyba" @@ -615,8 +641,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Sloučit" @@ -739,7 +765,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -912,7 +938,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1151,8 +1177,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Adresář" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1720,7 +1748,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Soubor" @@ -1736,10 +1764,6 @@ msgid "Line not available" msgstr "nedostupný" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Konec" @@ -1807,81 +1831,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Přerušit" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Pokračovat se slučováním" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Vyjímám výběr..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Kopíruji výběr do schránky..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Vkládám obsah schránky..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1892,103 +1916,103 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Směs odkazů a běžných souborů." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Odkaz: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Velikost" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Datum a velikost: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Vytváření dočasné kopie %1 selhalo." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Otevření %1 selhalo." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Porovnání souborů..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Chyba čtení z %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Jméno" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operace" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Stav" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Nevyřešeno" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Vyřešeno" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nebílý" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Bílá" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Znovu prohledat" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Otvírání adresářů selhalo:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Adresář A \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Adresář B \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Adresář C \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Chyba otvírání adresáře" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -1997,129 +2021,129 @@ "Cílový adresář nesmí být při slučování tří adresářů shodný s A nebo B.\n" "Před pokračováním proveďte kontrolu." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Prohledávání adresářů..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Čtení adresáře A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Čtení adresáře B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Čtení adresáře C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Některé podadresáře byly nečitelné v" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Zkontrolujte oprávnění podadresářů." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Stav porovnání adresářů" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Počet podadresářů:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Počet shodných souborů:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Počet rozdílných souborů:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Počet ručních sloučení:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Toto ovlivňuje všechna slučování." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Zpracovávání " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Udělat." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Zkopírovat A do B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Zkopírovat B do A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Smazat A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Smazat B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Sloučit do A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Sloučit do B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Sloučit do A a B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Smazat (pokud existuje)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Sloučit (ručně)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Chyba: Konflikt typů souborů" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Chyba: Data jsou shodná ale soubory nikoliv." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Tato operace není nyní možná." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operace není možná" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2133,46 +2157,46 @@ "\n" "Pokud tuto situaci umíte reprodukovat, kontaktujte prosím autora programu." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Chyba programu" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Během kopírování se stala chyba.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Chyba" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Chyba slučování" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Chyba." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Hotovo." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Neuloženo." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Neznámá slučovací operace." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2184,242 +2208,242 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Pokračovat se slučováním po chybě" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Přeskočit položku" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Přeskočeno." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Slučování dokončeno" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" +#: directorymergewindow.cpp:2544 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2570 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#: directorymergewindow.cpp:2576 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2585 +msgid "Error: Rename failed." +msgstr "" + +#: directorymergewindow.cpp:2603 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + #: directorymergewindow.cpp:2619 #, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2645 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#: directorymergewindow.cpp:2651 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2660 -msgid "Error: Rename failed." -msgstr "" - -#: directorymergewindow.cpp:2678 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#: directorymergewindow.cpp:2694 -#, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Velikost" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "nedostupný" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2427,107 +2451,107 @@ "File" msgstr "Sloučit" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Zobrazit identické soubory" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Zobrazit rozdílné soubory" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nedělat nic" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Sloučit do A a B" @@ -2539,11 +2563,11 @@ msgid "KDiff3Part" msgstr "" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Pokračovat" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Ukončit" @@ -2788,49 +2812,70 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Chyba ukládání souboru" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Výstup" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Konfilkty" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Kodek od"
--- a/kdiff3/po/cs/kdiff3plugin.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/cs/kdiff3plugin.po Tue Mar 03 23:50:12 2009 +0000 @@ -2,18 +2,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Vit Pelcak, 2008. +# Vit Pelcak <vit@pelcak.org>, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-08-05 08:32+0200\n" -"PO-Revision-Date: 2008-11-23 13:35+0100\n" -"Last-Translator: Vit Pelcak\n" +"PO-Revision-Date: 2009-01-29 10:02+0100\n" +"Last-Translator: Vit Pelcak <vit@pelcak.org>\n" "Language-Team: Czech <kde-i18n-doc@lists.kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: kdiff3plugin.cpp:107
--- a/kdiff3/po/cy/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/cy/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Language-Team: cy <LL@li.org>\n" @@ -11,158 +11,158 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Parod." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Terfynu'r cymhwysiad" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copïo'r adran dewisiedig i'r gludfwrdd" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Gludo cynnwys y gludfwrdd i'r fan wirioneddol" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Galluogi/analluogi'r bar cyflwr" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -170,11 +170,11 @@ "Conflict" msgstr "Gwrthdrawiadau" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Conflicts" msgid "" @@ -182,270 +182,294 @@ "Conflict" msgstr "Gwrthdrawiadau" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "dim detholiad" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Parod." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Gorffen heb gadw" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Yn cadw ffeil..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Printing..." +msgid "Printing..." +msgstr "Argraffu..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Selection" +msgid "Selection" +msgstr "Dewisiad" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Terfynu..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Dangos/cuddio'r bar offer..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Dangos/cuddio'r bar cyflwr..." @@ -534,28 +558,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -565,7 +589,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -575,13 +599,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "" @@ -603,8 +627,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Cyfuno" @@ -728,7 +752,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -904,7 +928,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Arddull pen y llinell:" @@ -1144,8 +1168,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Cyfeiriadur" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1706,7 +1732,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1724,10 +1750,6 @@ msgid "Line not available" msgstr "dim ar gael" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Diwedd" @@ -1795,81 +1817,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Erthylu" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Gwall agor ffeil" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Yn torri'r dewisiad..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Yn copïo'r dewisiad i'r clipfwrdd..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Yn mewnosod cynnwys y clipfwrdd..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1880,233 +1902,233 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Cyswllt : " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 #, fuzzy msgid "Comparing file..." msgstr "Yn cadw ffeil..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Enw" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Gweithrediad" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Cyflwr" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Gwyn" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Ailsyllu" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2115,48 +2137,48 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Gwall." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Gwall." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Wedi'i wneud." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2168,242 +2190,242 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" +#: directorymergewindow.cpp:2544 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2570 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#: directorymergewindow.cpp:2576 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2585 +msgid "Error: Rename failed." +msgstr "" + +#: directorymergewindow.cpp:2603 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + #: directorymergewindow.cpp:2619 #, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2645 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#: directorymergewindow.cpp:2651 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2660 -msgid "Error: Rename failed." -msgstr "" - -#: directorymergewindow.cpp:2678 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#: directorymergewindow.cpp:2694 -#, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Math" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Maint" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "dim ar gael" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2411,107 +2433,107 @@ "File" msgstr "Cyfuno" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2523,13 +2545,13 @@ msgid "KDiff3Part" msgstr "" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Mynd ymlaen" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2775,49 +2797,70 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Allbwn" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Gwrthdrawiadau" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr ""
--- a/kdiff3/po/da/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/da/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-01-23 21:58+0100\n" "Last-Translator: Martin Schlander <suse@linuxin.dk>\n" "Language-Team: <dansk@dansk-gruppen.dk>\n" @@ -18,97 +18,97 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Nuværende indstilling:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fejl i indstillingstilvalg:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Tilvalg --auto brugt, men ingen uddatafil angivet." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Tilvalg --auto ignoreret for mappesammenligning." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Det mislykkedes at gemme." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Det mislykkedes at åbne disse filer:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fejl ved åbning af fil" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Åbner dokumenter til sammenligning..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Klar." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "gemmer indfletningsresultatet. Alle konflikter skal løses!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Gemmer dette dokument som..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Udskriv forskellene" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Afslutter programmet" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Udklipper det markerede udvalg og lægger det på klippebordet" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopierer det valgte udsnit til klippebordet" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Indsætter klippebordets indhold på den aktuelle position" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Markér alting i nuværende vindue" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Søg efter en streng" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Søg efter strengen igen" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Slår statuslinjen til/fra" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Indstil KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Gå til den aktuelle delta" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -116,11 +116,11 @@ "Delta" msgstr "Gå til den aktuelle delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Gå til første delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -128,11 +128,11 @@ "Delta" msgstr "Gå til første delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Gå til sidste delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -140,13 +140,13 @@ "Delta" msgstr "Gå til sidste delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Springer over forskelle i blanke tegn når \"Vis blanke tegn\" er " "deaktiveret.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -154,11 +154,11 @@ "(Springer ikke over forskelle i blanke tegn også selvom \"Vis blanke tegn\" " "er deaktiveret.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Gå til forrige delta" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -166,11 +166,11 @@ "Delta" msgstr "Gå til forrige delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Gå til næste delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -178,11 +178,11 @@ "Delta" msgstr "Gå til næste delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -190,11 +190,11 @@ "Conflict" msgstr "Konflikter" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Gå til næste konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -202,11 +202,11 @@ "Conflict" msgstr "Gå til næste konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -214,11 +214,11 @@ "Unsolved" msgstr "Uløst" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Gå til næste uløste konflikt" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -226,41 +226,41 @@ "Unsolved" msgstr "Uløst" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Vælg linjer fra A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Vælg linjer fra B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Vælg linjer fra C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå til næste uløste konflikt automatisk efter kildevalg" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy #| msgid "Auto Select" msgid "" @@ -268,31 +268,31 @@ "Next" msgstr "Automatisk markering" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Vis mellemrums && tabulator-tegn for forskelle" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Vis blanke tegn" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -300,181 +300,205 @@ "Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Vælg A overalt" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Vælg B overalt" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Vælg C overalt" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Vælg A for alle uløste konflikter" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Vælg B for alle uløste konflikter" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Vælg C for alle uløste konflikter" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vælg A for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vælg B for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vælg C for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Løs simple konflikter automatisk" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Sæt deltaer til konflikter" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Kør automatisk sammenfletning med regulært udtryk" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Løs historikkonflikter automatisk" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Opdel sammenligning ved markering" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Føj markerede sammenligninger sammen" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Vis vindue A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Vis vindue B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Vis vindue V" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Fokus på næste vindue" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normalt overblik" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A vs. B overblik" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A vs. C overblik" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B vs. C overblik" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Tekstombrydning i diff-vinduer" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Tilføj manuel justering af sammenligning" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Ryd alle manuelle justeringer af sammenligning" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Fokus på forrige vindue" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Slå opdelt orientering til og fra" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Mappe && tekst opdelt skærmvisning" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Skift mellem Mappe && tekstvisning" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Klar." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Indfletningsresultatet er ikke blevet gemt." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Gem && afslut" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Afslut uden at gemme" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Det mislykkedes at gemme indfletningsresultatet." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Du er ved at udføre en mappeindfletning. Er du sikker på du ønskler at " "afbryde?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Gemmer fil..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Gemmer fil med nyt filnavn..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Printing..." +msgid "Printing..." +msgstr "Udskriver..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Toplinje" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Selection" +msgid "Selection" +msgstr "Markering" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Udskrift færdig." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Udskrift afbrudt." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Går ud..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Slår værktøjslinje til/fra" -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Slå statuslinje til/fra..." @@ -572,28 +596,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fejl under kopieringsoperationen: Skrivning mislykkedes. Filnavn: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Læser mappe:" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Giver en liste af mappe: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning af klippebordsdata til midlertidig fil mislykkedes." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Fra klippebord" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -608,7 +632,7 @@ "\n" "Forbehandlingskommandoen vil blive deaktiveret nu." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -624,7 +648,7 @@ "\n" "Forbehandlingskommandoen til linje-matchning vil blibe deaktiveret nu." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -632,7 +656,7 @@ "Fejl med datatab:\n" "Hvis dette kan gentages so kontakt venligst forfatteren.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Alvorlig intern fejl" @@ -654,8 +678,8 @@ msgid "C (Optional):" msgstr "C (Frivillig):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Indflet" @@ -785,7 +809,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -966,7 +990,7 @@ "Til: Enhver markering bliver umiddelbart skrevet til klippebordet.\n" "Fra: Du skal eksplicit kopiere f.eks. via Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Linjeslut-stil:" @@ -1256,8 +1280,10 @@ "(Ligesom kommandolinjetilvalget \"--auto\".)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Mappeindfletning" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Mappe" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1905,7 +1931,7 @@ msgid "file3 to open" msgstr "fil3 der skal åbnes" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1923,10 +1949,6 @@ msgid "Line not available" msgstr "ikke tilgængelig" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Toplinje" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Slut" @@ -1998,28 +2020,28 @@ msgid "Linediff: A <-> C" msgstr "Linjeforskel: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Alle inddata-filer er binært ens." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Alle inddata-filer indeholder den samme tekst, men er ikke binært " "ækvivalente." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filerne %1 og %2 er binært ens.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Filerne %1 og %2 har samme tekst men er ikke binært ens.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2029,55 +2051,55 @@ "Bemærk at KDiff3-indfletningen ikke er beregnet til binære data.\n" "Fortsæt på eget ansvar." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Afbryd" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Fortsæt med indfletning" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Åbner filer..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fejl ved åbning af fil" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Klipper valgene ud..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Kopierer valgene til klippebord..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Indsætter klippebordets indhold..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Gem && Fortsæt" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Fortsæt uden at gemme" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Søgning færdig." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Søgning færdig" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Ingenting er markeret i inddatavindue med sammenligning." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Fejl ved tilføjelse manuelt sammenligningsområde" @@ -2096,70 +2118,70 @@ "Dette sker sædvanligvis på grund af et installationsproblem. Læs venligst " "README-filen i kildepakken for detaljer." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Blanding af link og normale filer." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Størrelse. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Dato & Størrelse: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Oprettelse af midlertidig kopi af %1 mislykkedes." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Åbning af %1 mislykkedes." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Sammenligner fil..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Fejl ved læsning fra %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Ikke-hvid" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Hvid" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2167,34 +2189,34 @@ "Du er ved at udføre en mappeindfletning. Er du sikker på at du ønsker at " "afbryde indfletningen og skanne mappen igen?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Genskan" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Det mislykkedes at åbne mapper:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Mappen A \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Mappen B \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Mappen C \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Fejl ved åbning af mappe" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2204,129 +2226,129 @@ "sammen.\n" "Tjek igen før du fortsætter." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameteradvarsel" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Skanner mapper..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Læser mappen A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Læser mappen B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Læser mappen C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Nogle undermapper kunne ikke læses i" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Tjek tilladelser for undermapperne." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status for mappesammenligning" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Antal undermapper:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Antal ens filer:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Antal forskellige filer:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Antal manuelle indfletninger:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Dette påvirker alle indfletningsoperationer." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Ændrer alle indfletningsoperationer" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Behandler" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "At gøre." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Kopiér A til B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Kopiér B til A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Slet A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Slet B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Slet A & B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Indflet til A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Indflet til B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Indflet til A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Slet (hvis det eksisterer)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Indflet (manuelt)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Fejl: Filtyper i konflikt" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Fejl: Datoer er ens men filer er ikke." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Denne operation er ikke mulig for øjeblikket." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operation ikke mulig" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2340,48 +2362,48 @@ "\n" "Hvis du ved hvordan dette kan reproduceres, så kontakt programmets forfatter." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programfejl" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Der opstod en fejl mens der kopieredes.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Fejl." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Indfletningsfejl" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fejl." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Færdig." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Ikke gemt." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukendt indfletningsoperation. (Dette skulle ikke kunne ske!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Ukendt indfletningsoperation." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2400,19 +2422,19 @@ "Vær klar over at dette program stadig har beta-status og der er INGEN " "GARANTI overhovedet! Lav sikkerhedskopier af dine vitale data!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Starter indfletning" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Gør det" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulér det" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2420,7 +2442,7 @@ "Det frem,hævede punkt har forskellig type i de forskellige mapper. Vælg hvad " "der skal gøres." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2428,7 +2450,7 @@ "Ændringsdatoerne for filerne er ens, men filerne er ikke ens. Vælg hvad der " "skal gøres." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2436,7 +2458,7 @@ "Denne operation er ikke mulig lige nu da mappe-indfletningen kører for " "øjeblikket." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2446,210 +2468,210 @@ "Ønsker du at fortsætte punktet der forårsagede fejlen eller ønsker du at " "springe over dette punkt?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Fortsæt med indfletning efter en fejl" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Fortsæt med det sidste punkt" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Spring over punkt" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Sprunget over." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "I fremgang..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Indfletningsoperation færdig." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Indfletning færdig" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simuleret indfletning færdig: Tjek om du er enig i de foreslåede operationer." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Der opstod en fejl. Tryk på o.k. for at se detaljeret information.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fejl: Under sletning af %1: Det mislykkedes at lave sikkerhedskopi." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "slet mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "slet( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fejl: 'slet mappe'-operation mislykkedes under forsøget på at læse mappen." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fejl: rmdir( %1 ) operation mislykkedes." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fejl: slet-operation mislykkedes." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuel indfletning( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Bemærk: Efter en manuel indfletning skal brugeren fortsætte ved at " "trykke på F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fejl: copy( %1 -> %2 ) mislykkedes. Sletning af eksisterende mål mislykkedes." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fejl: copyLink mislykkedes: Eksterne link er endnu ikke understøttede." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Fejl: copyLink mislykkedes." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fejl under rename( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Fejl: Omdøbning mislykkedes." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fejl ved makeDir af %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Fejl ved oprettelse af mappe." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Sidste ændring" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Link-destination" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "ikke tilgængelig" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Gem tilstand for mappesammenfletning som..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Start/Fortsæt mappeindfletning" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Kør operation for dette punkt" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Sammenlign udvalgt fil" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Indflet udvalgt fil" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2657,39 +2679,39 @@ "File" msgstr "Indflet" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Fold alle undermapper sammen" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Fold alle undermapper ud" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Vælg A for alle punkter" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Vælg B for alle punkter" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Vælg C for alle punkter" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Auto-vælg operation for alle punkter" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Ingen operation for alle punkter" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 #, fuzzy #| msgid "Show Identical Files" msgid "" @@ -2697,15 +2719,15 @@ "Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Vis forskellige filer" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Vis kun filer i A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 #, fuzzy #| msgid "Show Files only in A" msgid "" @@ -2713,11 +2735,11 @@ "only in A" msgstr "Vis kun filer i A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Vis kun filer i B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 #, fuzzy #| msgid "Show Files only in B" msgid "" @@ -2725,11 +2747,11 @@ "only in B" msgstr "Vis kun filer i B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Vis kun filer i C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 #, fuzzy #| msgid "Show Files only in C" msgid "" @@ -2737,35 +2759,35 @@ "only in C" msgstr "Vis kun filer i C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Sammenlign eksplicit markerede filer" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Sammenflet eksplicit markerede filer" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Gør intet" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Slet A && B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Indflet til A && B" @@ -2777,13 +2799,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Fortsæt" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -3049,11 +3071,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Indfletningskonflikt (kun blanke tegn)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Indfletningskonflikt>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3061,12 +3083,19 @@ "Ikke alle konflikter er løst endnu.\n" "Filen er ikke gemt.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Konflikter tilovers" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3075,28 +3104,42 @@ "\n" "Mislykkedes at oprette sikkerhedskopi. Filen blev ikke gemt." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fejl ved at gemme fil" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fejl ved skrivning." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Uddata" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Ændret]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Filtegnsæt for at gemme" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Konflikter" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Koder fra" @@ -3134,6 +3177,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "Mappeindfletning" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -3147,11 +3193,5 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Slå værktøjslinjen til/fra" -#~ msgid "Printing aborted." -#~ msgstr "Udskrift afbrudt." - -#~ msgid "Printing completed." -#~ msgstr "Udskrift færdig." - #~ msgid "Ignored. (User defined.)" #~ msgstr "Ignoreres. (brugerdefineret)"
--- a/kdiff3/po/de/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/de/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -4,15 +4,15 @@ # Joachim Eibl <joachim@gmx.de>, 2004. # Joachim Eibl <joachim.eibl@gmx.de>, 2004, 2005, 2006. # Thomas Reitelbach <tr@erdfunkstelle.de>, 2004, 2006. -# Frederik Schwarzer <schwarzerf@gmail.com>, 2008. +# Frederik Schwarzer <schwarzerf@gmail.com>, 2008, 2009. # Burkhard Lück <lueck@hube-lueck.de>, 2008. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-12-05 14:11+0100\n" -"Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-18 16:56+0100\n" +"Last-Translator: Frederik Schwarzer <schwarzerf@gmail.com>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,96 +20,96 @@ "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Aktuelle Einstellungen:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fehler in der Einstellungsoption:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Option --auto verwendet, aber keine Ausgabedatei angegeben." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto wird beim Vergleich von Ordnern ignoriert." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Speichern fehlgeschlagen." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Öffnen dieser Dateien ist fehlgeschlagen:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fehler beim Dateiöffnen" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Dateien für Vergleich öffnen ..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Neu laden" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Sichern des Zusammenführergebnisses. Alle Konflikte müssen aufgelöst sein." -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Speichert das aktuelle Dokument als ..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Unterschiede drucken" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Beendet das Programm" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Schneidet die Auswahl aus und kopiert sie in die Zwischenablage" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopiert den ausgewählten Bereich in die Zwischenablage" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Fügt den Inhalt der Zwischenablage an der aktuellen Position ein" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Alles in aktuellem Fenster auswählen" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Nach Text suchen" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Weitersuchen" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Blendet die Statusleiste ein/aus" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 einrichten ..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Zu aktuellem Unterschied springen" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -117,11 +117,11 @@ "Aktueller\n" "Unterschied" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Zum ersten Unterschied springen" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -129,11 +129,11 @@ "Erster\n" "Unterschied" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Zum letzten Unterschied springen" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -141,13 +141,13 @@ "Letzter\n" "Unterschied" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Unterschiede in Leerräumen werden übersprungen, wenn „Leerräume anzeigen“ " "ausgeschaltet ist.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -155,11 +155,11 @@ "(Unterschiede in Leerräumen werden nicht übersprungen, auch wenn „Leerräume " "anzeigen“ ausgeschaltet ist.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Zu vorigem Unterschied springen" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -167,11 +167,11 @@ "Voriger\n" "Unterschied" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Zu nächstem Unterschied springen" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -179,11 +179,11 @@ "Nächster\n" "Unterschied" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Zu vorigem Konflikt springen" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -191,11 +191,11 @@ "Voriger\n" "Konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Zu nächstem Konflikt springen" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -203,11 +203,11 @@ "Nächster\n" "Konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Zu vorigem ungelösten Konflikt springen" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -215,11 +215,11 @@ "Voriger\n" "Ungelöster" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Zu nächstem ungelöste Konflikt springen" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -227,11 +227,11 @@ "Nächster\n" "Ungelöster" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Zeile(n) von A wählen" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -239,11 +239,11 @@ "Wähle\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Zeile(n) von B wählen" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -251,11 +251,11 @@ "Wähle\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Zeile(n) von C wählen" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -263,11 +263,11 @@ "Wähle\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatisch zu nächstem ungelösten Konflikt weiterspringen" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -275,11 +275,11 @@ "Automatisch\n" "zum nächsten" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Leer- und Tabulator-Zeichen in Unterschieden anzeigen" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -287,11 +287,11 @@ "Leer-\n" "räume" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Leerräume anzeigen" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -299,11 +299,11 @@ "Leerraum-\n" "Unterschiede" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Zeilennummern anzeigen" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -311,181 +311,201 @@ "Zeilen-\n" "nummern" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Für alle A wählen" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Für alle B wählen" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Für alle C wählen" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte A wählen" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte B wählen" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte C wählen" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte A wählen" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte B wählen" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte C wählen" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Einfache Konflikte automatisch lösen" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Alle Unterschiede zu Konflikten machen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Zusammenführung über regulären Ausdruck starten" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Verlauf-Konflikte automatisch auflösen" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Unterschied bei der Auswahlsmarkierung trennen" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Markierte Unterschiede verbinden" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Fenster A anzeigen" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Fenster B anzeigen" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Fenster C anzeigen" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Nächstes Fenster aktivieren" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normale Übersicht" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A/B-Übersicht" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A/C-Übersicht" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B/C-Übersicht" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Zeilenumbruch für Vergleichsanzeige" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Manuelle Ausrichtung hinzufügen" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Alle manuellen Ausrichtungen entfernen" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Voriges Fenster aktivieren" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Ausrichtung der Fensterteilung umschalten" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Ordner- && Textansicht teilen sich Hauptfenster" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Zwischen Ordner- && Textansicht umschalten" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Bereit." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Das Zusammenführungsergebnis wurde nicht gespeichert." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Achtung" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Speichern && Beenden" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Ohne zu speichern beenden" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Speichern des Zusammenführungsergebnisses ist fehlgeschlagen." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Sie führen eine Ordnerzusammenführung durch. Sind Sie sicher, dass Sie diese " "beenden möchten?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Datei wird gespeichert ..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Datei wird unter neuem Namen gespeichert ..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Speichern unter ..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Drucke ..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Oberste Zeile" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Auswahl" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Drucken beendet." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Drucken abgebrochen." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Wird beendet ..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Werkzeugleiste anzeigen/ausblenden ..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Statusleiste anzeigen/ausblenden ..." @@ -581,28 +601,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fehler beim Kopieren: Schreiben fehlgeschlagen: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Ordner wird eingelesen:" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Ordner anzeigen: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Abbrechen" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Speichern der Zwischenablage in temporäre Datei ist fehlgeschlagen." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Aus Zwischenablage" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -618,7 +638,7 @@ "\n" "Diese Vorverarbeitung wird nun deaktiviert." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -635,7 +655,7 @@ "\n" "Der Vorverarbeitungsbefehl für Zeilenabgleich wird nun deaktiviert." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -644,7 +664,7 @@ "Falls das Problem reproduzierbar ist, nehmen Sie bitte Kontakt mit dem Autor " "auf.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Schwerwiegender interner Fehler" @@ -666,8 +686,8 @@ msgid "C (Optional):" msgstr "C (Optional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Zusammenführen" @@ -794,7 +814,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Abbrechen" @@ -982,7 +1002,7 @@ "kopiert.\n" "Sonst müssen Sie sie explizit kopieren, z. B. mit Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Zeilenende-Kodierung:" @@ -1072,7 +1092,7 @@ #: optiondialog.cpp:858 msgid "Align B and C for 3 input files" -msgstr "" +msgstr "B und C bei drei Eingabedateien abgleichen" #: optiondialog.cpp:861 msgid "" @@ -1080,6 +1100,11 @@ "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" +"Versuchen, B und C abzugleichen, wenn drei Dateien verglichen oder " +"zusammengeführt werden.\n" +"Dies ist für Zusammenführungen nicht empfohlen, da diese so komplizierter " +"werden können.\n" +"(Voreingestellt ist dies deaktiviert.)" #: optiondialog.cpp:874 msgid "Merge Settings" @@ -1269,10 +1294,15 @@ "quit.\n" "(Similar to command line option \"--auto\"." msgstr "" +"Automatisch speichern und beenden, wenn KDiff3 für eine " +"Dateizusammenführung\n" +"von der der Befehlszeile gestartet wurde und alle Konflikte ohne " +"Benutzerinteraktion aufzulösen sind.\n" +"(Ähnlich zur Befehlszeilen-Option „--auto“)." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Ordnerzusammenführung" +msgid "Directory" +msgstr "Ordner" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1567,6 +1597,11 @@ "fallback.\n" "(Unicode detection depends on the first bytes of a file.)" msgstr "" +"Ist diese Einstellung aktiviert, wird die Unicode-Kodierung (UTF-16 oder UTF-" +"8) bestimmt.\n" +"Ist die Datei nicht Unicode-kodiert, wird die Einstellung als Ausweichlösung " +"verwendet.\n" +"(Unicode-Erkennung hängt von den ersten Bytes der Datei ab.)" #: optiondialog.cpp:1501 optiondialog.cpp:1510 optiondialog.cpp:1519 msgid "Auto Detect Unicode" @@ -1594,6 +1629,10 @@ "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" +"Ist diese Einstellung aktiviert, wird die Kodierung der Eingabedatei " +"verwendet.\n" +"Ist diese nicht eindeutig zu bestimmen, wird der Benutzer beim Speichern " +"gefragt." #: optiondialog.cpp:1535 msgid "File Encoding for Preprocessor Files:" @@ -1621,7 +1660,7 @@ #: optiondialog.cpp:1579 msgid "Command line options to ignore:" -msgstr "Ignorierbare Kommandozeilenoptionen:" +msgstr "Ignorierbare Befehlszeilenoptionen:" #: optiondialog.cpp:1584 msgid "" @@ -1630,10 +1669,10 @@ "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\"-error." msgstr "" -"Liste der Kommandozeilenoptionen die ignoriert werden sollen, wenn KDiff3\n" +"Liste der Befehlszeilenoptionen, die ignoriert werden sollen, wenn KDiff3\n" "von anderen Werkzeugen aufgerufen wird.\n" "Mehrere Werte können mit Trennzeichen ‚;‘ angegeben werden.\n" -"Dies wird die Fehlermeldung „Unbekannte Option“ beim Start unterdrücken." +"Dies wird die Fehlermeldung „Unbekannte Option“ beim Start unterdrücken. " #: optiondialog.cpp:1591 msgid "Quit also via Escape key" @@ -1657,6 +1696,10 @@ "Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" "(Only enabled when ClearCase \"bin\" directory is in the path.)" msgstr "" +"Mit IBM Rational ClearCase integrieren.\n" +"Dies verändert die „map“-Datei im ClearCase-Unterordner „lib/mgrs“.\n" +"(Wird nur aktiviert, wenn die ClearCase-Programmdatei im Pfad gefunden " +"werden kann.)" #: optiondialog.cpp:1608 msgid "Remove ClearCase Integration" @@ -1666,6 +1709,8 @@ msgid "" "Restore the old \"map\" file from before doing the Clearcase integration." msgstr "" +"Die alte „map“-Datei wiederherstellen, wie sie vor der ClearCase-Integration " +"bestand." #: optiondialog.cpp:1692 kreplacements/kreplacements.cpp:794 msgid "" @@ -1910,7 +1955,7 @@ msgid "file3 to open" msgstr "Dritte Datei" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Datei" @@ -1922,10 +1967,6 @@ msgid "Line not available" msgstr "Zeile nicht vorhanden" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Oberste Zeile" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Ende" @@ -1950,7 +1991,7 @@ #: pdiff.cpp:268 msgid "Option Unsafe for Merging" -msgstr "Einstellung ist bei Dateizusammenführungen unsicher" +msgstr "Diese Einstellung ist bei Dateizusammenführungen unsicher" #: pdiff.cpp:269 msgid "Use These Options During Merge" @@ -1996,30 +2037,30 @@ msgid "Linediff: A <-> C" msgstr "Zeilenvergleich: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Alle Quelldateien sind binär identisch." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Alle Quelldateien enthalten den gleichen Text, sind aber nicht binär " "identisch." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Die Dateien %1 und %2 sind binär identisch.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Die Dateien %1 und %2 haben den gleichen Text, sind aber nicht binär " "identisch.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2029,55 +2070,55 @@ "Beachten Sie, dass KDiff3 nicht für den Binärdatenvergleich konzipiert ist.\n" "Sie fahren auf eigenes Risiko fort." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Abbrechen" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Zusammenführung fortsetzen" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Dateien öffnen ..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fehler beim Öffnen der Datei" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Auswahl wird ausgeschnitten ..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Auswahl wird in Zwischenablage kopiert ..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Inhalt der Zwischenablage wird eingefügt ..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Speichern && Fortsetzen" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Fortsetzen ohne zu speichern" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Suche abgeschlossen." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Suche abgeschlossen" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "In keinem der Unterschiedsfenster ist eine Auswahl markiert." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Fehler beim Hinzufügen einer manuellen Ausrichtung." @@ -2091,70 +2132,70 @@ "Das ist normalerweise ein Installationsproblem. Bitte lesen Sie die README-" "Datei, die den Quelltexten beiliegt." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Vermischung von Verknüpfungen und Dateien" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Verknüpfung: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Größe." -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Datum & Größe: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Erstellung einer temporären Kopie von %1 ist fehlgeschlagen." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Öffnen von %1 ist fehlgeschlagen." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Datei wird verglichen ..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Fehler beim Lesen von %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Aktion" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Ungelöst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Aufgelöst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nicht-Leerraum" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Leerraum" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2162,34 +2203,34 @@ "Sie sind dabei, Ordner zusammenzuführen. Sind Sie sicher, dass Sie diese " "Operation abbrechen und den Ordner erneut einlesen möchten?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Neu einlesen" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Öffnen der Ordner fehlgeschlagen:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Ordner A „%1“ existiert nicht oder ist kein Ordner.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Ordner B „%1“ existiert nicht oder ist kein Ordner.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Ordner C „%1“ existiert nicht oder ist kein Ordner.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Fehler beim Öffnen des Ordners" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2199,129 +2240,129 @@ "oder B identisch sein.\n" "Bitte überprüfen Sie das bevor Sie fortfahren." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameter-Warnung" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Ordner einlesen ..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Einlesen von Ordner A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Einlesen von Ordner B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Einlesen von Ordner C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Einige Unterordner nicht lesbar" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Überprüfen Sie bitte die Zugriffsrechte für die Unterordner." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status des Ordnervergleichs" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Anzahl der Unterordner:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Anzahl der identischen Dateien:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Anzahl der unterschiedlichen Dateien:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Anzahl der manuellen Zusammenführungen:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Dies beeinflußt alle Zusammenführungsaktionen." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Änderung aller Zusammenführungsaktionen" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Fortschritt " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Unerledigt." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Kopiere A nach B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Kopiere B nach A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Lösche A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Lösche B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Lösche A & B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Zusammenführen nach A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Zusammenführen nach B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Zusammenführen nach A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Lösche (falls vorhanden)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Zusammenführen (manuell)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Fehler: Konflikt der Dateitypen" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Fehler: Gleiches Datum, aber unterschiedliche Dateien." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Diese Aktion ist momentan nicht zulässig." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Unzulässige Aktion" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2336,46 +2377,46 @@ "Wenn Sie dies reproduzieren können, informieren Sie bitte den Autor dieses " "Programms." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programmfehler" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Während des Kopierens ist ein Fehler aufgetreten.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Fehler" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Zusammenführungsfehler" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fehler." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Erledigt." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Nicht gespeichert." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unbekannte Zusammenführaktion. (Sollte nie passieren!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Unbekannte Zusammenführaktion." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2395,19 +2436,19 @@ "Sie sollten aber wissen, dass dieses Program noch Beta-Status hat und es " "KEINE GARANTIE gibt! Erstellen Sie Sicherungkopien Ihrer wichtigen Daten!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Start der Zusammenführung" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Start" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulieren" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2415,7 +2456,7 @@ "Das markierte Element hat einen unterschiedlichen Typ in den verschiedenen " "Ordnern. Wählen Sie eine Aktion." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2423,7 +2464,7 @@ "Für die markierte Datei ist zwar das Datum der letzen Änderung gleich, aber " "die Dateien unterscheiden sich. Wählen Sie die Zusammenführaktion." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2431,7 +2472,7 @@ "Diese Aktion ist derzeit nicht möglich, weil noch eine Ordnerzusammenführung " "läuft." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2440,218 +2481,218 @@ "Beim letzten Element ist ein Fehler aufgetreten.\n" "Möchten Sie mit diesem Element fortfahren, oder es überspringen?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Fortsetzung der Zusammenführung nach einem Fehler" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Mit letztem Element fortfahren" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Element überspringen" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Übersprungen." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "In Bearbeitung ..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Die Zusammenführung ist abgeschlossen." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Zusammenführung abgeschlossen." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Die simulierte Zusammenführung ist abgeschlossen. Überprüfen Sie, ob Sie mit " "den vorgeschlagenen Aktionen einverstanden sind." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ein Fehler ist aufgetreten. Wählen Sie OK um Details zu sehen.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Fehler: Beim Löschen von %1: Die Erstellung einer Sicherungskopie ist " "fehlgeschlagen." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Lösche Ordner rekursiv( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "Lösche( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fehler: Löschen des Ordners ist fehlgeschlagen, da er nicht gelesen werden " "kann." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: Ordner löschen( %1 ) Operation fehlgeschlagen." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fehler: Löschoperation fehlgeschlagen." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuelles Zusammenführen( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Hinweis: Nach manuellem Zusammenführen mit F7 fortsetzen." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fehler: Kopie( %1 -> %2 ) fehlgeschlagen. Das existierende Ziel kann nicht " "gelöscht werden." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Verknüpfung kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fehler: Verknüpfung kopieren: Nichtlokale Verknüpfungen werden nicht " "unterstützt." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Fehler: Verknüpfung kopieren fehlgeschlagen." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Fehler beim Umbenennen( %1 -> %2 ): Das existierende Ziel kann nicht " "gelöscht werden." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Umbenennen( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Fehler: Umbenennen fehlgeschlagen." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fehler beim Erstellen des Ordners %1. Kann vorhandene Datei nicht löschen." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Ordner erstellen( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Fehler beim Erstellen des Ordners." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Ziel" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Ordner" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Größe" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Letzte Änderung" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Verküpfungsziel" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "nicht vorhanden" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Ziel): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Ziel): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Ziel): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Ziel: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Status der Ordnerzusammenführung speichern unter ..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Ordnerzusammenführung starten/fortsetzen" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Aktion des aktuellen Elements ausführen" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Gewählte Datei vergleichen" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Aktuelle Datei zusammenführen" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2659,39 +2700,39 @@ "Datei\n" "zusammenführen" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Alle Unterordner einklappen" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Alle Unterordner ausklappen" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Für alle Elemente A wählen" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Für alle Elemente B wählen" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Für alle Elemente C wählen" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Aktion für alle Elemente automatisch wählen" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Keine Aktion für alle Elemente" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Zeige identische Dateien" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2699,15 +2740,15 @@ "Identische\n" "Dateien" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Unterschiedliche Dateien anzeigen" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Dateien anzeigen, die nur in A existieren" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2715,11 +2756,11 @@ "Dateien\n" "nur in A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Dateien anzeigen, die nur in B existieren" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2727,11 +2768,11 @@ "Dateien\n" "nur in B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Dateien anzeigen, die nur in C existieren" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2739,35 +2780,35 @@ "Dateien\n" "nur in C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Explizit ausgewählte Dateien vergleichen" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Explizit ausgewählte Dateien zusammenführen" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nichts tun" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A && B löschen" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Nach A && B zusammenführen" @@ -2779,11 +2820,11 @@ msgid "KDiff3Part" msgstr "KDiff3-Komponente" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Fortsetzen" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Beenden" @@ -3018,11 +3059,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Zusammenführungskonflikt (nur Leerräume)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Zusammenführungskonflikt>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3030,12 +3071,22 @@ "Noch sind nicht alle Konflikte aufgelöst.\n" "Die Datei wurde nicht gespeichert.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Es sind noch ungelöste Konflikte übrig" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Es besteht ein Zeilenende-Konflikt. Bitte wählen Sie manuell ein " +"Zeilenende.\n" +"Die Datei wurde nicht gespeichert.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3045,30 +3096,42 @@ "Anlegen der Sicherungskopie ist fehlgeschlagen. Die Datei wurde nicht " "gespeichert." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fehler beim Speichern der Datei" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fehler beim Schreiben." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Ausgabe" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Geändert]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Dateikodierung zum Speichern" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Konflikt" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" -msgstr "" +msgstr "Codec von" #. i18n: file: kdiff3_part.rc:4 #. i18n: ectx: Menu (movement) @@ -3104,6 +3167,9 @@ msgid "Your emails" msgstr "schwarzerf@gmail.com" +#~ msgid "Directory Merge" +#~ msgstr "Ordnerzusammenführung" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -3117,12 +3183,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Blendet die Werkzeugleiste ein/aus" -#~ msgid "Printing aborted." -#~ msgstr "Drucken abgebrochen." - -#~ msgid "Printing completed." -#~ msgstr "Drucken beendet." - #~ msgid "Ignored. (User defined.)" #~ msgstr "Ignoriert. (Benutzerdefiniert.)"
--- a/kdiff3/po/el/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/el/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,113 +1,113 @@ # translation of kdiff3.po to Greek # # Spiros Georgaras <sng@hellug.gr>, 2005, 2006, 2007. -# Toussis Manolis <manolis@koppermind.homelinux.org>, 2005, 2006, 2007, 2008. +# Toussis Manolis <manolis@koppermind.homelinux.org>, 2005, 2006, 2007, 2008, 2009. # George Pantsis <gpantsis@gmail.com>, 2008. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-27 23:01+0200\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-21 09:45+0200\n" "Last-Translator: Toussis Manolis <manolis@koppermind.homelinux.org>\n" "Language-Team: Greek <kde-i18n-el@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Τρέχουσες ρυθμίσεις:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Σφάλμα ρύθμισης επιλογής:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Χρησιμοποιήθηκε η επιλογή --auto, αλλά δεν καθορίστηκε αρχείο εξόδου." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Η επιλογή --auto αγνοήθηκε για τη σύγκριση καταλόγων." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Η αποθήκευση απέτυχε." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Το άνοιγμα αυτών των αρχείων απέτυχε:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Σφάλμα ανοίγματος αρχείου" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Ανοίγει έγγραφα για σύγκριση..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Επαναφόρτωση" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Αποθηκεύει το αποτέλεσμα της συγχώνευσης. Όλες οι συγκρούσεις θα πρέπει να " "έχουν επιλυθεί!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Αποθηκεύει το τρέχον έγγραφο ως..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Εκτύπωση των διαφορών" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Κλείνει την εφαρμογή" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Αποκοπή του επιλεγμένου τμήματος και τοποθέτηση στο πρόχειρο" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Αντιγραφή του επιλεγμένου τμήματος στο πρόχειρο" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Επικόλληση των περιεχομένων του πρόχειρου στην τρέχουσα θέση" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Επιλογή όλων στο τρέχον παράθυρο" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Αναζήτηση για μια συμβολοσειρά" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Αναζήτηση ξανά για μια συμβολοσειρά" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Ενεργοποιεί/απενεργοποιεί τη γραμμή κατάστασης" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Ρύθμιση του KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Μετάβαση στην τρέχουσα διαφορά" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -115,11 +115,11 @@ "Τρέχουσα\n" "διαφορά" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Μετάβαση στη πρώτη διαφορά" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -127,11 +127,11 @@ "Πρώτη\n" "διαφορά" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Μετάβαση στην τελευταία διαφορά" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -139,13 +139,13 @@ "Τελευταία\n" "διαφορά" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Παράλειψη των διαφορών στα κενά όταν είναι απενεργοποιημένη η \"Εμφάνιση " "κενών\")" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -153,11 +153,11 @@ "(Μη παράλειψη των διαφορών στα κενά ακόμη και αν είναι απενεργοποιημένη η " "\"Εμφάνιση κενών\")" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Μετάβαση στη προηγούμενη διαφορά" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -165,11 +165,11 @@ "Προηγούμενη\n" "διαφορά" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Μετάβαση στην επόμενη διαφορά" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -177,11 +177,11 @@ "Επόμενη\n" "διαφορά" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Μετάβαση στην προηγούμενη σύγκρουση" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -189,11 +189,11 @@ "Προηγούμενη\n" "σύγκρουση" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Μετάβαση στην επόμενη σύγκρουση" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -201,11 +201,11 @@ "Επόμενη\n" "σύγκρουση" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Μετάβαση στην προηγούμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -213,11 +213,11 @@ "Προηγούμενη\n" "μη λυμένη" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Μετάβαση στην επόμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -225,11 +225,11 @@ "Επόμενη\n" "μη λυμένη" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Επιλογή γραμμής(ών) από το Α" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -237,11 +237,11 @@ "Επιλογή\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Επιλογή γραμμής(ών) από το Β" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -249,11 +249,11 @@ "Επιλογή\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Επιλογή γραμμής(ών) από το Γ" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -261,12 +261,12 @@ "Επιλογή\n" "Γ" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Αυτόματη μετάβαση στην επόμενη μη λυμένη σύγκρουση μετά την επιλογή πηγής" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -274,11 +274,11 @@ "Αυτόματα\n" "επόμενο" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Εμφάνιση κενών && χαρακτήρων οριοθέτησης για διαφορές" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -286,11 +286,11 @@ "Κενοί\n" "χαρακτήρες" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Εμφάνιση κενών" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -298,11 +298,11 @@ "Κενές\n" "διαφορές" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Εμφάνιση αριθμών γραμμής" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -310,181 +310,201 @@ "Αριθμοί\n" "γραμμών" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Επιλογή παντού του Α" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Επιλογή παντού του Β" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Επιλογή παντού το Γ" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Αυτόματη επίλυση απλών συγκρούσεων" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Ορισμός διαφορών στις συγκρούσεις" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Εκτέλεση κανονικής έκφρασης αυτόματης συγχώνευσης" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Αυτόματη επίλυση συγκρούσεων ιστορικού" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Διαίρεση διαφορών στην επιλογή" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Ένωση των επιλεγμένων διαφορών" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Εμφάνιση του παραθύρου Α" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Εμφάνιση του παραθύρου Β" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Εμφάνιση του παραθύρου Γ" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Εστίαση στο επόμενο παράθυρο" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Κανονική επισκόπηση" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Επισκόπηση Α με το Β" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Επισκόπηση Α με το Γ" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Επισκόπηση Β με το Γ" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Αναδίπλωση λέξεων στα παράθυρα διαφοράς" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Προσθήκη χειροκίνητης στοίχισης διαφορών" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Καθαρισμός όλων των χειροκίνητων στοιχίσεων διαφορών" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Εστίαση στο προηγούμενο παράθυρο" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Εναλλαγή προσανατολισμού διαίρεσης" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Διαίρεση προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Εναλλαγή μεταξύ προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Έτοιμο." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Το αποτέλεσμα της συγχώνευσης δεν έχει αποθηκευτεί." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Προειδοποίηση" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Αποθήκευση && έξοδος" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Έξοδος χωρίς αποθήκευση" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Αποτυχία αποθήκευσης του αποτελέσματος συγχώνευσης." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Αυτή τη στιγμή εκτελείται μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε να την εγκαταλείψετε;" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Αποθήκευση αρχείου..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Αποθήκευση αρχείου με ένα νέο όνομα..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Αποθήκευση ως..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Εκτύπωση..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Πάνω γραμμή" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Επιλογή" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Η εκτύπωση ολοκληρώθηκε." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Εγκατάλειψη εκτύπωσης." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Έξοδος..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Εναλλαγή γραμμής εργαλείων..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Εναλλαγή της γραμμής κατάστασης..." @@ -582,28 +602,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Σφάλμα κατά την αντιγραφή: Η εγγραφή απέτυχε. Όνομα αρχείου: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Ανάγνωση καταλόγου: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Εμφάνιση καταλόγου: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Ακύρωση" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Η εγγραφή δεδομένων στο προσωρινό αρχείο απέτυχε." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Από το πρόχειρο" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -618,7 +638,7 @@ "\n" "Η εντολή προεπεξεργασίας θα απενεργοποιηθεί τώρα." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -634,7 +654,7 @@ "\n" "Η δυνατότητα προεπεξεργασίας αντιστοίχησης γραμμών θα απενεργοποιηθεί τώρα." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -642,7 +662,7 @@ "Σφάλμα απώλειας δεδομένων:\n" "Αν αναπαράγεται το σφάλμα, παρακαλώ επικοινωνήστε με το συγγραφέα.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Σοβαρό εσωτερικό σφάλμα" @@ -664,8 +684,8 @@ msgid "C (Optional):" msgstr "Γ (Προαιρετικό):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Συγχώνευση" @@ -798,7 +818,7 @@ msgid "OK" msgstr "Εντάξει" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Ακύρωση" @@ -984,7 +1004,7 @@ "Ενεργοποιημένο: Οποιαδήποτε επιλογή γράφεται άμεσα στο πρόχειρο. " "Απενεργοποιημένο: Θα πρέπει να την αντιγράψετε εσείς π.χ. μέσω του Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Στυλ τέλους γραμμής:" @@ -1283,8 +1303,8 @@ "(Παρόμοιο με την επιλογή της γραμμής εντολών \"--auto\"." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Συγχώνευση καταλόγου" +msgid "Directory" +msgstr "Κατάλογος" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1930,7 +1950,7 @@ msgid "file3 to open" msgstr "αρχείο3 για άνοιγμα" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Αρχείο" @@ -1942,10 +1962,6 @@ msgid "Line not available" msgstr "Μη διαθέσιμη γραμμή" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Πάνω γραμμή" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Τέλος" @@ -2016,28 +2032,28 @@ msgid "Linediff: A <-> C" msgstr "Διαφορά γραμμής: Α <-> Γ" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Όλα τα αρχεία εισόδου είναι δυαδικά ίσα." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Όλα τα αρχεία εισόδου περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Τα αρχεία %1 και %2 είναι δυαδικά ίσα.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Τα αρχεία %1 και %2 περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2047,55 +2063,55 @@ "Σημειώστε ότι το KDiff3-merge δε φτιάχτηκε για δυαδικά δεδομένα.\n" "Αν συνεχίσετε θα είναι με δική σας ευθύνη." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Εγκατάλειψη" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Συνέχεια συγχώνευσης" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Άνοιγμα αρχείων..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Σφάλμα ανοίγματος αρχείου" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Αποκοπή επιλογής..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Αντιγραφή της επιλογής στο πρόχειρο..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Εισαγωγή των περιεχομένων του προχείρου..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Αποθήκευση && συνέχεια" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Συνέχεια χωρίς αποθήκευση" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Η αναζήτηση ολοκληρώθηκε." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Η αναζήτηση ολοκληρώθηκε" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Δεν έχει επιλεγεί τίποτα σε κανένα παράθυρο εισαγωγής διαφορών." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Σφάλμα κατά την προσθήκη χειροκίνητου εύρους διαφορών" @@ -2109,70 +2125,70 @@ "Αυτό συνήθως συμβαίνει εξαιτίας ενός προβλήματος εγκατάστασης. Παρακαλώ " "διαβάστε το αρχείο README στο πακέτο του πηγαίου κώδικα για λεπτομέρειες." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Ανάμιξη δεσμών και κανονικών αρχείων." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Δεσμός: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Μέγεθος. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Ημερομηνία & μέγεθος: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Η δημιουργία του προσωρινού αντιγράφου για το %1 απέτυχε." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Το άνοιγμα του %1 απέτυχε." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Σύγκριση αρχείου..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Σφάλμα ανάγνωσης από το %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Όνομα" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Λειτουργία" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Κατάσταση" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Μη λυμένο" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Λυμένο" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Μη κενό" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Κενό" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2180,34 +2196,34 @@ "Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Επανασάρωση" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Το άνοιγμα των καταλόγων απέτυχε:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Α \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Β \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Γ \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Σφάλμα ανοίγματος Καταλόγου" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2217,129 +2233,129 @@ "συγχωνεύονται τρεις κατάλογοι.\n" "Κάντε έναν έλεγχο ξανά πριν συνεχίσετε." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Προειδοποίηση παραμέτρου" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Σάρωση καταλόγων..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Ανάγνωση καταλόγου Α" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Ανάγνωση καταλόγου Β" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Ανάγνωση καταλόγου Γ" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Μερικοί υποκατάλογοι δεν είναι αναγνώσιμοι στο" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Ελέγξτε τις άδειες χρήσης των υποκαταλόγων." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Κατάσταση σύγκρισης καταλόγου" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Αριθμός υποκαταλόγων:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Αριθμός ίδιων αρχείων:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Αριθμός διαφορετικών αρχείων:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Αριθμός χειροκίνητων συγχωνεύσεων:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Αυτό επηρεάζει όλες τις συγχωνεύσεις." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Αλλαγή όλων των λειτουργιών συγχώνευσης" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Επεξεργασία " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Προς υλοποίηση." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Αντιγραφή του Α στο Β" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Αντιγραφή του Β στο Α" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Διαγραφή του Α" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Διαγραφή του Β" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Διαγραφή των Α & Β" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Συγχώνευση στο Α" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Συγχώνευση στο Β" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Συγχώνευση στα Α & Β" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Διαγραφή (αν υπάρχει)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Συγχώνευση (χειροκίνητη)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Σφάλμα: Σύγκρουση τύπου αρχείων" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Σφάλμα: Οι ημερομηνίες είναι ίδιες αλλά τα αρχεία όχι." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Αυτή η λειτουργία δεν είναι δυνατή αυτή τη στιγμή." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Μη δυνατή λειτουργία" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2354,46 +2370,46 @@ "Αν μπορείτε να το αναπαράγετε, παρακαλώ επικοινωνήστε με το συγγραφέα του " "προγράμματος." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Σφάλμα προγράμματος" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Σφάλμα" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Σφάλμα συγχώνευσης" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Σφάλμα." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Έγινε." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Δεν αποθηκεύτηκε." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Άγνωστη λειτουργία συγχώνευσης. (Δε θα έπρεπε να συμβεί ποτέ!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Άγνωστη λειτουργία συγχώνευσης." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2414,19 +2430,19 @@ "υπάρχει ΕΓΓΥΗΣΗ ούτως ή άλλως! Κάντε αντίγραφα ασφαλείας για τα σημαντικά " "δεδομένα σας!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Εκκίνηση συγχώνευσης" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Εκτέλεση" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Εξομοίωση" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2434,7 +2450,7 @@ "Το τονισμένο αντικείμενο έχει διαφορετικό τύπο σε διαφορετικούς καταλόγους. " "Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2442,7 +2458,7 @@ "Οι ημερομηνίες τροποποίησης των αρχείων είναι ίδιες αλλά τα αρχεία δεν " "είναι. Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2450,7 +2466,7 @@ "Αυτή η λειτουργία δεν είναι αυτή τη στιγμή δυνατή γιατί η συγχώνευση " "καταλόγου εκτελείται αυτήν τη στιγμή." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2460,223 +2476,223 @@ "Επιθυμείτε τη συνέχεια με το αντικείμενο που προκάλεσε το σφάλμα ή " "επιθυμείτε την παράλειψή του;" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Συνέχεια συγχώνευσης μετά από ένα σφάλμα" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Συνέχεια με το τελευταίο αντικείμενο" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Παράλειψη αντικειμένου" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Παραλείφθηκε." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Σε πρόοδο..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Η λειτουργία συγχώνευσης ολοκληρώθηκε." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Η συγχώνευση ολοκληρώθηκε" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Η εξομοίωση συγχώνευσης ολοκληρώθηκε: Ελέγξτε αν συμφωνείτε με τις " "προτεινόμενες ενέργειες." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Παρουσιάστηκε ένα σφάλμα. Πατήστε το Εντάξει για να δείτε λεπτομερείς " "πληροφορίες.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Σφάλμα: Κατά τη διαγραφή του %1: Η δημιουργία του αντιγράφου ασφαλείας " "απέτυχε." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "αναδρομική διαγραφή καταλόγου( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "διαγραφή ( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Σφάλμα: η διαγραφή καταλόγου απέτυχε κατά την προσπάθεια ανάγνωσης του " "καταλόγου." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Σφάλμα: η λειτουργία rmdir( %1 ) απέτυχε." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Σφάλμα: η διαγραφή απέτυχε." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "χειροκίνητη συγχώνευση( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Σημείωση: Μετά από μία χειροκίνητη συγχώνευση ο χρήστης θα πρέπει να " "συνεχίσει πατώντας F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Σφάλμα: η αντιγραφή ( %1 -> %2 ) απέτυχε. Η διαγραφή του υπάρχοντος " "προορισμού απέτυχε." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Αντιγραφή δεσμού( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Σφάλμα: η αντιγραφή δεσμού απέτυχε: Οι απομακρυσμένοι δεσμοί δεν " "υποστηρίζονται ακόμα." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Σφάλμα: η αντιγραφή δεσμού απέτυχε." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "αντιγραφή ( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Σφάλμα κατά την μετονομασία( %1 -> %2 ): Αδυναμία διαγραφής του υπάρχοντος " "προορισμού." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "μετονομασία ( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Σφάλμα: Η μετονομασία απέτυχε." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Σφάλμα κατά τη δημιουργία του καταλόγου %1. Αδύνατη η διαγραφή υπάρχοντος " "αρχείου." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Δημιουργία καταλόγου( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Προορ." -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Κατ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Τύπος" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Μέγεθος" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Ιδιοτ" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Τελευταία τροποποίηση" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Δεσμός-προορισμός" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "μη διαθέσιμο" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Προορ): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Βάση): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Προορ): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "Γ (Προορ): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Προορ: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Αποθήκευση κατάστασης συγχώνευσης καταλόγου ως..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Έναρξη/συνέχεια συγχώνευσης καταλόγου" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Εκτέλεση της λειτουργίας για το τρέχον αντικείμενο" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Σύγκριση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Συγχώνευση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2684,39 +2700,39 @@ "Συγχώνευση\n" "αρχείου" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Αναδίπλωση όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Ανάπτυξη όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Επιλογή του Α για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Επιλογή του Β για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Επιλογή του Γ για Όλα τα αντικείμενα" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Λειτουργία αυτόματης επιλογής για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Καμία λειτουργία για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Εμφάνιση ταυτόσημων αρχείων" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2724,15 +2740,15 @@ "Ταυτόσημα\n" "αρχεία" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Εμφάνιση διαφορετικών αρχείων" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Εμφάνιση αρχείων μόνο στο Α" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2740,11 +2756,11 @@ "Αρχεία\n" "μόνο στο Α" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Εμφάνιση αρχείων μόνο στο Β" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2752,11 +2768,11 @@ "Αρχεία\n" "μόνο στο Β" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Εμφάνιση αρχείων μόνο στο Γ" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2764,35 +2780,35 @@ "Αρχεία\n" "μόνο στο Γ" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Σύγκριση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Συγχώνευση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Να μη γίνει τίποτα" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "Α" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "Β" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "Γ" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Διαγραφή των A && B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Συγχώνευση σε A && B" @@ -2804,11 +2820,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Συνέχεια" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Έξοδος" @@ -3043,11 +3059,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Σύγκρουση συγχώνευσης (μόνο κενών)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Σύγκρουση συγχώνευσης>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3055,12 +3071,22 @@ "Δεν έχουν επιλυθεί ακόμη όλες οι συγκρούσεις.\n" "Το αρχείο δεν αποθηκεύτηκε.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Συγκρούσεις που απομένουν" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Υπάρχει μια σύγκρουση στυλ τέλους γραμμής. Παρακαλώ επιλέξτε ένα στυλ τέλους " +"γραμμής χειροκίνητα.\n" +"Το αρχείο δεν αποθηκεύτηκε.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3069,28 +3095,40 @@ "\n" "Η δημιουργία αντιγράφου ασφαλείας απέτυχε. Το αρχείο δεν αποθηκεύτηκε." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Σφάλμα εγγραφής αρχείου" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Σφάλμα κατά την εγγραφή." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Έξοδος" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Τροποποιημένο]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Κωδικοποίηση για την αποθήκευση" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Σύγκρουση" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Κωδικοποιητής από" @@ -3127,3 +3165,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "manolis@koppermind.homelinux.org, gpantsis@gmail.com" + +#~ msgid "Directory Merge" +#~ msgstr "Συγχώνευση καταλόγου"
--- a/kdiff3/po/en_GB/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/en_GB/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-02-02 11:52+0000\n" "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n" "Language-Team: British English <kde-en-gb@kde.me.uk>\n" @@ -18,99 +18,99 @@ "X-Generator: KBabel 1.9\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "Current Item Sync Operation" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "File Open Error" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Option --auto used, but no output file specified." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto ignored for directory comparison." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Saving failed." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Opening of these files failed:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "File Open Error" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Opens documents for comparison..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Ready." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Saves the merge result. All conflicts must be solved!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Saves the current document as..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Quits the application" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Cuts the selected section and puts it to the clipboard" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copies the selected section to the clipboard" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Pastes the clipboard contents to actual position" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Search for a string" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Search again for the string" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Enables/disables the statusbar" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configure KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Go to Current Delta" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -118,11 +118,11 @@ "Delta" msgstr "Go to Current Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Go to First Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -130,11 +130,11 @@ "Delta" msgstr "Go to First Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Go to Last Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -142,11 +142,11 @@ "Delta" msgstr "Go to Last Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -154,11 +154,11 @@ "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Go to Previous Delta" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -166,11 +166,11 @@ "Delta" msgstr "Go to Previous Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Go to Next Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -178,11 +178,11 @@ "Delta" msgstr "Go to Next Delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Go to Previous Conflict" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -190,11 +190,11 @@ "Conflict" msgstr "Conflicts" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Go to Next Conflict" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -202,11 +202,11 @@ "Conflict" msgstr "Go to Next Conflict" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Go to Previous Unsolved Conflict" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -214,11 +214,11 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Go to Next Unsolved Conflict" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -226,72 +226,72 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Select Line(s) From A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Select Line(s) From B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Select Line(s) From C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "Auto copy selection" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Show Space && Tabulator Characters for Differences" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Show White Space" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Show Line Numbers" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -299,182 +299,208 @@ "Numbers" msgstr "Show Line Numbers" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Choose A Everywhere" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Choose B Everywhere" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Choose C Everywhere" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Choose A for All Unsolved Conflicts" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Choose B for All Unsolved Conflicts" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Choose C for All Unsolved Conflicts" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choose A for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choose B for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choose C for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Set Deltas to Conflicts" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "Compare Selected File" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Show Window A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Show Window B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Show Window C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Focus Next Window" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Focus Prev Window" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Toggle Split Orientation" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Dir && Text Split Screen View" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Toggle Between Dir && Text View" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Ready." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "The merge result hasn't been saved." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Save && Quit" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Quit Without Saving" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Saving the merge result failed." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Saving file..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Saving file with a new filename..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Exiting..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Top line %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "Select Another Font" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Merge operation complete." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Merge operation complete." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Exiting..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Toggling toolbar..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Toggle the statusbar..." @@ -571,28 +597,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Error during file copy operation: Writing failed. Filename: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Reading directory: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listing directory: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Writing clipboard data to temp file failed." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "From Clipboard" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -607,7 +633,7 @@ "\n" "The preprocessing command will be disabled now." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -622,7 +648,7 @@ "\n" "The line-matching-preprocessing command will be disabled now." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -630,7 +656,7 @@ "Data loss error:\n" "If it is reproducable please contact the author.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Severe Internal Error" @@ -652,8 +678,8 @@ msgid "C (Optional):" msgstr "C (Optional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Merge" @@ -776,7 +802,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -960,7 +986,7 @@ "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Line end style:" @@ -1218,8 +1244,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Directory Merge" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Directory" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1843,7 +1871,7 @@ msgid "file3 to open" msgstr "file3 to open" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1861,11 +1889,6 @@ msgid "Line not available" msgstr "not available" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Top line %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "End" @@ -1936,27 +1959,27 @@ msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "All input files are binary equal." -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "All input files contain the same text." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Files B and C are binary equal.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Files A and B are binary equal.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1966,55 +1989,55 @@ "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Abort" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continue Merging" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Opening files..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "File open error" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Cutting selection..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Copying selection to clipboard..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Inserting clipboard contents..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Save && Continue" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continue Without Saving" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Search complete." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Search Complete" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Error while creating directory." @@ -2034,70 +2057,70 @@ "This usually happens due to an installation problem. Please read the README-" "file in the source package for details." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mix of links and normal files." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Size. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Date & Size: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Creating temp copy of %1 failed." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Opening %1 failed." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Comparing file..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Error reading from %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "White" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2105,34 +2128,34 @@ "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Rescan" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Opening of directories failed:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Directory Open Error" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2142,129 +2165,129 @@ "directories are merged.\n" "Check again before continuing." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameter Warning" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Scanning directories..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Reading Directory A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Reading Directory B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Reading Directory C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Some subdirectories were not readable in" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Check the permissions of the subdirectories." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Directory Comparison Status" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Number of subdirectories:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Number of equal files:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Number of different files:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Number of manual merges:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "This affects all merge operations." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Changing All Merge Operations" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Processing " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copy A to B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copy B to A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Delete A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Delete B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Delete A & B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Merge to A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Merge to B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Merge to A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Delete (if exists)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Merge (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Error: Conflicting File Types" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Error: Dates are equal but files are not." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "This operation is currently not possible." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operation Not Possible" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2278,48 +2301,48 @@ "\n" "If you know how to reproduce this, please contact the program author." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Program Error" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "An error occurred while copying.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Error." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Merge Error" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Done." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Not saved." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unknown merge operation. (This must never happen!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Unknown merge operation." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2339,19 +2362,19 @@ "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Starting Merge" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Do It" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulate It" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2359,7 +2382,7 @@ "The highlighted item has a different type in the different directories. " "Select what to do." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2367,7 +2390,7 @@ "The modification dates of the file are equal but the files are not. Select " "what to do." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2375,7 +2398,7 @@ "This operation is currently not possible because directory merge is " "currently running." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2385,208 +2408,208 @@ "Do you want to continue with the item that caused the error or do you want " "to skip this item?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continue merge after an error" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continue With Last Item" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Skip Item" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Skipped." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "In progress..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Merge operation complete." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Merge Complete" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulated merge complete: Check if you agree with the proposed operations." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "An error occurred. Press OK to see detailed information.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: While deleting %1: Creating backup failed." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "delete directory recursively( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Error: delete dir operation failed while trying to read the directory." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: rmdir( %1 ) operation failed." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Error: delete operation failed." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note: After a manual merge the user should continue by pressing F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: copyLink failed: Remote links are not yet supported." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Error: copyLink failed." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Error: Rename failed." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error during makeDir of %1. Cannot delete existing file." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Error while creating directory." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Size" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Last Modification" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "not available" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Directory Merge" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Start/Continue Directory Merge" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Run Operation for Current Item" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Merge Current File" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2594,110 +2617,110 @@ "File" msgstr "Merge" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Fold All Subdirs" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Unfold All Subdirs" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Choose A for All Items" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Choose B for All Items" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Choose C for All Items" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Auto-Choose Operation for All Items" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "No Operation for All Items" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Number of different files:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Do Nothing" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Delete A && B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Merge to A && B" @@ -2709,13 +2732,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "C&ontinue" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2979,11 +3002,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Merge Conflict (Whitespace only)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Merge Conflict>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2991,12 +3014,19 @@ "Not all conflicts are solved yet.\n" "File not saved.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Conflicts Left" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3005,29 +3035,43 @@ "\n" "Creating backup failed. File not saved." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "File Save Error" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Error while writing." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Output" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modified]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "File Encoding for C:" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Conflicts" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3065,6 +3109,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "Directory Merge" + #~ msgid "C&ontinue" #~ msgstr "C&ontinue" @@ -3081,10 +3128,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Enables/disables the toolbar" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Merge operation complete." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Files A and B are binary equal.\n"
--- a/kdiff3/po/es/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/es/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-06-11 17:57+0200\n" "Last-Translator: Santi <santi@kde-es.org>\n" "Language-Team: Español <kde-l10n-es@kde.org>\n" @@ -20,96 +20,96 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configuración actual:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Configuración de la opción de error:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Opción --auto usada, pero sin archivo de salida especificado." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Opción --auto ignorada para comparación de directorio." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Fallo al guardar." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Fallo al abrir estos archivos:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Error de apertura de archivo" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Abre documentos para comparación..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Recargar" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Guarda el resultado de la fusión ¡Todos los conflictos deben estar resueltos!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Guarda el documento actual como..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Imprimir las diferencias" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Sale de la aplicación" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta la sección seleccionada y la pega en el portapapeles" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copia la sección seleccionada al portapapeles" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Pega el contenido del portapapeles en la posición actual" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Seleccionar todo en la ventana actual" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Buscar por una cadena" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Buscar de nuevo la cadena" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Activar/desactivar la barra de estado" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Ir al Delta actual" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -117,11 +117,11 @@ "Delta\n" "actual" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Ir al primer Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -129,11 +129,11 @@ "Primer\n" "delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Ir al último Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -141,13 +141,13 @@ "Último\n" "delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Omite diferencias de espacios en blanco cuando «Mostrar espacios en blanco» " "esta desactivado.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -155,11 +155,11 @@ "(No omite diferencias de espacios en blanco incluso cuando «Mostrar espacios " "en blanco» esta desactivado)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Ir al Delta anterior" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -167,11 +167,11 @@ "Delta\n" "anterior" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Ir al siguiente Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -179,11 +179,11 @@ "Siguiente\n" "Delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Ir al conflicto anterior" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -191,11 +191,11 @@ "Conflicto\n" "anterior" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Ir al conflicto siguiente" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -203,11 +203,11 @@ "Conflicto\n" "siguiente" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Ir al conflicto anterior sin resolver" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -215,11 +215,11 @@ "Sin resolver\n" "anterior" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Ir al conflicto siguiente sin resolver" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -227,11 +227,11 @@ "Sin resolver\n" "siguiente" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Seleccionar linea(s) de A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -239,11 +239,11 @@ "Elegir\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Seleccionar linea(s) de B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -251,11 +251,11 @@ "Elegir\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Seleccionar linea(s) de C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -263,13 +263,13 @@ "Elegir\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automáticamente Ir al conflicto siguiente sin resolver después de una " "selección origen" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -277,11 +277,11 @@ "Siguiente\n" "automática" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar caracteres espacio y tabulador por diferencias" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -289,11 +289,11 @@ "Caracteres\n" "en blanco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Mostar espacio en blanco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -301,11 +301,11 @@ "Deltas en\n" "blanco" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Mostar número de lineas" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -313,181 +313,207 @@ "Números de\n" "línea" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Elegir A en cualquier sitio" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Elegir B en cualquier sitio" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Elegir C en cualquier sitio" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Elegir A para todos los conflictos sin resolver" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Elegir B para todos los conflictos sin resolver" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Elegir C para todos los conflictos sin resolver" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Elegir A para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Elegir B para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Elegir C para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Resolver automáticamente conflictos simples" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Establecer Deltas a conflictos" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Ejecutar expresión regular de fusión automática" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Resolver automáticamente conflictos históricamente" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Dividir Diff en la selección" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Unir las diferencias seleccionadas" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Mostar ventana A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Mostar ventana B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Mostar ventana C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Ir a la siguiente ventana" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Vista normal" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Ventanas de diferencias con ajuste de palabra" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Añadir alineación manual de las diferencias" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Borrar todas las alineaciones de diferencias manuales" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Ir a la ventana anterior" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Cambiar orientación de división" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Vista de la división de pantalla Dir y Texto" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Cambiar entre vista Dir y Texto" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Listo." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "El resultado de la fusión no ha sido guardado." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Aviso" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Guardar y salir" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Salir sin guardar" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Falló al guardar el resultado de la fusión." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Guardando archivo..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Guardando archivo con un nuevo nombre..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Guardar como..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Print..." +msgid "Printing..." +msgstr "Imprimir..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Linea superior" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Font" +msgid "Selection" +msgstr "Seleccionar tipo de letra" + +#: kdiff3.cpp:977 +#, fuzzy +#| msgid "Merge operation complete." +msgid "Printing completed." +msgstr "Operación de fusión completa." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Saliendo..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Cambiando barra de herramientas..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Cambiar la barra de estado..." @@ -590,28 +616,28 @@ "Error durante la operación de copia de archivo. Falló al escribir. Nombre de " "archivo: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Leyendo directorio: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listando directorio: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Cancelar" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Error al escribir los datos del portapapeles en el archivo temporal." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Desde el portapapeles" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -626,7 +652,7 @@ "\n" "La orden de pre-procesamiento se desactivará ahora." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -642,7 +668,7 @@ "\n" "La orden de preprocesamiento de combinación de linea se desactivará." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -650,7 +676,7 @@ "Error de pérdida de datos:\n" "Si se puede reproducir contacte con el autor.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Error interno grave" @@ -672,8 +698,8 @@ msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Fusionar" @@ -807,7 +833,7 @@ msgid "OK" msgstr "Aceptar" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Cancelar" @@ -908,15 +934,15 @@ #: optiondialog.cpp:651 msgid "Current range background color:" -msgstr "Rango actual de color de fondo:" +msgstr "Intervalo actual de color de fondo:" #: optiondialog.cpp:659 msgid "Current range diff background color:" -msgstr "Rango actual de color de fondo de diff:" +msgstr "Intervalo actual de color de fondo de diff:" #: optiondialog.cpp:666 msgid "Color for manually aligned difference ranges:" -msgstr "Color para los rangos de diferencias alineadas manualmente:" +msgstr "Color para los intervalos de diferencias alineadas manualmente:" #: optiondialog.cpp:672 msgid "Directory Comparison View:" @@ -991,7 +1017,7 @@ "On: Se copiará inmediátamente cualquier selección al portapapeles.\n" "Off: Debe copiar explícitamente p.e. via Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Estilo linea final:" @@ -1105,8 +1131,8 @@ "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" "Cuando en modo auto-avanzado el resultado de la selección actual se muestran " -"para el tiempo especificado, antes de saltar al siguiente conflicto. Rango: " -"0-2000 ms" +"para el tiempo especificado, antes de saltar al siguiente conflicto. " +"Intervalo: 0-2000 ms" #: optiondialog.cpp:899 #, fuzzy @@ -1289,8 +1315,10 @@ "(Similar a la opción «--auto» de la línea de órdenes)." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Fusión de directorio" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Directorio" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1935,7 +1963,7 @@ msgid "file3 to open" msgstr "archivo3 a abrir" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Archivo" @@ -1947,10 +1975,6 @@ msgid "Line not available" msgstr "Línea no disponible" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Linea superior" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Fin" @@ -2022,30 +2046,30 @@ msgid "Linediff: A <-> C" msgstr "Lineadiff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Todos los archivos de entrada son binariamente iguales." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Todos los archivos de entrada contienen el mismo texto, pero no son " "binariamente iguales." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Los archivos %1 y %2 son binariamente iguales.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Los archivos %1 y %2 tienen el mismo texto, pero no son binariamente " "iguales. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2055,59 +2079,59 @@ "Tenga en cuenta que la fusión de KDiff3 no se creó para datos binarios.\n" "Continúe bajo su propia cuenta." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Abandonar" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continuar fusionando" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Abriendo archivos..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Error al abrir el archivo" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Cortando selección..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Copiando la selección al portapapeles..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Insertando el contenido del portapapeles..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Guardar y continuar" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continuar sin guardar" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Búsqueda completada." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Búsqueda completada" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" "No hay nada seleccionado en ninguna de las ventanas de entradas de " "diferencias." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" -msgstr "Error al añadir un rango de diferencia manual" +msgstr "Error al añadir un intervalo de diferencia manual" #: kdiff3_shell.cpp:76 msgid "" @@ -2119,70 +2143,70 @@ "Esto normalmente ocurre debido a un problema de instalación. Lea el archivo " "README en el paquete fuente para obtener más detalles." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mezcla de enlaces y archivos normales." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Enlace: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Tamaño: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Fecha y tamaño: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Falló la creación de la copia temporal de %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Falló la apertura de %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Comparando archivo..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Error al leer de %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nombre" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Sin resolver" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Resuelto" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "No blanco" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Blanco" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2190,34 +2214,34 @@ "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar la fusión y volver a leer el directorio?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Volver a buscar" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Falló la apertura de directorios:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Error al abrir directorio" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2227,129 +2251,129 @@ "directorio estan fusionados.\n" "Compruebe de nuevo antes de continuar." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Advertencia en el parámetro" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Escaneando directorios ..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Leyendo directorio A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Leyendo directorio B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Leyendo directorio C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Algunos subdirectorios no se pudieron leer" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Comprobar los permisos de los subdirectorios." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Estado de la comparación del directorio" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Número de subdirectorios:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Número de archivos iguales:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Número de archivos diferentes:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Número de fusiones manuales:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Esto afecta a todas las operaciones de fusión." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Cambiando todas las operaciones de fusión" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Procesando" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Por hacer." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copiar A a B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copiar B a A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Eliminar A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Eliminar B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Fusionar a A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Fusionar a B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Fusionar a A y B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Eliminar (si existe)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Fusionar (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Error: Conflicto de tipos de archivo" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Error: Las fechas son iguales pero los archivos no." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Esta operación no es posible actualmente." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operación imposible" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2363,46 +2387,46 @@ "\n" "Si sabe cómo reproducir esto, por favor contacte con el autor del programa." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Error de programa" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ocurrió un error mientras se copiaba.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Error" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Error de fusión" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Hecho." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Sin guardar." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión desconocida. (Esto no debe ocurrir nunca)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Operación de fusión desconocida." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2421,19 +2445,19 @@ "Tenga en cuenta que este programa todavía es una versión beta y no está " "totalmente garantizado. ¡Realice copias de seguridad de sus datos vitales!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Comenzando fusión" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Hacerlo" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simularlo" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2441,7 +2465,7 @@ "El elemento marcado tiene un tipo diferente en los diferentes directorios. " "Seleccione qué hacer." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2449,7 +2473,7 @@ "Las fechas de modificación del archivo son iguales pero los archivos no. " "Seleccionar qué hacer." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2457,7 +2481,7 @@ "Esta operación no es posible actualmente porque se esta ejecutando una " "fusión de directorios." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2467,216 +2491,216 @@ "¿Desea continuar con el elemento que causó el error o desea omitir este " "elemento?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continuar la fusión después de un error" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continuar con el último elemento" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Omitir elemento" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Omitido." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "En progreso..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Operación de fusión completa." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Fusión completa" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Fusión simulada completa. Compruebe si está de acuerdo con las operaciones " "propuestas." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocurrió un error. Pulse OK para ver información mas detallada.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Error: Mientras se borraba %1: Falló la creación de copia de seguridad." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "eliminar directorio recursivamente( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "eliminar( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: la operación de eliminación de directorio falló al intentar leer el " "directorio." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: la operación rmdir( %1 ) falló." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Error: falló la operación de eliminación." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusión manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Después de una fusión manual el usuario puede continuar " "presionando F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Error: falló la copia ( %1 -> %2 ). Fallo al eliminar destino existente." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: falló copyLink. Enlaces remotos no están soportados todavía." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Error: falló copyLink." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Error durante renombrar( %1 -> %2 ): No se puede eliminar un destino " "existente." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renombrar( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Error: Fallo al renombrar." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Error durante makeDir de %1. No se puede eliminar un archivo existente." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Error al crear el directorio." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Destino del enlace" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (base): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Guardar estado del directorio de fusión como..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Comenzar/Continuar fusión de directorio" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Realizar operación para el elemento actual" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Comparar el archivo seleccionado" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Fusionar archivo actual" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2684,39 +2708,39 @@ "Fusionar\n" "archivo" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Plegar todos los subdirectorios" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Desplegar todos los subdirectorios" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Elegir A para todos los elementos" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Elegir B para todos los elementos" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Elegir C para todos los elementos" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Auto-elegir operación para todos los elementos" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Ninguna operación para todos los elementos" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Mostrar archivos idénticos" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2724,15 +2748,15 @@ "Archivos\n" "idénticos" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Mostrar archivos diferentes" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Mostrar archivos solo en A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2740,11 +2764,11 @@ "Archivos\n" "solo en A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Mostrar archivos solo en B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2752,11 +2776,11 @@ "Archivos\n" "solo en B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Mostrar archivos solo en C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2764,35 +2788,35 @@ "Archivos\n" "solo en C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Comparar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Fusionar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "No hacer nada" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Fusionar a A y B" @@ -2804,13 +2828,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "C&ontinuar" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Salir" @@ -3045,11 +3069,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Conflicto de fusionado (Solo espacio en blanco)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Conflicto de fusionado>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3057,12 +3081,19 @@ "No todos los conflictos se han resuelto ya.\n" "Archivo sin guardar.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Conflictos que faltan" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3071,28 +3102,42 @@ "\n" "Fallo al crear copia de seguridad. Archivo sin guardar." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Error al guardar archivo" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Error al escribir." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Salida" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codificación para guardar" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Conflictos" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Códec de" @@ -3129,3 +3174,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "santi@kde-es.org" + +#~ msgid "Directory Merge" +#~ msgstr "Fusión de directorio"
--- a/kdiff3/po/et/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/et/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,13 +1,13 @@ # translation of kdiff3.po to Estonian # Copyright (C) 2003 Free Software Foundation, Inc. -# Marek Laane <bald@starman.ee>, 2003-2008. +# Marek Laane <bald@starman.ee>, 2003-2009. # msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-12-30 00:05+0300\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-19 04:10+0300\n" "Last-Translator: Marek Laane <bald@starman.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n" "MIME-Version: 1.0\n" @@ -16,96 +16,96 @@ "X-Generator: KBabel 1.0.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Aktiivne seadistus:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Seadistusvõtme viga:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Kasutati võtit --auto, kuid väljundfail pole määratud." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Kataloogide võrdlemisel ignoreeriti võtit --auto." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Salvestamine nurjus." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Nende failide avamine nurjus:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Viga faili avamisel" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Avab dokumendid võrdlemiseks..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Laadi uuesti" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salvestab ühendamise tulemuse. Kõik konfliktid peavad olema lahendatud!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Salvestab käesoleva dokumendi nimega..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Trükib erinevused" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Väljub rakendusest" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Valitud teksti lõikamine ja asetamine lõikepuhvrisse" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopeerib valitud lõigu lõikepuhvrisse" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Lõikepuhvri sisu asetamine praegusesse asukohta" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Kogu aktiivse akna sisu valimine" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Otsib stringi" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Otsib uuesti stringi" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Lülitab staatusriba sisse/välja" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 seadistamine..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Liigu praegusele erinevusele" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -113,11 +113,11 @@ "Praegune\n" "erinevus" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Liigu esimesele erinevusele" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -125,11 +125,11 @@ "Esimene\n" "erinevus" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Liigu viimasele erinevusele" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -137,13 +137,13 @@ "Viimane\n" "erinevus" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Jätab tühimärkide erinevused vahele, kui \"Tühimärkide näitamine\" ei ole " "sees.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -151,11 +151,11 @@ "(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" " "ei ole sees.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Liigu eelmisele erinevusele" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -163,11 +163,11 @@ "Eelmine\n" "erinevus" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Liigu järgmisele erinevusele" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -175,11 +175,11 @@ "Järgmine\n" "erinevus" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Liigu eelmisele konfliktile" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -187,11 +187,11 @@ "Eelmine\n" "konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Liigu järgmisele konfliktile" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -199,11 +199,11 @@ "Järgmine\n" "konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Liigu eelmisele lahendamata konfliktile" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -211,11 +211,11 @@ "Eelmine\n" "lahendamata" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Liigu järgmisele lahendamata konfliktile" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -223,11 +223,11 @@ "Järgmine\n" "lahendamata" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Vali rida/read A-st" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -235,11 +235,11 @@ "Vali\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Vali rida/read B-st" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -247,11 +247,11 @@ "Vali\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Vali rida/read C-st" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -259,12 +259,12 @@ "Vali\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Pärast allikavalikut liigu automaatselt järgmisele lahendamata konfliktile" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -272,21 +272,21 @@ "Automaatselt\n" "järgmine" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Näita erinevusi tühiku- ja tabeldusmärkides" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "Tühimärgid" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Näita tühimärke" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -294,189 +294,209 @@ "Tühimärkide\n" "erinevus" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Näita reanumbreid" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "Reanumbrid" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Vali A kõikjal" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Vali B kõikjal" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Vali C kõikjal" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Vali A kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Vali B kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Vali C kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vali A kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vali B kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vali C kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Lahenda automaatselt lihtsad konfliktid" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Määra erinevused konfliktideks" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Käivita regulaaravaldisega automaatühendamine" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Lahenda automaatselt ajalookonfliktid" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Jaga erinevused valiku juures" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Liida valitud erinevused" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Näita akent A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Näita akent B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Näita akent C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Fokuseeri järgmisele aknale" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normaalne ülevaade" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A-B ülevaade" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A-C ülevaade" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B-C ülevaade" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Reamurdmine võrdlusakendes" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Lisa käsitsi samasus" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Eemalda kõik käsitsi määratud samasused" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Fokuseeri eelmisele aknale" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Lülita poolitamissuund" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Kataloogi ja teksti poolitamisvaade" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Lülita kataloogi- ja tekstivaadet" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Valmis." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Ühendamise tulemust pole salvestatud." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Hoiatus" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Salvesta ja välju" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Välju salvestamata" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Ühendamise tulemuse salvestamine nurjus." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Sul on parajasti käsil kataloogide ühendamine. Kas tõesti katkestada?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Faili salvestamine..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Faili salvestamine uue nimega..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Salvestamine..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Trükkimine..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Ülarida" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Valik" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Trükkimine lõpetatud." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Trükkimine katkestati" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Väljumine..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Tööriistariba lülitamine..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Olekuriba lülitamine..." @@ -574,28 +594,28 @@ msgstr "" "Viga faili kopeerimise operatsioonil: kirjutamine nurjus. Failinimi: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Kataloogi lugemine: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Kataloogi uurimine: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Loobu" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili nurjus." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Lõikepuhvrist" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -610,7 +630,7 @@ "\n" "Praegu lülitatakse eeltöötluse käsu rakendamine välja." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -625,7 +645,7 @@ "\n" "Praegu lülitatakse reasobivuse eeltöötluse käsu rakendamine välja." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -633,7 +653,7 @@ "Andmekaotuse viga:\n" "Kui see on korratav, võta palun ühendust autoriga.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Tõsine seesmine viga" @@ -655,8 +675,8 @@ msgid "C (Optional):" msgstr "C (lisavõimalus):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Ühenda" @@ -783,7 +803,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Loobu" @@ -964,7 +984,7 @@ "Sees: iga valik asetatakse otsekohe lõikepuhvrisse.\n" "Väljas: kopeerimiseks tuleb anda selge käsk, nt. CTRL+C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Realõpu stiil:" @@ -1250,8 +1270,8 @@ "(Samane käsurea võtmega \"--auto\")" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Kataloogi ühendamine" +msgid "Directory" +msgstr "Kataloog" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1886,7 +1906,7 @@ msgid "file3 to open" msgstr "avatav fail3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Fail" @@ -1898,10 +1918,6 @@ msgid "Line not available" msgstr "Rida pole kättesaadav" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Ülarida" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Lõpp" @@ -1972,28 +1988,28 @@ msgid "Linediff: A <-> C" msgstr "Reaerinevus: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Kõik sisendfailid on binaarselt võrdsed." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Kõik sisendfailid sisaldavad ühesugust teksti, aga pole binaarselt võrdsed." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Failid %1 ja %2 on binaarselt võrdsed.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Failid %1 ja %2 sisaldavad ühesugust teksti, aga pole binaarselt võrdsed. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2003,55 +2019,55 @@ "Arvesta, et KDiff3 ühendamine ei ole mõeldud binaarfailidele.\n" "Jätka oma riskil." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Katkesta" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Jätka ühendamist" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Failide avamine..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Viga faili avamisel" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Valitud teksti lõikamine..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Valitud teksti kopeerimine lõikepuhvrisse..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Lõikepuhvri sisu sisestamine..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Salvesta ja jätka" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Jätka salvestamata" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Otsing lõpetatud." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Otsing lõpetatud" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Erinevuste sisendakendes pole midagi valitud." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Viga käsitsi määratud samasuse vahemiku lisamisel" @@ -2065,70 +2081,70 @@ "Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili " "README." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Viitade ja tavafailide segu." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Viit: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Suurus. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Kuupäev ja suurus: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 ajutise koopia loomine nurjus." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1 avamine nurjus." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Faili võrdlemine..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Viga %1 lugemisel" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operatsioon" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Staatus" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Lahendamata" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Lahendatud" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Mitte-tühimärk" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Tühimärk" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2136,34 +2152,34 @@ "Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " "katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Uuri uuesti läbi" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Kataloogide avamine nurjus:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Kataloogi avamise viga" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2172,129 +2188,129 @@ "Sihtkataloog ei saa kolme kataloogi ühendamisel olla sama, mis A või B.\n" "Kontrolli seda asja enne jätkamist." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameetri hoiatus" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Kataloogide läbiuurimine..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Kataloogi A lugemine" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Kataloogi B lugemine" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Kataloogi C lugemine" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Mõned alamkataloogid ei olnud loetavad:" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Kontrolli alamkataloogide õigusi." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Kataloogi võrdlemise olek" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Alamkataloogide arv:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Võrdsete failide arv:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Erinevate failide arv:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Käsitsiühendamiste arv:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "See mõjutab kõiki ühendamisoperatsioone." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Kõigi ühendamisoperatsioonide muutmine" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Töödeldakse " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Veel tegemata." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Kopeeri A->B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Kopeeri B->A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Kustuta A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Kustuta B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Ühenda A-sse" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Ühenda B-sse" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Ühenda A-sse ja B-sse" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Kustuta (kui on olemas)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Ühenda (käsitsi)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Viga: failitüüpide vastuolu" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Viga: kuupäevad on samad, aga mitte failid." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "See operatsioon ei ole praegu võimalik." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operatsioon ei ole võimalik" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2308,46 +2324,46 @@ "\n" "Kui sa tead, kuidas seda korrata, anna sellest teada rakenduse autorile." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Rakenduse viga" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Kopeerimisel tekkis viga.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Viga" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Ühendamise viga" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Viga." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Tehtud." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Ei salvestatud." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Tundmatu ühendamisoperatsioon." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2368,19 +2384,19 @@ "üldse midagi juhtub või et kõik õigesti juhtub! Tee kindlasti tähtsatest " "andmetest varukoopia!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Ühendamise alustamine" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Tee ära" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simuleeri" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2388,21 +2404,21 @@ "Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, " "mida teha." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Failide muutmise aeg on sama, aga failid ise mitte. Otsusta, mida teha." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "See operatsioon ei ole praegu võimalik, sest käib kataloogide ühendamine." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2411,211 +2427,211 @@ "Viimasel sammul tekkis viga.\n" "Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Jätka ühendamist pärast viga" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Jätka viimase elemendiga" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Jäta vahele" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Vahele jäetud." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Töös..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Ühendamisoperatsioon lõpetatud." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Ühendamine lõpetatud" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate " "operatsioonidega nõus." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Viga %1 kustutamisel: varukoopia loomine nurjus." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "kustuta kataloog rekursiivselt( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "kustuta( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Viga: kataloogi kustutamine nurjus juba kataloogi lugemise katsel." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Viga: operatsioon rmdir( %1 ) nurjus." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Viga: kustutamisoperatsioon nurjus." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Märkus: pärast käsitsi ühendamist tuleks jätkata klahviga F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Viga: kopeeri( %1 -> %2) nurjus, sest olemasoleva sihtkoha kustutamine " "nurjus." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopeeri viit( %1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Viga: viida kopeerimine nurjus, sest kaugviidad ei ole veel toetatud." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Viga: viida kopeerimine nurjus." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopeeri( %1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha " "kustutamine nurjus." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "nimeta ümber( %1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Viga: ümbernimetamine nurjus." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Viga kataloogi %1 loomisel: olemasoleva faili kustutamine nurjus." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "loo kataloog( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Viga kataloogi loomisel." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Sihtkoht" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Kataloog" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tüüp" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Suurus" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atribuut" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Viimase muutmise aeg" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "pole kättesaadav" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (sihtkoht): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (baas): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (sihtkoht): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (sihtkoht): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Sihtkoht: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Kataloogi ühendamisoleku salvestamine..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Alusta/jätka kataloogi ühendamist" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Käivita operatsioon käesoleva elemendiga" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Võrdle valitud faili" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Ühenda praegune fail" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2623,39 +2639,39 @@ "Ühenda\n" "fail" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Ava kõik alamkataloogid" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Sule kõik alamkataloogid" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Vali A kõigile elementidele" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Vali B kõigile elementidele" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Vali C kõigile elementidele" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Automaatne valik kõigile elementidele" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Ei ühtki operatsiooni kõigile elementidele" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Näita identseid faile" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2663,15 +2679,15 @@ "Identsed\n" "failid" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Näita erinevaid faile" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Näita ainult A faile" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2679,11 +2695,11 @@ "Ainult\n" "A failid" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Näita ainult B faile" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2691,11 +2707,11 @@ "Ainult\n" "B failid" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Näita ainult C faile" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2703,35 +2719,35 @@ "Ainult\n" "C failid" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Võrdle valitud faile" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Ühenda valitud failid" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ära tee midagi" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Ühenda A-sse ja B-sse" @@ -2743,11 +2759,11 @@ msgid "KDiff3Part" msgstr "KDiff3 komponent" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Jätka" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Välju" @@ -2979,11 +2995,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Ühendamise konflikt (ainult tühimärgid)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Ühendamise konflikt>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2991,12 +3007,21 @@ "Kõik konfliktid pole veel lahendatud.\n" "Faili ei salvestatud.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Järelejäänud konfliktid" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Tekkis realõpu stiili konflikt. Palun vali realõpu stiil käsitsi.\n" +"Faili ei salvestatud.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3005,28 +3030,40 @@ "\n" "Varukoopia loomine nurjus. Faili ei salvestatud." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Faili salvestamise viga" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Kirjutamise viga." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Väljund" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Muudetud]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Kodeering salvestamisel" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "UNIX" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Konflikt" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Koodek" @@ -3064,15 +3101,12 @@ msgid "Your emails" msgstr "bald@smail.ee" +#~ msgid "Directory Merge" +#~ msgstr "Kataloogi ühendamine" + #~ msgid "Enables/disables the toolbar" #~ msgstr "Lülitab tööriistariba sisse/välja" -#~ msgid "Printing aborted." -#~ msgstr "Trükkimine katkestati" - -#~ msgid "Printing completed." -#~ msgstr "Trükkimine lõpetatud." - #~ msgid "Ignored. (User defined.)" #~ msgstr "Ignoreeritakse (kasutaja määratud)"
--- a/kdiff3/po/fr/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/fr/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,17 +1,17 @@ # translation of kdiff3.po to Français # traduction de kdiff3.po vers le Français -# Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc. # # Simon Depiets <2df@tuxfamily.org>, 2005. # Joëlle Cornavin <joelle@bureau-cornavin.com>, 2008. -# Joëlle Cornavin <jcornavi@club-internet.fr>, 2008. +# Joëlle Cornavin <jcornavi@club-internet.fr>, 2008, 2009. # Joëlle Cornavin <jcparis@free.fr>, 2008. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-31 21:06+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-25 19:31+0100\n" "Last-Translator: Joëlle Cornavin <jcornavi@club-internet.fr>\n" "Language-Team: Français <kde-francophone@kde.org>\n" "MIME-Version: 1.0\n" @@ -21,96 +21,95 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Accelerator-Marker: &\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configuration actuelle :" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Erreur d'option de configuration :" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Option --auto utilisée, mais aucun fichier résultat spécifié." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto-ignorée pour la comparaison de dossiers." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Impossible d'enregistrer." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Ouverture de ces fichiers impossible :" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Erreur d'ouverture d'un fichier" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." -msgstr "Ouvre les documents pour comparaison..." - -#: kdiff3.cpp:476 +msgstr "Ouvre les documents pour faire une comparaison..." + +#: kdiff3.cpp:479 msgid "Reload" msgstr "Recharger" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" -"Enregistre le résultat de la fusion. Tous les conflits doivent être résolus !" - -#: kdiff3.cpp:481 +msgstr "Enregistre le résultat de la fusion. Tous les conflits doivent être résolus !" + +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Enregistre le document actuel sous..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Afficher les différences" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Quitte l'application" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Coupe la sélection et la place dans le presse-papiers" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copie la sélection dans le presse-papiers" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Colle le contenu du presse-papiers à la position actuelle" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Tout sélectionner dans la fenêtre actuelle" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Chercher une chaîne" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Chercher à nouveau la chaîne" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Active/désactive la barre d'état" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configurer KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Aller au delta actuel" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -118,11 +117,11 @@ "Actuel\n" "Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Aller au premier delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -130,11 +129,11 @@ "Premier\n" "Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Aller au dernier delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -142,12 +141,11 @@ "Dernier\n" "Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" -"(Saute les différences d'espaces quand « Afficher les espaces » est désactivé)" - -#: kdiff3.cpp:534 +msgstr "(Saute les différences d'espaces quand « Afficher les espaces » est désactivé)" + +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -155,11 +153,11 @@ "(Ne saute pas les différences d'espaces même quand « Afficher les espaces » " "est désactivé)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Aller au delta précédent" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -167,11 +165,11 @@ "Précédent\n" "Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Aller au delta suivant" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -179,11 +177,11 @@ "Suiv\n" "Delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Aller au conflit précédent" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -191,11 +189,11 @@ "Préc\n" "Conflit" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Aller au conflit suivant" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -203,11 +201,11 @@ "Suiv\n" "Conflit" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Aller au conflit non résolu précédent" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -215,11 +213,11 @@ "Préc\n" "Non résolu" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Aller au conflit non résolu suivant" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -227,11 +225,11 @@ "Suiv\n" "Non résolu" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Sélectionner la(les) ligne(s) à partir de A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -239,11 +237,11 @@ "Choisir\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Sélectionner la(les) ligne(s) à partir de B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -251,11 +249,11 @@ "Choisir\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Sélectionner la(les) ligne(s) à partir de C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -263,13 +261,13 @@ "Choisir\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Aller automatiquement au conflit non résolu suivant après sélection de la " "source" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -277,13 +275,13 @@ "Auto\n" "Suivant" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" "Afficher les caractères d'espacement et de tabulation pour voir les " "différences" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -291,11 +289,11 @@ "Blanc\n" "Caractères" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Afficher les espaces" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -303,11 +301,11 @@ "Blanc\n" "Deltas" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Afficher les numéros de ligne" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -315,181 +313,203 @@ "Ligne\n" "Numéros" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Choisir A partout" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Choisir B partout" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Choisir C partout" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Choisir A pour tous les conflits non résolus" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Choisir B pour tous les conflits non résolus" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Choisir C pour tous les conflits non résolus" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choisir A pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choisir B pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choisir C pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Résoudre automatiquement les conflits simples" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Attribuer des deltas aux conflits" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Exécuter la fusion automatique de l'expression rationnelle" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Résoudre automatiquement les conflits d'historique" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Scinder les différences à la sélection" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Réunir les différences sélectionnées" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Afficher la fenêtre A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Afficher la fenêtre B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Afficher la fenêtre C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Mettre le focus sur la fenêtre suivante" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Vue d'ensemble normale" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Vue d'ensemble de A par rapport à B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Vue d'ensemble de A par rapport à C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Vue d'ensemble de B par rapport à C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Retour à la ligne automatique des fenêtres d'affichage de différences" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Ajouter l'alignement manuel des différences" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Effacer tous les alignements manuels des différences" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Mettre le focus sur la fenêtre précédente" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Changer l'orientation du séparateur" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Vue de l'écran divisé en dossier et texte" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Basculer entre l'affichage du dossier et l'affichage du texte" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Prêt." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Le résultat de la fusion n'a pas été enregistré." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Avertissement" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Enregistrer et quitter" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Quitter sans enregistrer" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Enregistrement du résultat de la fusion impossible." -#: kdiff3.cpp:671 pdiff.cpp:1015 -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" +#: kdiff3.cpp:674 pdiff.cpp:1058 +msgid "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Vous effectuez actuellement une fusion de dossiers. Voulez-vous vraiment " "l'interrompre ?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Enregistrement du fichier..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." -msgstr "Enregistrement du fichier avec un nouveau nom..." - -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +msgstr "Enregistrement du fichier sous un nouveau nom..." + +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Enregistrer sous..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#| msgid "Print..." +msgid "Printing..." +msgstr "Impression..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Première ligne" + +#: kdiff3.cpp:951 +#| msgid "Select Font" +msgid "Selection" +msgstr "Sélection" + +#: kdiff3.cpp:977 +#| msgid "Merge operation complete." +msgid "Printing completed." +msgstr "L'impression est terminée." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Impression interrompue." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Fermeture..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "(Dés)Activation de la barre d'outils..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "(Dés)Activation de la barre d'état..." @@ -591,29 +611,28 @@ "Erreur durant l'opération de copie du fichier : écriture impossible. Nom du " "fichier : %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Lecture du dossier : " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listage du dossier : %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Annuler" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." -msgstr "" -"Impossible d'écrire les données du presse-papiers dans un fichier temporaire." - -#: diff.cpp:254 +msgstr "Impossible d'écrire les données du presse-papiers dans un fichier temporaire." + +#: diff.cpp:255 msgid "From Clipboard" msgstr "Depuis le presse-papiers" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -628,7 +647,7 @@ "\n" "La commande de prétraitement sera désactivée dorénavant." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -645,7 +664,7 @@ "La commande de prétraitement de mise en correspondance de lignes sera " "désactivée dorénavant." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -653,7 +672,7 @@ "Erreur de perte de données :\n" "Si cela se reproduit, contactez l'auteur.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Erreur interne critique" @@ -675,8 +694,8 @@ msgid "C (Optional):" msgstr "C (optionnel) :" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Fusion" @@ -808,7 +827,7 @@ msgid "OK" msgstr "Ok" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Annuler" @@ -998,7 +1017,7 @@ "Désactivé : vous devrez effectuer la copie explicitement (par ex. via Ctrl" "+C)." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Style de fin de ligne :" @@ -1251,8 +1270,7 @@ #: optiondialog.cpp:1023 msgid "Merge version control history on merge start" -msgstr "" -"Fusionner l'historique de contrôle de versions lors du démarrage de la fusion" +msgstr "Fusionner l'historique de contrôle de versions lors du démarrage de la fusion" #: optiondialog.cpp:1025 msgid "Run version control history automerge on merge start." @@ -1307,8 +1325,9 @@ "(Similaire à l'option en ligne de commande « --auto »." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Fusion de dossiers" +#| msgid "&Directory" +msgid "Directory" +msgstr "Dossier" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1713,8 +1732,7 @@ msgstr "Supprimer l'intégration de ClearCase" #: optiondialog.cpp:1611 -msgid "" -"Restore the old \"map\" file from before doing the Clearcase integration." +msgid "Restore the old \"map\" file from before doing the Clearcase integration." msgstr "Restaurer l'ancien fichier « map » antérieur à l'intégration Clearcase." #: optiondialog.cpp:1692 kreplacements/kreplacements.cpp:794 @@ -1904,8 +1922,7 @@ #: main.cpp:223 msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "" -"Fichier de sortie, encore. (Pour la compatibilité avec certains outils)" +msgstr "Fichier de sortie, encore. (Pour la compatibilité avec certains outils)" #: main.cpp:224 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" @@ -1915,8 +1932,7 @@ #: main.cpp:225 msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "" -"Ne pas résoudre les conflits automatiquement. (Pour la compatibilité...)" +msgstr "Ne pas résoudre les conflits automatiquement. (Pour la compatibilité...)" #: main.cpp:226 msgid "Visible name replacement for input file 1 (base)." @@ -1946,8 +1962,7 @@ #: main.cpp:231 msgid "Show list of config settings and current values." -msgstr "" -"Afficher la liste des paramètres de configuration et les valeurs actuelles." +msgstr "Afficher la liste des paramètres de configuration et les valeurs actuelles." #: main.cpp:232 msgid "Use a different config file." @@ -1965,7 +1980,7 @@ msgid "file3 to open" msgstr "fichier 3 à ouvrir" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Fichier" @@ -1977,10 +1992,6 @@ msgid "Line not available" msgstr "Ligne non disponible" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Première ligne" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Fin" @@ -2053,30 +2064,30 @@ msgid "Linediff: A <-> C" msgstr "Différences de lignes : A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Tous les fichiers d'entrée sont binairement identiques." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Tous les fichiers d'entrée contiennent le même texte, mais ne sont pas " "binairement identiques." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Les fichiers %1 et %2 sont binairement identiques.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Les fichiers %1 et %2 ont le même texte, mais ne sont pas binairement " "identiques. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2086,57 +2097,57 @@ "Notez que la fusion KDiff3 n'a pas été prévue pour les données binaires.\n" "Continuez à vos risques et périls." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Abandonner" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Poursuivre la fusion" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Ouverture des fichiers..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Erreur d'ouverture du fichier" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Coupe de la sélection..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Copie de la sélection dans le presse-papiers..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Insertion du contenu du presse-papiers..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Enregistrer et continuer" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continuer sans enregistrer" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Recherche terminée." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Recherche terminée" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" "Rien n'est sélectionné dans l'une ou l'autre des fenêtres d'entrée des " "différences." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Erreur lors de l'ajout d'une plage de différences manuel" @@ -2151,70 +2162,70 @@ "Veuillez lire le fichier README dans le paquetage source pour plus de " "détails." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mélange de liens et de fichiers normaux." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Lien : " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Taille. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Date et taille : " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Impossible de créer la copie temporaire de %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Impossible d'ouvrir %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Comparaison du fichier..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Erreur de lecture depuis %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Opération" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "État" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Non résolu" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Résolu" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Non blanc" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2222,34 +2233,34 @@ "Vous effectuez actuellement une fusion de dossier. Voulez-vous vraiment " "abandonner la fusion et analyser à nouveau le dossier ?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Analyser à nouveau" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Impossible d'ouvrir les dossiers :" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier A « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier C « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Erreur lors de l'ouverture du dossier" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2259,129 +2270,129 @@ "fichiers sont fusionnés.\n" "Vérifiez encore avant de continuer." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Avertissement pour les paramètres" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Analyse des dossiers..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Lecture du dossier A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Lecture du dossier B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Lecture du dossier C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Certains sous-dossiers ne sont pas lisibles dans" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Vérifiez les permissions des sous-dossiers." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "État de la comparaison des dossiers" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Nombre de sous-dossiers :" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Nombre de fichiers identiques :" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Nombre de fusions manuelles :" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Ce paramètre affecte toutes les opérations de fusion." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Changement de toutes les opérations de fusion" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "En cours " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "À faire." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copier A vers B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copier B vers A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Supprimer A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Supprimer B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Fusionner vers A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Fusionner vers B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Fusionner vers A et B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Supprimer (s'il existe)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Fusion (manuelle)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Erreur : conflit de types de fichiers" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Erreur : les dates sont identiques mais les fichiers ne le sont pas." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Cette opération n'est actuellement pas possible." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Opération impossible" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2396,46 +2407,46 @@ "Si vous savez comment le reproduire, veuillez contacter l'auteur du " "programme." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Erreur du programme" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Une erreur est survenue lors de la copie.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Erreur" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Erreur de fusion" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Erreur." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Fait." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Non enregistré." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Opération de fusion inconnue." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2455,19 +2466,19 @@ "Sachez que ce programme est encore au stade bêta et qu'il n'y a AUCUNE " "GARANTIE d'aucune sorte ! Faites des sauvegardes de vos données vitales !" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Démarrage de la fusion" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Effectuer la fusion" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simuler la fusion" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2475,7 +2486,7 @@ "L'élément mis en surbrillance est d'un type différent dans les différents " "dossiers. Choisissez ce qu'il faut faire." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2483,7 +2494,7 @@ "Les dates de modification du fichier sont identiques, mais les fichiers ne " "le sont pas. Choisissez ce qu'il faut faire." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2491,7 +2502,7 @@ "Cette opération n'est actuellement pas possible car une fusion de dossiers " "est en cours." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2501,222 +2512,219 @@ "Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le " "sauter ?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continuer la fusion après une erreur" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continuer avec le dernier élément" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Sauter l'élément" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Sauté." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "En cours..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Opération de fusion terminée." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Fusion terminée" -#: directorymergewindow.cpp:2401 -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." +#: directorymergewindow.cpp:2326 +msgid "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulation de fusion achevée : vérifiez si vous êtes d'accord avec les " "opérations proposées." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Une erreur s'est produite. Cliquez sur Ok pour avoir les informations " "détaillées.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." -msgstr "" -"Erreur : durant la suppression de %1 : impossible de créer la sauvegarde." - -#: directorymergewindow.cpp:2474 +msgstr "Erreur : durant la suppression de %1 : impossible de créer la sauvegarde." + +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "supprimer le dossier récursivement( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "supprimer( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erreur : opération de suppression de dossier impossible durant la tentative " "de lecture du dossier." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erreur : opération de suppression de dossier( %1 ) impossible." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Erreur : opération de suppression impossible." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusion manuelle(%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 -msgid "" -" Note: After a manual merge the user should continue by pressing F7." +#: directorymergewindow.cpp:2474 +msgid " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Remarque : après une fusion manuelle, l'utilisateur devra continuer en " "appuyant sur F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erreur : copie( %1 -> %2 ) impossible. Impossible de supprimer la " "destination existante." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copier le lien( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Erreur : copie des liens impossible : les liens distants ne sont pas encore " "pris en charge." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Erreur : copie du lien impossible." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copie( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erreur durant le renommage( %1 -> %2 ) : impossible de supprimer la " "destination existante." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renommer( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Erreur : renommage impossible." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erreur durant la création du dossier de %1. Impossible de supprimer le " "fichier existant." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "création du dossier( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Erreur durant la création du dossier." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dossier" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Taille" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Dernière modification" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Destination du lien" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "non disponible" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest) : " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Base) : " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest) : " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest) : " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest : " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Enregistrer l'état de fusion des dossiers sous..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Démarrer / Poursuivre la fusion des dossiers" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Lancer l'opération pour l'élément actuel" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Fusionner le fichier actuel" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2724,39 +2732,39 @@ "Fusion\n" "Fichier" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Replier tous les sous-dossiers" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Déplier tous les sous-dossiers" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Choisir A pour tous les éléments" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Choisir B pour tous les éléments" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Choisir C pour tous les éléments" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Choisir automatiquement l'opération pour tous les éléments" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Pas d'opération pour tous les éléments" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Afficher les fichiers identiques" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2764,15 +2772,15 @@ "Identiques\n" "Fichiers" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Afficher les fichiers différents" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Afficher les fichiers uniquement dans A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2780,11 +2788,11 @@ "Fichiers\n" "uniquement dans A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Afficher les fichiers uniquement dans B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2792,11 +2800,11 @@ "Fichiers\n" "uniquement dans B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Afficher les fichiers uniquement dans C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2804,35 +2812,35 @@ "Fichiers\n" "uniquement dans C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Comparer les fichiers explicitement sélectionnés" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Fusionner les fichiers explicitement sélectionnés" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ne rien faire" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Fusionner vers A et B" @@ -2844,11 +2852,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Continuer" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Quitter" @@ -3030,8 +3038,7 @@ #: mergeresultwindow.cpp:1008 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" -"Nombre de conflits non résolus restants : %1 (dont %2 concernent des espaces)" +msgstr "Nombre de conflits non résolus restants : %1 (dont %2 concernent des espaces)" #: mergeresultwindow.cpp:301 msgid "" @@ -3083,11 +3090,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Conflit de fusion(Espaces seulement)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Conflit de fusion>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3095,12 +3102,21 @@ "Tous les conflits ne sont pas encore résolus.\n" "Fichier non enregistré.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Conflits restants" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Il y a un conflit de style de fin de ligne. Veuillez choisir le style de fin de ligne manuellement.\n" +"Le fichier n'est pas enregistré.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3109,28 +3125,41 @@ "\n" "Création de la sauvegarde impossible. Fichier non enregistré." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Erreur lors de l'enregistrement du fichier" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Erreur durant l'écriture." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Sortie" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modifié]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Encodage pour l'enregistrement" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Conflit" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Codec depuis" @@ -3167,3 +3196,4 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "jcornavi@club-internet.fr" +
--- a/kdiff3/po/ga/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ga/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: playground-devtools/kdiff3.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-04-18 14:59-0500\n" "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -12,433 +12,453 @@ "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Athluchtaigh" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Éirigh as an bhfeidhmchlár" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Gearr an rannán roghnaithe agus cuir é san ghearrthaisce" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Cuir cóip den rannán roghnaithe sa ghearrthaisce" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Greamaigh inneachar na gearrthaisce ag ionad an chúrsóra" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Cumasaigh/díchumasaigh an barra stádais" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Réidh." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Rabhadh" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Comhad á shábháil..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Comhad á shábháil le hainm comhaid nua..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Sábháil Mar..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Á Phriontáil..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Ag scor..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Barra uirlisí á scoránú..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Scoránaigh an barra stádais..." @@ -527,28 +547,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Cealaigh" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -558,7 +578,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -568,13 +588,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "" @@ -596,8 +616,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Cumaisc" @@ -720,7 +740,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Cealaigh" @@ -893,7 +913,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1131,8 +1151,8 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +msgid "Directory" +msgstr "Comhadlann" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1690,7 +1710,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Comhad" @@ -1702,10 +1722,6 @@ msgid "Line not available" msgstr "" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Deireadh" @@ -1773,81 +1789,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Tobscoir" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Roghnúchán á ghearradh..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Roghnúchán á chóipeáil go dtí an ghearrthaisce..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Inneachar na gearrthaisce á ionsá..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1858,232 +1874,232 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Earráid agus %1 á léamh" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Ainm" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Oibríocht" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Stádas" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Bán" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Athscan" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2092,46 +2108,46 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Earráid" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Earráid." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Críochnaithe." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2143,348 +2159,348 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" +#: directorymergewindow.cpp:2544 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2570 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#: directorymergewindow.cpp:2576 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2585 +msgid "Error: Rename failed." +msgstr "" + +#: directorymergewindow.cpp:2603 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + #: directorymergewindow.cpp:2619 #, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2645 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#: directorymergewindow.cpp:2651 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2660 -msgid "Error: Rename failed." -msgstr "" - -#: directorymergewindow.cpp:2678 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#: directorymergewindow.cpp:2694 -#, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Cineál" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Méid" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "níl ar fáil" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ná Déan Faic" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2494,15 +2510,13 @@ #: kdiff3_part.cpp:302 msgid "KDiff3Part" -msgstr "" - -#: kreplacements/kreplacements.h:102 -#, fuzzy -#| msgid "C&ontinue" +msgstr "KDiff3Part" + +#: kreplacements/kreplacements.h:103 msgid "Continue" -msgstr "&Lean ar aghaidh" - -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +msgstr "Lean ar aghaidh" + +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Scoir" @@ -2728,49 +2742,68 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Aschur" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr ""
--- a/kdiff3/po/gl/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/gl/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,111 +1,112 @@ -# translation of kdiff3.po to galician +# translation of kdiff3.po to Galician # -# mvillarino <mvillarino@users.sourceforge.net>, 2006, 2007, 2008. +# mvillarino <mvillarino@users.sourceforge.net>, 2006, 2007, 2008, 2009. +# Marce Villarino <mvillarino@users.sourceforge.net>, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-11-27 21:36+0100\n" -"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" -"Language-Team: galician <proxecto@trasno.net>\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-18 15:38+0100\n" +"Last-Translator: Marce Villarino <mvillarino@users.sourceforge.net>\n" +"Language-Team: Galician <proxecto@trasno.net>\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" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configuración actual:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Erro da opción de configuración:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" "Indicouse a opción --auto, pero non se especificou nengún ficheiro de saída." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "A opción --auto é ignorada para a comparación de cartafoles." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "O gardado fallou." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Fallou o aceso a estes ficheiros:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Erro de aceso ao ficheiro" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Abre os documentos para comparalos..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Cargar de novo" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Garda o resultado da fusión. Todos os conflitos deben estar resolvidos!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Garda o documento actual como..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Imprimir as diferenzas" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Sai da aplicación" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a sección escollida e colócaa no portarretallos" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copia a sección escollida no portarretallos" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Apega o contido do portarretallos na posición actual" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Escolle todo na fiestra actual" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Procura un texto" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Procura de novo o texto" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Habilita/deshabilita a barra de estado" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Ir para o delta actual" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -113,11 +114,11 @@ "Delta\n" "actual" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Ir para o primeiro delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -125,11 +126,11 @@ "Primeiro\n" "delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Ir para o último delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -137,13 +138,13 @@ "Último\n" "delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenzas de espazos se \"Mostrar os espazos en branco\" está " "deshabilitado.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -151,31 +152,31 @@ "(Non ignora as diferenzas de espazos mesmo se \"Mostrar os espazos en branco" "\" está deshabilitado.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Ir para o delta anterior" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "Delta anterior" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Ir para o seguinte delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "Seguinte delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Ir para o conflito anterior" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -183,21 +184,21 @@ "Conflito\n" "anterior" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Ir para o seguinte conflito" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "Seguinte conflito" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Ir para o anterior conflito por resolver" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -205,11 +206,11 @@ "Non resolvido\n" "anterior" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Ir para o seguinte conflito por resolver" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -217,11 +218,11 @@ "Seguinte\n" "non resolvido" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Escoller as liñas de A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -229,11 +230,11 @@ "Escoller\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Escoller as liñas de B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -241,11 +242,11 @@ "Escoller\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Escoller as liñas de C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -253,13 +254,13 @@ "Escoller\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir automaticamente para o seguinte conflito por resolver tras escoller a " "fonte" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -267,11 +268,11 @@ "Ir automaticamente\n" "ao seguinte" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar as diferenzas de espazos e tabulacións" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -279,11 +280,11 @@ "Caracteres\n" "en branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Mostrar os espazos en branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -291,11 +292,11 @@ "Deltas\n" "en branco" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Mostrar os números de liña" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -303,179 +304,199 @@ "Números\n" "de liña" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Escoller A en todas partes" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Escoller B en todas partes" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Escoller C en todas partes" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Escoller A en todos os conflitos por resolver" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Escoller B en todos os conflitos por resolver" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Escoller C en todos os conflitos por resolver" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escoller A en todos os conflitos de espazos por resolver" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escoller B en todos os conflitos de espazos por resolver" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escoller C en todos os conflitos de espazos resolver" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Resolver automaticamente os conflitos simples" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Pasar os deltas para conflitos" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Executar a fusión automática de expresións regulares" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Resolver automaticamente os conflitos do histórico" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Dividir a diferenza na selección" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Xuntar as diferenzas escollidas" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Mostrar a fiestra A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Mostrar a fiestra B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Mostrar a fiestra C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Focar a próxima fiestra" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Resumo normal" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Resumo A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Resumo A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Resumo B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Saltar de liña nas fiestras de diferenzas" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Engadir o aliñamento manual das diferenzas" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Limpar todos os aliñamentos de diferenzas manuais" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Focar a fiestra anterior" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Comutar a orientación da repartición" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Dividir a vista de cartafoles e texto" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Comutar entre a fiestra de cartafoles e de texto" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Listo." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "O resultado da fusión aínda non foi gardado." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Aviso" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Gardar e sair" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Sair sen gardar" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "O gardado do resultado da fusión fallou." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Está a facer unha fusión de cartafoles. Desexa realmente abortala?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "A gardar o ficheiro..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "A gardar o ficheiro cun nome novo..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Gardar como..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "A imprimir..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Liña superior" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Selección" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "A impresión terminou." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Cancelouse a impresión." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "A sair..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "A comutar a barra de ferramentas..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Comutar a barra de estado..." @@ -575,29 +596,29 @@ msgstr "" "Aconteceu un erro durante a copia do ficheiro: A escrita fallou. Ficheiro: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "A ler o cartafol: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "A listar o cartafol: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Cancelar" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" "Fallou a escritura de dados do portarretallos para o ficheiro temporal." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Do portarretallos" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -610,7 +631,7 @@ "%1\n" "O comando de preprocesamento vai ser desactivado." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -624,7 +645,7 @@ "%1\n" "O comando de preprocesamento con procura de liñas vai ser desactivado." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -632,7 +653,7 @@ "Erro de perda de dados:\n" "Se fose reproducíbel, contacte co autor.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Erro interno grave" @@ -654,8 +675,8 @@ msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Xuntar" @@ -786,7 +807,7 @@ msgid "OK" msgstr "Aceitar" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Cancelar" @@ -964,10 +985,10 @@ "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Sinalado: calquer selección é posta automaticamente no portarretallos.\n" +"Sinalado: calquera selección é posta automaticamente no portarretallos.\n" "Non sinalado: Terá que copiar explicitamente, p.ex., con Ctrl+C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Estilo do fin de liña:" @@ -1130,7 +1151,7 @@ "A expresión regular das liñas nas que KDiff3 deberá escoller automaticamente " "unha orixe.\n" "Cando unha liña cun conflito corresponda coa expresión regular entón \n" -"C -se está disponíbel-, en caso contrario será escollido B." +"C -se está dispoñíbel-, en caso contrario será escollido B." #: optiondialog.cpp:950 msgid "Run regular expression auto merge on merge start" @@ -1260,8 +1281,8 @@ "(Similar á opción da liña de comandos \"--auto\")." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Fusión de cartafoles" +msgid "Directory" +msgstr "Cartafol" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1467,7 +1488,7 @@ "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -"Oferece armacenar os ficheiros en ambos cartafoles\n" +"Oferece almacenar os ficheiros en ambos cartafoles\n" "para que ambos fiquen iguais.\n" "Funciona só ao comparar dous cartafoles sen indicar un destino." @@ -1883,7 +1904,7 @@ "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -"Substitui unha opción de configuración. Use unha vez para cada opción. P. " +"Substitúe unha opción de configuración. Use unha vez para cada opción. P. " "ex.: --cs \" AutoAdvance=1\"" #: main.cpp:231 @@ -1906,7 +1927,7 @@ msgid "file3 to open" msgstr "o ficheiro 3 a abrir" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Ficheiro" @@ -1916,11 +1937,7 @@ #: difftextwindow.cpp:392 msgid "Line not available" -msgstr "Liña non disponíbel" - -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Liña superior" +msgstr "Liña non dispoñíbel" #: difftextwindow.cpp:1731 msgid "End" @@ -1992,30 +2009,30 @@ msgid "Linediff: A <-> C" msgstr "Dif. liñas: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada son iguais a nível binario." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Todos os ficheiros de entrada conteñen o mesmo texto, pero non son iguais a " "nível binario." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Os ficheiros %1 e %2 son iguais a nível binario.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os ficheiros %1 e %2 teñen texto igual, pero non son iguais a nível " "binario.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2025,56 +2042,56 @@ "Lembre que a fusión de KDiff3 non foi pensada para os dados binarios.\n" "Continúe a súa conta e risco." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continuar coa fusión" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "A abrir os ficheiros..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Erro ao abrir o ficheiro" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "A cortar a selección..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "A copiar a selección para o portarretallos..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "A inserir o contido do portarretallos..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Gardar e continuar" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continuar sen gardar" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Procura terminada" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" "Non hai nada escollido en nengunha das fiestras de entrada das diferenzas." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Aconteceu un erro ao engadir o rango manual de diferenzas" @@ -2088,70 +2105,70 @@ "Isto acontece normalmente debido a un problema de instalación. Lea o " "ficheiro README no paquete coas fontes para máis detalles." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mistura de ligazóns e ficheiros normais." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Ligazón: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Tamaño. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Data e tamaño: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Fallou a criación da copia temporal de %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Fallou a abertura de %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "A comparar o ficheiro..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Aconteceu un erro ao ler de %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Non resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Non valeiro" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Valeiro" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2159,34 +2176,34 @@ "Está a facer unha fusión de cartafoles. Desexa realmente interromper a " "fusión e analisar o cartafol de novo?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Analisar de novo" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Fallou o aceso aos cartafoles:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "O cartafol A \" %1\" non existe ou non é un cartafol.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "O cartafol B \" %1\" non existe ou non é un cartafol.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "O cartafol C \" %1\" non existe ou non é un cartafol.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Erro de aceso ao cartafol" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2196,129 +2213,129 @@ "fusionados tres cartafoles.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Aviso de parámetro" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "A analisar os cartafoles..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Lendo o cartafol A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Lendo o cartafol B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Lendo o cartafol C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Algúns dos subcartafoles non eran lexíbeis" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Verifique os permisos dos subcartafoles." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Estado da comparación do cartafol" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Número de subcartafoles:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Número de ficheiros iguais:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Número de ficheiros diferentes:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Número de fusións manuais:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Isto afecta a todas as operacións de fusión." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "A mudar todas as operacións de fusión" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "A procesar" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Por facer." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Borrar A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Borrar B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Borrar A e B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Xuntar en A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Xuntar en B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Xuntar en A e B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Borrar (se existe)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Xuntar (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de ficheiros en conflito" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas son iguais pero os ficheiros non." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Esta operación non é posíbel de momento." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operación non posíbel" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2332,46 +2349,46 @@ "\n" "Se sabe como reproducir isto, por favor contacte co autor do programa." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Erro no programa" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Aconteceu un erro ao copiar.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Erro na fusión" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Non gardado." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión descoñecida. (Isto non debera acontecer nunca!) " -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Operación de fusión descoñecida." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2390,26 +2407,26 @@ "Teña en conta que este programa aínda está en estado Beta e Non Hai Nengunha " "GARANTÍA! Faga copias de seguridade dos seus dados vitais!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "A iniciar a fusión" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Face-la" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simula-la" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "O elemento realzado ten un tipo diferente nos cartafoles. Escolla que facer." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2417,14 +2434,14 @@ "As datas de modificación dos ficheiros son iguais pero estes non o son. " "Escolla que facer." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "Esta operación non é posíbel de momento porque se está a fundir o cartafol." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2433,210 +2450,210 @@ "Aconteceu un erro no último paso.\n" "Desexa continuar co ítem que causou o erro ou desexa salta-lo?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continuar a fusión após un erro" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continuar co último ítem" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Saltar o ítem" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "En progreso..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "A operación de fusión terminou." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Fusión completada" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulación da fusión terminou: Comprobe se concorda coas operacións " "propostas." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Aconteceu un erro. Prema en Aceitar para ver información detallada.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar borrar %1: a criación da copia de seguridade fallou." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "borrar recursivamente os cartafoles (%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "borrar (%1) " -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operación de borrado do cartafol fallou ao tentar ler o cartafol." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operación rmdir (%1) fallou." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Erro: a operación de borrado fallou." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "unión manual(%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Nota: Após unha unión manual debe continuar premendo F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: A copia (%1 -> %2) fallou. Non se borrou o destino existente." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink(%1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: copyLink fallou: As ligazóns remotas aínda non están soportadas." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Erro: copyLink fallou." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copia(%1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro ao mudar o nome (%1 -> %2): Non foi posíbel borrar o destino existente." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "mudar o nome (%1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Erro: fallou a mudanza do nome." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante makeDir de %1. Non foi posíbel borrar o ficheiro existente." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir(%1)" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Erro ao criar o cartafol." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Destino da ligazón" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" -msgstr "non disponíbel" - -#: directorymergewindow.cpp:2801 +msgstr "non dispoñíbel" + +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Gardar o estado da fusión de cartafoles como..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a fusión do cartafol" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Executar a operación no ítem actual" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Comparar o ficheiro escollido" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Fundir o ficheiro actual" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2644,39 +2661,39 @@ "Xuntar\n" "o ficheiro" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Recoller todos os subcartafoles" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Expandir todos os subcartafoles" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Escoller todos os itens de A" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Escoller todos os itens de B" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Escoller todos os itens de C" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Escoller automaticamente a operación para todos os itens" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Nengunha operación para todos os itens" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Mostrar os ficheiros idénticos" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2684,15 +2701,15 @@ "Ficheiros\n" "idénticos" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Mostrar os ficheiros diferentes" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Mostrar os ficheiros só en A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2700,11 +2717,11 @@ "Ficheiros\n" "só en A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Mostrar os ficheiros só en B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2712,45 +2729,45 @@ "Ficheiros\n" "só en B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Mostrar os ficheiros só en C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "Ficheiros só en C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Comparar os ficheiros escollidos explicitamente" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Fundir os ficheiros escollidos explicitamente" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Non facer ren" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Borrar A e B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Xuntar en A e B" @@ -2762,11 +2779,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Continuar" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Sair" @@ -3001,11 +3018,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Conflito na fusión (Só espazos en branco)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Conflito na fusión>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3013,12 +3030,21 @@ "Aínda non se resolveron todos os conflitos.\n" "O ficheiro non foi gardado.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Aínda hai conflitos" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Hai un conflito no estilo do fin de liña. Escóllao manualmente.\n" +"Non se gardou o ficheiro.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3027,28 +3053,40 @@ "\n" "A criación da salvagarda fallou. O ficheiro non foi gardado." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Erro ao gardar o ficheiro" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Erro ao gardar." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Saída" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codificación para gardar" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Conflito" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Códec de"
--- a/kdiff3/po/hi/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/hi/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-01-22 16:10+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n" "Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n" @@ -15,449 +15,474 @@ "X-Poedit-Language: Hindi\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "मौजूदा वस्तु सिंक ऑपरेशन" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "विकल्प --auto का उपयोग किया गया, परंतु कोई आउटपुट फ़ाइल निर्दिष्ट नहीं." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "विकल्प --auto को डिरेक्ट्री तुलना करने में छोड़ा गया." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "सहेजने में असफल." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "इन फ़ाइलों को खोलना असफल:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "दस्तावेज़ों को तुलना के लिए खोलता है..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy msgid "Reload" msgstr "तैयार." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "मौजूदा दस्तावेज़ ऐसे सहेजता है..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "अनुप्रयोग से बाहर होता है" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "चुने हुए अंश को क्लिपबोर्ड पर नक़ल करता है" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "क्लिपबोर्ड अवयवों को सही स्थान पर चिपकाता है" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "स्ट्रिंग के लिए ढूंढें" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "स्ट्रिंग के लिए फिर से ढूंढें" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "स्थिति-पट्टी सक्षम/अक्षम करें" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "के-डिफ3 को कॉन्फ़िगर करें..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "मौज़ूदा डेल्टा में जाएँ" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy msgid "" "Current\n" "Delta" msgstr "मौज़ूदा डेल्टा में जाएँ" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "प्रथम डेल्टा में जाएँ" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy msgid "" "First\n" "Delta" msgstr "प्रथम डेल्टा में जाएँ" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "अंतिम डेल्टा में जाएँ" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy msgid "" "Last\n" "Delta" msgstr "अंतिम डेल्टा में जाएँ" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "पिछला डेल्टा में जाएँ" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy msgid "" "Prev\n" "Delta" msgstr "पिछला डेल्टा में जाएँ" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "अगला डेल्टा में जाएँ" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy msgid "" "Next\n" "Delta" msgstr "अगला डेल्टा में जाएँ" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "पिछले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy msgid "" "Prev\n" "Conflict" msgstr "परस्पर विरोध" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "अगले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy msgid "" "Next\n" "Conflict" msgstr "अगले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "पिछले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy msgid "" "Prev\n" "Unsolved" msgstr "हल नहीं" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "अगले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy msgid "" "Next\n" "Unsolved" msgstr "हल नहीं" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "अ से लाइन चुनें" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "ब से लाइन चुनें" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "स से लाइन चुनें" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "स्वचालित नक़ल चयन" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "भिन्नताओं के लिए टेबुलेटर अक्षर तथा जगह दिखाएँ " -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "सफेद जगह दिखाएँ" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "पंक्ति क्रमांक दिखाएँ" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy msgid "" "Line\n" "Numbers" msgstr "पंक्ति क्रमांक दिखाएँ" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "सभी जगह अ चुनें" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "सभी जगह ब चुनें" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "सभी जगह स चुनें" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए अ चुनें" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए ब चुनें" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए स चुनें" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए अ चुनें" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए ब चुनें" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए स चुनें" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "डेल्टा को परस्पर विरोधों में सेट करें" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "चयनित फ़ाइल की तुलना करें" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "विंडो अ दिखाएँ" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "विंडो ब दिखाएँ" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "विंडो स दिखाएँ" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "अगले विंडो पर फोकस" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "सामान्य ओवरव्यू" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "अ वि. ब ओवरव्यू" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "अ वि. स ओवरव्यू" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "ब वि. स ओवरव्यू" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "वर्ड व्रेप डिफ विंडोज़" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "पिछले विंडो में फोकस" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "अलग करने की दिशा टॉगल करें" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "डिरेक्ट्री तथा पाठ स्प्लिट स्क्रीन दृश्य" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "डिरेक्ट्री तथा पाठ दृश्य के बीच टॉगल करें" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "तैयार." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "सम्मिलित करने का परिणाम अभी सहेजा नहीं गया." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "सहेजें तथा बाहर हों" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "सहेजे बगैर बाहर हों" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "सम्मिलित किया जाने का परिणाम सहेजना असफल." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "फ़ाइल सहेजा जा रहा है..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "फ़ाइल नए फ़ाइलनाम के साथ सहेजा जा रहा है..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "बाहर हो रहे हैं..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "शीर्ष पंक्ति %1" + +#: kdiff3.cpp:951 +#, fuzzy +msgid "Selection" +msgstr "अन्य फ़ॉन्ट चुनें" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "सम्मिलित करने की क्रिया पूरी हुई." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "सम्मिलित करने की क्रिया पूरी हुई." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "बाहर हो रहे हैं..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "टूलबार टॉगल किया जा रहा है..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "स्थिति पट्टी टॉगल करें..." @@ -550,28 +575,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: लिखने में असफल. फ़ाइल-नाम: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "डिरेक्ट्री को पढ़ा जा रहा है:" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "डिरेक्ट्री सूचीबद्ध की जा रही है: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "क्लिपबोर्ड डाटा को अस्थाई फ़ाइल में लिखना असफल." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "क्लिपबोर्ड से" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -581,7 +606,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -591,13 +616,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "गंभीर आंतरिक त्रुटि" @@ -619,8 +644,8 @@ msgid "C (Optional):" msgstr "स (वैकल्पिक):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "सम्मिलित करें" @@ -743,7 +768,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -920,7 +945,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "पंक्ति ख़त्म होने की शैलीः" @@ -1165,8 +1190,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "डिरेक्ट्री सम्मिलित करें" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "डिरेक्ट्री (&D)" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1736,7 +1763,7 @@ msgid "file3 to open" msgstr "खोलने के लिए फ़ाइल3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy msgid "File" msgstr "फ़ाइल..." @@ -1751,11 +1778,6 @@ msgid "Line not available" msgstr "उपलब्ध नहीं" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "शीर्ष पंक्ति %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "अंत" @@ -1823,82 +1845,82 @@ msgid "Linediff: A <-> C" msgstr "लाइनडिफ: अ <-> स" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "सभी इनपुट फ़ाइलें बाइनरी समान हैं." -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "सभी इनपुट फ़ाइलें एक ही पाठ रखे हैं." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "फ़ाइलें ब तथा स बाइनरी समान हैं.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "छोड़ें" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "मिलाया जाना जारी रखें" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "फ़ाइलें खोली जा रही हैं..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "फ़ाइल खोलने में त्रुटि" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "चयन को काटा जा रहा है..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "चुने हुए की नकल क्लिपबोर्ड पर बनाया जा रहा है..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "क्लिपबोर्ड के वस्तुओं को प्रविष्ट किया जा रहा है..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "सहेजें तथा जारी रखें" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "सहेजे बगैर जारी रखें" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." @@ -1910,232 +1932,232 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "कड़ियों की मिलावटें तथा सामान्य फ़ाइलें." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "कड़ी" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "आकार." -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "तारीख व आकार:" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 की अस्थाई नक़ल बनाना असफल." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1 को खोलना असफल" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "फ़ाइल की तुलना की जा रही है..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1 से पढ़ने में त्रुटि" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "ऑपरेशन" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "हल नहीं" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "हल कर लिया गया" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "सफेद-नहीं" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "सफेद" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "री-स्कैन" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "डिरेक्ट्रीज़ खोलना असफल:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री अ \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री ब \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री स \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "डिरेक्ट्री खोलने में त्रुटि" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "पैरामीटर चेतावनी" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "डिरेक्ट्रीज़ स्कैन किया जा रहा है..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "डिरेक्ट्री अ को पढ़ा जा रहा है" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "डिरेक्ट्री ब को पढ़ा जा रहा है" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "डिरेक्ट्री स को पढ़ा जा रहा है" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "कुछ सबडिरेक्ट्रीज़ इसमें पढ़े नहीं जा सकने वाले हैं" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "सबडिरेक्ट्रीज़ की अनुमतियाँ जाँचें." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "डिरेक्ट्री तुलना स्थिति" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "सबडिरेक्ट्रीज़ की संख्या:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "समान फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "हस्तचालित सम्मिलित करने की संख्या:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "यह सभी सम्मिलित ऑपरेशन को प्रभावित करेगा" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "सभी सम्मिलित करने के ऑपरेशन को बदला जा रहा है" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "प्रोसेसिंग" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "कार्य-सूची" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "अ की नक़ल ब में करें" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "ब की नक़ल अ में करें" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "अ को मिटाएँ" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "ब को मिटाएँ" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "अ में सम्मिलित करें" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "ब में सम्मिलित करें" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "अ तथा ब में सम्मिलित करें" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "मिटाएँ (यदि मौजूद है)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "सम्मिलित करें (हस्तचालित)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "त्रुटि: परस्पर विरोधी फ़ाइल क़िस्में" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "त्रुटि: तारीखें तो एक समान हैं, परंतु फ़ाइलें नहीं." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "यह ऑपरेशन वर्तमान में संभव नहीं है." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "ऑपरेशन वर्तमान में संभव नहीं" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2144,47 +2166,47 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "प्रोग्राम त्रुटि" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "नक़ल करने के दौरान एक त्रुटि हुई.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy msgid "Error" msgstr "त्रुटि." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "सम्मिलित करने में त्रुटि" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "त्रुटि." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "सम्पन्न." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "सहेजा नहीं गया." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. (ऐसा कभी नहीं होना चाहिए!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. " -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2196,354 +2218,354 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "सम्मिलित करना प्रारंभ किया जा रहा है" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "इसे करें" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "इसे सिमुलेट करें" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "त्रुटि के बाद भी सम्मिलित करना जारी रखें" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "पिछली वस्तु के साथ जारी रखें" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "वस्तु छोड़ें" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "छोड़ा." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "प्रगति पर है..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "सम्मिलित करना सम्पन्न" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "एक त्रुटि हुई. विस्तृत जानकारी देखने के लिए ठीक को दबाएँ\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "त्रुटि: %1 को मिटाने के दौरान: बैकअप बनाने में असफल." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "डिरेक्ट्री ( %1 ) को रिकर्सिवली मिटाएँ" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "मिटाएं (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "त्रुटि: डिरेक्ट्री को पढ़ने की कोशिश में डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "त्रुटि: rmdir( %1 ) क्रिया असफल." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "त्रुटि: डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "हस्तचालित सम्मिलित करें( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" "टीप: हस्तचालित सम्मिलित करने के बाद उपयोक्ता को F7 को दबाकर जारी रखना चाहिए." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "त्रुटि: नक़ल ( %1 -> %2 ) असफल. मौजूदा गंतव्य को मिटाना असफल." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "कापीलिंक ( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "त्रुटि: कापीलिंक असफल: रिमोट कड़ियाँ अभी समर्थित नहीं हैं." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "त्रुटि: कापीलिंक असफल." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "नक़ल( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "नाम बदलें( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "त्रुटि: नाम-बदलना असफल." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 के मेकडिर के दौरान त्रुटि. मौजूदा फ़ाइल मिटा नहीं सकते." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "मेकडिर( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "गंतव्य" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "डिर." -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "क़िस्म" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "एट्रि." -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "अंतिम परिवर्धन" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "लिंक-गंतव्य" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "उपलब्ध नहीं" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (गंत.): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (आधार): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (गंत.): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (गंत.): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "गंतव्य:" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "डिरेक्ट्री सम्मिलित करें" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "डिरेक्ट्री सम्मिलित करना प्रारंभ करें/जारी रखें" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "मौज़ूदा वस्तु के लिए ऑपरेशन चलाएँ" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "मौज़ूदा फ़ाइल सम्मिलित करें" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy msgid "" "Merge\n" "File" msgstr "सम्मिलित करें" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज फ़ोल्ड करें" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज अनफ़ोल्ड करें" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "सभी वस्तुओं के लिए अ का चयन करें" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "सभी वस्तुओं के लिए ब का चयन करें" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "सभी वस्तुओं के लिए स का चयन करें" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "सभी वस्तुओं के लिए क्रिया स्वचालित चयन करें" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "सभी वस्तुओं के लिए कोई क्रिया नहीं" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "कुछ नहीं करें" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "अ" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "ब" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "स" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "अ तथा ब में सम्मिलित करें" @@ -2555,13 +2577,13 @@ msgid "KDiff3Part" msgstr "के-डिफ3पार्ट" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "जारी रखें (&o)" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2810,11 +2832,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2822,39 +2844,60 @@ "अब तक सभी विरोधाभासों का समाधान नहीं किया गया है.\n" "फ़ाइल सहेजा नहीं गया.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "विरोधाभास बायाँ " #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "फ़ाइल सहेजने में त्रुटि" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "लिखने के दौरान त्रुटि." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[परिवर्धित]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "परस्पर विरोध" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -2892,6 +2935,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "डिरेक्ट्री सम्मिलित करें" + #~ msgid "C&ontinue" #~ msgstr "जारी रखें (&o)" @@ -2908,10 +2954,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "औज़ार-पट्टी सक्षम/अक्षम करें" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "सम्मिलित करने की क्रिया पूरी हुई." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n"
--- a/kdiff3/po/hu/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/hu/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: KDE 3.2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2004-01-09 11:11+0100\n" "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n" "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n" @@ -15,102 +15,102 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "Szinkronizálási művelet az aktuális elemmel" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Fájlmegnyitási hiba" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" "Az --auto opciót használná a program, de nincs megadva a kimeneti fájl." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" "Az --auto opció figyelmen kívül lesz hagyva könyvtárak összehasonlításánál." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "A mentés nem sikerült." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Nem sikerült megnyitni a következő fájlokat:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fájlmegnyitási hiba" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Dokumentumok megnyitása összehasonlításhoz..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Kész." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Az összeolvasztás eredményének elmentése. Minden ütközést fel kell oldani." -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Az aktuális dokumentum mentése mint..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Kilépés az alkalmazásból" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Kivágja a kijelölt részt és a vágólapra helyezi" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kimásolja a kijelölt részt és a vágólapra helyezi" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Beilleszti a vágólap tartalmát az aktuális pozíciónál" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Sztring keresése" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "A sztring keresése újból" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Az állapotsor ki-be kapcsolása" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "A KDiff3 beállításai..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Ugrás az aktuális deltára..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -118,11 +118,11 @@ "Delta" msgstr "Ugrás az aktuális deltára..." -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Ugrás az első deltára" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -130,11 +130,11 @@ "Delta" msgstr "Ugrás az első deltára" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Ugrás az utolsó deltára" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -142,21 +142,21 @@ "Delta" msgstr "Ugrás az utolsó deltára" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Ugrás az előző deltára" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -164,11 +164,11 @@ "Delta" msgstr "Ugrás az előző deltára" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Ugrás a következő deltára" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -176,11 +176,11 @@ "Delta" msgstr "Ugrás a következő deltára" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Ugrás az előző ütközésre" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -188,11 +188,11 @@ "Conflict" msgstr "Ütközések" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Ugrás a következő ütközésre" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -200,94 +200,94 @@ "Conflict" msgstr "Ugrás a következő ütközésre" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Ugrás az előző feloldatlan ütközésre" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Ugrás a következő feloldatlan ütközésre" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Sor(ok) kiválasztása A-ból" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Sor(ok) kiválasztása B-ből" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Sor(ok) kiválasztása C-ből" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "A forrás kiválasztása után automatikus ugrás a következő feloldatlan " "ütközésre" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "A kijelölt adatok automatikus kimásolása a vágólapra" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "A szóközök és tabulátorok megjelenítése eltéréseknél" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Az üres karakterek megjelenítése" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "A sorszámok megjelenítése" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -295,189 +295,215 @@ "Numbers" msgstr "A sorszámok megjelenítése" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "A kiválasztása mindenhol" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "B kiválasztása mindenhol" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "C kiválasztása mindenhol" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "B kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "C kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Delták beállítása az ütközésekhez" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "A kiválasztott fájl összehasonlítása" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Az A ablak megjelenítése" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "A B ablak megjelenítése" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "A C ablak megjelenítése" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Fókusz a következő ablakra" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Fókusz az előző ablakra" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "A megosztás irányának megváltoztatása" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Osztott nézet (könyvtár és szöveg)" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Váltás a könyvtár- és szöveges nézet között" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Kész." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Az összeolvasztás eredménye még nincs elmentve." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Mentés és kilépés" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Kilépés mentés nélkül" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Az összeolvasztás eredményét nem sikerült elmenteni." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Éppen folyamatban van egy könyvtárösszeolvasztás. Biztosan félbe szeretné " "szakítani a műveletet?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "A fájl mentése..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "A fájl elmentése más néven..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Kilépés..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Felső sor - %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "Válasszon egy másik betűtípust" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Az összeolvasztási művelet befejeződött." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Az összeolvasztási művelet befejeződött." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Kilépés..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Az eszköztár átkapcsolása..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Az állapotsor átkapcsolása..." @@ -579,28 +605,28 @@ "Hiba történt fájlmásolás közben: egy írási művelet nem sikerült. A fájl " "neve: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Könyvtár beolvasása: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Könyvtár kilistázása: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "A vágólapról" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -610,7 +636,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -620,7 +646,7 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -628,7 +654,7 @@ "Adatvesztési hiba:\n" "ha a jelenség többször is előfordul, kérjük jelentse be a hibát.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Súlyos belső hiba történt" @@ -650,8 +676,8 @@ msgid "C (Optional):" msgstr "C (opcionális):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Összeolvasztás" @@ -775,7 +801,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -967,7 +993,7 @@ "vágólapra kerül.\n" "Ha nincs bejelölve: a másolás csak parancsra történik meg (pl. a Ctrl+C-vel)." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1230,8 +1256,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Könyvtárösszeolvasztás" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "Köny&vtár" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1866,7 +1894,7 @@ msgid "file3 to open" msgstr "a megnyitandó fájl (3)" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1884,11 +1912,6 @@ msgid "Line not available" msgstr "nem áll rendelkezésre" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Felső sor - %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Vég" @@ -1957,27 +1980,27 @@ msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Az összes bemeneti fájl megegyezik (bináris módban)." -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "Az összes bemeneti fájl megegyezik (szöveges módban)." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "B és C binárisan megegyezik.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "A és B fájl binárisan megegyezik.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1987,55 +2010,55 @@ "A KDiff3-féle összeolvasztás szöveges fájlok kezelésére való.\n" "Csak akkor lépjen tovább, ha valóban ezt szeretne." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Félbeszakítás" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "A művelet folytatása" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Fájlok megnyitása..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fájlmegnyitási hiba" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "A kijelölt adatok kivágása..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "A kijelölt adatok másolása a vágólapra..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "A vágólap tartalmának beillesztése..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Mentés és folytatás" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Folytatás mentés nélkül" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "A keresés befejeződött." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "A keresés befejeződött" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Hiba történt egy könyvtár létrehozása közben." @@ -2055,71 +2078,71 @@ "Ez a hiba valószínűleg valamilyen telepítési probléma következménye. További " "információ a forráscsomagban található README fájlban található." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Linkek és normál fájlok vegyesen." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Méret. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Dátum és méret: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Nem sikerült ideiglenes másolatot készíteni a(z) %1 fájlról." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1 megnyitása nem sikerült." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 #, fuzzy msgid "Comparing file..." msgstr "A fájl mentése..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1 olvasása közben hiba történt" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Név" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Művelet" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Állapot" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2127,34 +2150,34 @@ "Egy könyvtárösszeolvasztás még nem fejeződött be. Biztosan félbe szeretné " "szakítani a műveletet és újra be szeretné olvasni a könyvtár tartalmát?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Újraolvasás" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Nem sikerült beolvasni ezeket a könyvtárakat:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Az \"A\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "A \"B\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "A \"C\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Könyvtármegnyitási hiba" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2164,130 +2187,130 @@ "könyvtár lesz összeolvasztva.\n" "Továbblépés előtt ellenőrizze az értéket." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Figyelmeztetés - paraméter" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 #, fuzzy msgid "Scanning directories..." msgstr "A könyvtárak szinkronizálása" -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Az A könyvtár beolvasása" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "A B könyvtár beolvasása" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "A C könyvtár beolvasása" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Néhány alkönyvtár beolvasása nem sikerült itt:" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Ellenőrizze az alkönyvtárak jogosultságait." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "A könyvtárak összehasonlítási állapota" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Az alkönyvtárak száma:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "A megegyező fájlok száma:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "A kézi összeolvasztások száma:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Ez minden összeolvasztási műveletet érint." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Az összes összeolvasztási művelet megváltoztatása" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Feldolgozás " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Feladat." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A másolása B-be" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B másolása A-ba" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A törlése" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B törlése" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A és B törlése" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Beolvasztás A-ba" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Beolvasztás B-be" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Beolvasztás A és B-be" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Törlés (ha létezik)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Összeolvasztás (kézi)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Hiba: ütköző fájltípusok" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Hiba: a dátumok megegyeznek, de a fájlok nem." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Ez a művelet jelenleg nem lehetséges." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "A művelet nem lehetséges" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2302,50 +2325,50 @@ "Ha tudja, hogyan kell ezt a helyzetet reprodukálni, kérem értesítse a " "szerzőt." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programhiba" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Hiba történt másolás közben.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Hiba." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Összeolvasztási hiba" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Hiba." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Kész." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Nincs elmentve." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" "Ismeretlen összeolvasztási művelet (normál körülmények között nem fordulhat " "elő)." -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Ismeretlen összeolvasztási művelet." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2365,19 +2388,19 @@ "Ez a program még béta állapotú, ezért nincs garancia a hibátlan működésre. A " "fontos adatokról mindenképpen készítsen biztonsági másolatot!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Az összeolvasztás megkezdése" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Kezdődjön" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Szimuláció" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2385,7 +2408,7 @@ "A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne " "tenni." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2393,7 +2416,7 @@ "A két fájl utolsó módosítási dátuma megegyezik, de a fájlok tartalma nem. Mi " "történjen?" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 #, fuzzy msgid "" "This operation is currently not possible because directory merge is " @@ -2402,7 +2425,7 @@ "Ez a művelet most nem hajtható végre, mert folyamatban van egy " "könyvtárösszeolvasztás." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2412,82 +2435,82 @@ "Folytatni szeretné a műveletet a hiba ellenére vagy át szeretné ugrani a " "hibát okozó elemet?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Az összeolvasztás folytatása hiba esetén is" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Folytatás az utolsó elemmel" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Az elem átlépése" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Átlépve." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Folyamatban..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Az összeolvasztási művelet befejeződött." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Az összeolvasztás befejeződött" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A szimulált összeolvasztás befejeződött: ellenőrizze, hogy elfogadhatók-e a " "javasolt műveletek." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Hiba történt. Kattintson az OK gombra részletes tájékoztatáshoz.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Hiba történt %1 törlése közben: nem sikerült létrehozni egy biztonsági " "másolatot." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "könyvtár (%1) törlése az alkönyvtárakkal együtt" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "törlés (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Hiba történt: a könyvtártörlés során, a könyvtár beolvasásakor, hiba történt." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Hiba: egy rmdir (%1) művelet nem sikerült." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Hiba történt: a törlési művelet nem sikerült." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "kézi összeolvasztás (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -2495,136 +2518,136 @@ " Megjegyzés: kézi összeolvasztás esetén a felhasználónak az F7-tel kell " "továbblépnie." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hiba: egy másolás (%1 -> %2) nem sikerült. Nem sikerült törölni a már létező " "másolási célpontot." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Link másolása (%1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Hiba: egy link másolása nem sikerült. Távoli linkeket nem lehet használni." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Hiba történt: egy link másolása nem sikerült." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "másolás (%1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Hiba történt átnevezés (%1 -> %2) közben: a célfájl nem törölhető." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "átnevezés (%1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Hiba történt: egy átnevezés nem sikerült." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Hiba történt a könyvtár (%1) létrehozása közben. A már létező fájl nem " "törölhető." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Könyvtár létrehozása (%1)" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Hiba történt egy könyvtár létrehozása közben." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Cél" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Könyvtár" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Típus" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Méret" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attribútum" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Utolsó módosítás" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Link-Cél" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "nem áll rendelkezésre" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (cél):" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (alap):" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (cél):" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (cél):" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Cél: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Könyvtárösszeolvasztás" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "A könyvtárösszeolvasztás kezdése/folytatása" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "A művelet végrehajtása az aktuális elemen" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Az aktuális fájl összeolvasztása" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2632,111 +2655,111 @@ "File" msgstr "Összeolvasztás" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Az alkönyvtárak összecsukása" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Az alkönyvtárak kibontása" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Az 'A' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "A 'B' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "A 'C' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Automatikus kiválasztás az összes elemnél" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Nincs művelet az összes elemre" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nem kell semmit tenni" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 #, fuzzy msgid "Delete A && B" msgstr "A és B törlése" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 #, fuzzy msgid "Merge to A && B" msgstr "Beolvasztás A és B-be" @@ -2749,13 +2772,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "F&olytatás" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -3019,11 +3042,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Összeolvasztási ütközés>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Összeolvasztási ütközés>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3031,39 +3054,60 @@ "Még nincs feloldva az összes ütközés.\n" "A fájl nem lesz elmentve.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Megmaradt ütközések" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fájlmentési hiba" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Hiba történt írás közben." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Módosítva]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Ütközések" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3101,6 +3145,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "Könyvtárösszeolvasztás" + #~ msgid "C&ontinue" #~ msgstr "F&olytatás" @@ -3117,10 +3164,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Az eszköztár ki-be kapcsolása" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Az összeolvasztási művelet befejeződött." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "A és B fájl binárisan megegyezik.\n"
--- a/kdiff3/po/it/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/it/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,492 +1,517 @@ -# translation of kdiff3.po to italiano -# translation of kdiff3.po to -# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# translation of kdiff3.po to Italian +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. # # Andrea Celli <a.celli@caltanet.it>, 2003, 2004, 2005. # Marcello Anni <marcello.anni@alice.it>, 2006, 2007. # Giovanni Venturi <jumpyj@tiscali.it>, 2006. +# Federico Zenith <federico.zenith@member.fsf.org>, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-11-11 22:43+0100\n" -"Last-Translator: Marcello Anni <marcello.anni@alice.it>\n" -"Language-Team: italiano <kde-i18n-it@kde.org>\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-21 22:00+0100\n" +"Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n" +"Language-Team: Italian <kde-i18n-it@kde.org>\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" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configurazione attuale:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" -msgstr "Errore opzioni di configurazione:" - -#: kdiff3.cpp:217 +msgstr "Errore nelle opzioni di configurazione:" + +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." -msgstr "Opzione --auto inserita, manca indicazione del file di output." - -#: kdiff3.cpp:366 +msgstr "" +"Opzione --auto inserita, ma non è stato indicato nessun del file di uscita." + +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Opzione --auto ignorata nel confronto di cartelle." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Salvataggio non riuscito." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" -msgstr "Non è riuscita l'apertura di questi file:" - -#: kdiff3.cpp:446 +msgstr "Apertura di questi file non riuscita:" + +#: kdiff3.cpp:449 msgid "File Open Error" -msgstr "Errore nell'aprire file" - -#: kdiff3.cpp:474 +msgstr "Errore nell'apertura di un file" + +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." -msgstr "Apre documenti per confronto..." - -#: kdiff3.cpp:476 -#, fuzzy -#| msgid "Ready." +msgstr "Apre documenti per confrontarli..." + +#: kdiff3.cpp:479 msgid "Reload" -msgstr "Pronto." - -#: kdiff3.cpp:479 +msgstr "Ricarica" + +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" -"Salva il risultato della fusione. Tutti i conflitti devono essere stati " -"risolti!" - -#: kdiff3.cpp:481 +msgstr "Salva il risultato della fusione. Tutti i conflitti vanno risolti!" + +#: kdiff3.cpp:484 msgid "Saves the current document as..." -msgstr "Salva questo documento con nome..." - -#: kdiff3.cpp:483 +msgstr "Salva il documento attuale come..." + +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Stampa le differenze" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Esce dall'applicazione" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Taglia la sezione selezionata e la mette negli appunti" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copia la sezione selezionata negli appunti" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" -msgstr "Incolla il contenuto degli appunti in questa posizione" - -#: kdiff3.cpp:493 +msgstr "Incolla il contenuto degli appunti nella posizione attuale" + +#: kdiff3.cpp:496 msgid "Select everything in current window" -msgstr "Seleziona tutto nella finestra corrente" - -#: kdiff3.cpp:495 +msgstr "Seleziona tutto nella finestra attuale" + +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Cerca una stringa" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Cerca di nuovo la stringa" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" -msgstr "Mostra/nascondi la barra di stato" - -#: kdiff3.cpp:506 +msgstr "Abilita o disabilita la barra di stato" + +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configura KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Vai alla differenza attuale" -#: kdiff3.cpp:527 -#, fuzzy -#| msgid "Go to Current Delta" +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" -msgstr "Vai alla differenza attuale" - -#: kdiff3.cpp:529 +msgstr "" +"Differenza\n" +"attuale" + +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Vai alla prima differenza" -#: kdiff3.cpp:529 -#, fuzzy -#| msgid "Go to First Delta" +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" -msgstr "Vai alla prima differenza" - -#: kdiff3.cpp:531 +msgstr "" +"Prima\n" +"differenza" + +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Vai all'ultima differenza" -#: kdiff3.cpp:531 -#, fuzzy -#| msgid "Go to Last Delta" +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" -msgstr "Vai all'ultima differenza" - -#: kdiff3.cpp:533 +msgstr "" +"Ultima\n" +"differenza" + +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(Ignora le differenze di soli spazi bianchi quando \"Mostra spazi bianchi\" " -"è disattivato)" - -#: kdiff3.cpp:534 +"(Ignora le differenze di soli spazi quando «Mostra spazi» è disattivato)" + +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Segnala le differenze di soli spazi bianchi anche quando \"Mostra spazi " -"bianchi\" è disattivato)" - -#: kdiff3.cpp:535 +"(Non salta le differenze di soli spazi bianchi anche quando «Mostra spazi» è " +"disattivato)" + +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Vai alla differenza precedente" -#: kdiff3.cpp:535 -#, fuzzy -#| msgid "Go to Previous Delta" +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" -msgstr "Vai alla differenza precedente" - -#: kdiff3.cpp:537 +msgstr "" +"Differenza\n" +"precedente" + +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Vai alla differenza successiva" -#: kdiff3.cpp:537 -#, fuzzy -#| msgid "Go to Next Delta" +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" -msgstr "Vai alla differenza successiva" - -#: kdiff3.cpp:539 +msgstr "" +"Differenza\n" +"successiva" + +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Vai al conflitto precedente" -#: kdiff3.cpp:539 -#, fuzzy -#| msgid "Conflicts" +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" -msgstr "Conflitti" - -#: kdiff3.cpp:541 +msgstr "" +"Conflitto\n" +"precedente" + +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Vai al conflitto successivo" -#: kdiff3.cpp:541 -#, fuzzy -#| msgid "Go to Next Conflict" +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" -msgstr "Vai al conflitto successivo" - -#: kdiff3.cpp:543 +msgstr "" +"Conflitto\n" +"successivo" + +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" -msgstr "Vai al precedente conflitto non risolto" - -#: kdiff3.cpp:543 -#, fuzzy -#| msgid "Unsolved" +msgstr "Vai al conflitto non risolto precedente" + +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" -msgstr "Non risolto" - -#: kdiff3.cpp:545 +msgstr "" +"Non risolto\n" +"precedente" + +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" -msgstr "Vai al successivo conflitto non risolto" - -#: kdiff3.cpp:545 -#, fuzzy -#| msgid "Unsolved" +msgstr "Vai al conflitto non risolto successivo" + +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" -msgstr "Non risolto" - -#: kdiff3.cpp:547 +msgstr "" +"Non risolto\n" +"successivo" + +#: kdiff3.cpp:550 msgid "Select Line(s) From A" -msgstr "Scegli righe da A" - -#: kdiff3.cpp:547 +msgstr "Seleziona righe da A" + +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" - -#: kdiff3.cpp:548 +"Scegli\n" +"A" + +#: kdiff3.cpp:551 msgid "Select Line(s) From B" -msgstr "Scegli righe da B" - -#: kdiff3.cpp:548 +msgstr "Seleziona righe da B" + +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" - -#: kdiff3.cpp:549 +"Scegli\n" +"B" + +#: kdiff3.cpp:552 msgid "Select Line(s) From C" -msgstr "Scegli righe da C" - -#: kdiff3.cpp:549 +msgstr "Seleziona righe da C" + +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" - -#: kdiff3.cpp:550 +"Scegli\n" +"C" + +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -"Vai automaticamente al prossimo conflitto non risolto dopo aver selezionato " -"la fonte" - -#: kdiff3.cpp:550 -#, fuzzy -#| msgid "Auto Select" +"Vai automaticamente al conflitto non risolto successivo dopo aver " +"selezionato la fonte" + +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" -msgstr "Seleziona automaticamente" - -#: kdiff3.cpp:552 +msgstr "" +"Successivo\n" +"automatico" + +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" -msgstr "Mostra anche le differenze date da spazi e tabulazioni" - -#: kdiff3.cpp:552 +msgstr "Mostra spazi e tabulazioni nelle differenze" + +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" -msgstr "" - -#: kdiff3.cpp:553 +msgstr "Spazi" + +#: kdiff3.cpp:556 msgid "Show White Space" -msgstr "Mostra spazi vuoti" - -#: kdiff3.cpp:553 +msgstr "Mostra spazi" + +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" - -#: kdiff3.cpp:555 +"Differenze\n" +"di spazi" + +#: kdiff3.cpp:558 msgid "Show Line Numbers" -msgstr "Mostra numeri riga" - -#: kdiff3.cpp:555 -#, fuzzy -#| msgid "Show Line Numbers" +msgstr "Mostra numeri di riga" + +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" -msgstr "Mostra numeri riga" - -#: kdiff3.cpp:556 +msgstr "" +"Numeri\n" +"di riga" + +#: kdiff3.cpp:559 msgid "Choose A Everywhere" -msgstr "Scegli sempre A" - -#: kdiff3.cpp:557 +msgstr "Scegli A ovunque" + +#: kdiff3.cpp:560 msgid "Choose B Everywhere" -msgstr "Scegli sempre B" - -#: kdiff3.cpp:558 +msgstr "Scegli B ovunque" + +#: kdiff3.cpp:561 msgid "Choose C Everywhere" -msgstr "Scegli sempre C" - -#: kdiff3.cpp:559 +msgstr "Scegli C ovunque" + +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Scegli A per tutti i conflitti non risolti" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Scegli B per tutti i conflitti non risolti" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Scegli C per tutti i conflitti non risolti" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Scegli A per tutti i conflitti di \"spazi bianchi\" non risolti" - -#: kdiff3.cpp:563 +msgstr "Scegli A per tutti i conflitti di spazi non risolti" + +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Scegli B per tutti i conflitti di \"spazi bianchi\" non risolti" - -#: kdiff3.cpp:564 +msgstr "Scegli B per tutti i conflitti di spazi non risolti" + +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Scegli C per tutti i conflitti di \"spazi bianchi\" non risolti" - -#: kdiff3.cpp:565 +msgstr "Scegli C per tutti i conflitti di spazi non risolti" + +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Risolvi automaticamente i conflitti semplici" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" -msgstr "Considera le differenze come conflitti" - -#: kdiff3.cpp:567 +msgstr "Imposta le differenze a conflitti" + +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" -msgstr "Avvia la fusione automatica espressioni regolari" - -#: kdiff3.cpp:568 +msgstr "Esegui la fusione automatica con espressioni regolari" + +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" -msgstr "Risolvi automaticamente i conflitti semplici" - -#: kdiff3.cpp:569 +msgstr "Risolvi automaticamente i conflitti di cronologia" + +#: kdiff3.cpp:572 msgid "Split Diff At Selection" -msgstr "Dividi differenze a selezione" - -#: kdiff3.cpp:570 +msgstr "Dividi differenze alla selezione" + +#: kdiff3.cpp:573 msgid "Join Selected Diffs" -msgstr "Unisci i file selezionati" - -#: kdiff3.cpp:572 +msgstr "Unisci le differenze selezionate" + +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Mostra finestra A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Mostra finestra B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Mostra finestra C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" -msgstr "Focus prossima finestra" - -#: kdiff3.cpp:577 +msgstr "Attiva la finestra successiva" + +#: kdiff3.cpp:580 msgid "Normal Overview" -msgstr "Vista globale normale" - -#: kdiff3.cpp:578 +msgstr "Panoramica normale" + +#: kdiff3.cpp:581 msgid "A vs. B Overview" -msgstr "Confronto di A con B" - -#: kdiff3.cpp:579 +msgstr "Panoramica di A confrontato con B" + +#: kdiff3.cpp:582 msgid "A vs. C Overview" -msgstr "Confronto di A con C" - -#: kdiff3.cpp:580 +msgstr "Panoramica di A confrontato con C" + +#: kdiff3.cpp:583 msgid "B vs. C Overview" -msgstr "Confronto di B con C" - -#: kdiff3.cpp:581 +msgstr "Panoramica di B confrontato con C" + +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" -msgstr "A capo nelle finestre delle differenze" - -#: kdiff3.cpp:582 +msgstr "A capo automatico nelle finestre delle differenze" + +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Aggiungi allineamento manuale delle differenze" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Cancella tutti gli allineamenti manuali delle differenze" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" -msgstr "Focus finestra prec" - -#: kdiff3.cpp:589 +msgstr "Attiva la finestra precedente" + +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" -msgstr "Inverti orientamento divisione" - -#: kdiff3.cpp:591 +msgstr "Inverti l'orientamento di divisione" + +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" -msgstr "Separa visione di testi e cartelle" - -#: kdiff3.cpp:593 +msgstr "Vista separata di cartelle e testi" + +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" -msgstr "Commuta tra visualizzazione di testi e di cartelle" - -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +msgstr "Cambia tra vista di testi e di cartelle" + +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Pronto." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Il risultato della fusione non è stato salvato." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" -msgstr "" - -#: kdiff3.cpp:651 +msgstr "Avviso" + +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Salva ed esci" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Esci senza salvare" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." -msgstr "Non è riuscito il salvataggio della fusione." - -#: kdiff3.cpp:671 pdiff.cpp:1015 +msgstr "Il salvataggio della fusione non è riuscito." + +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "È in corso la fusione di cartelle. Sei sicuro di voler interrompere?" - -#: kdiff3.cpp:696 +msgstr "È in corso una fusione di cartelle. Sei sicuro di voler interrompere?" + +#: kdiff3.cpp:699 msgid "Saving file..." -msgstr "Salvataggio file..." - -#: kdiff3.cpp:713 +msgstr "Salvataggio del file..." + +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." -msgstr "Salvataggio file con nuovo nome..." - -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +msgstr "Salvataggio del file con un nuovo nome..." + +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." -msgstr "" - -#: kdiff3.cpp:974 +msgstr "Salva come..." + +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Stampa..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Riga superiore" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Selezione" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Stampa completata." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Stampa interrotta." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Uscita..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." -msgstr "(dis)attiva barra degli strumenti..." - -#: kdiff3.cpp:1008 +msgstr "Commutazione della barra degli strumenti..." + +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." -msgstr "(dis)attiva la barra di stato..." +msgstr "Commutazione della barra di stato..." #: fileaccess.cpp:612 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Nel creare una nuova copia, è fallita l'eliminazione di una precedente.\n" +"Cercando di creare una copia di sicurezza, non è stato possibile rimuoverne " +"una precedente.\n" "Nome del file: " #: fileaccess.cpp:619 @@ -494,23 +519,23 @@ "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -"Nel creare una copia di riserva, non è riuscito un cambio di nome.\n" -"Nome dei file: " +"Cercando di creare una copia di sicurezza, non è riuscita la rinomina.\n" +"Nomi dei file: " #: fileaccess.cpp:643 #, kde-format msgid "Getting file status: %1" -msgstr "Recupero informazioni su stato file: %1" +msgstr "Recupero informazioni sullo stato del file: %1" #: fileaccess.cpp:686 #, kde-format msgid "Reading file: %1" -msgstr "Lettura file: %1" +msgstr "Lettura del file: %1" #: fileaccess.cpp:723 #, kde-format msgid "Writing file: %1" -msgstr "Scrittura file: %1" +msgstr "Scrittura del file: %1" #: fileaccess.cpp:751 msgid "Out of memory" @@ -519,27 +544,27 @@ #: fileaccess.cpp:786 #, kde-format msgid "Making directory: %1" -msgstr "Creazione cartella: %1" +msgstr "Creazione della cartella: %1" #: fileaccess.cpp:806 #, kde-format msgid "Removing directory: %1" -msgstr "Rimozione cartella: %1" +msgstr "Rimozione della cartella: %1" #: fileaccess.cpp:821 #, kde-format msgid "Removing file: %1" -msgstr "Rimozione file: %1" +msgstr "Rimozione del file: %1" #: fileaccess.cpp:837 #, kde-format msgid "Creating symbolic link: %1 -> %2" -msgstr "Creazione link simbolico: %1 -> %2" +msgstr "Creazione del collegamento simbolico: %1 -> %2" #: fileaccess.cpp:864 #, kde-format msgid "Renaming file: %1 -> %2" -msgstr "Cambiamento nome file: %1 -> %2" +msgstr "Rinomina del file: %1 -> %2" #: fileaccess.cpp:897 #, kde-format @@ -552,8 +577,8 @@ "Error during file copy operation: Opening file for reading failed. Filename: " "%1" msgstr "" -"Errore durante la copia di un file: fallita l'apertura del file in lettura. " -"Nome file: %1" +"Errore durante la copia di un file: apertura del file in lettura non " +"riuscita. Nome del file: %1" #: fileaccess.cpp:917 #, kde-format @@ -561,41 +586,43 @@ "Error during file copy operation: Opening file for writing failed. Filename: " "%1" msgstr "" -"Errore durante la copia di un file: fallita l'apertura del file in " -"scrittura. Nome file: %1" +"Errore durante la copia di un file: l'apertura del file in scrittura non " +"riuscita. Nome del file: %1" #: fileaccess.cpp:932 #, kde-format msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "Errore durante la copia di un file: lettura fallita. Nome file: %1" +msgstr "" +"Errore durante la copia di un file: lettura non riuscita. Nome del file: %1" #: fileaccess.cpp:941 #, kde-format msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "Errore durante la copia di un file: Scrittura fallita. Nome file: %1" - -#: fileaccess.cpp:1237 +msgstr "" +"Errore durante la copia di un file: Scrittura non riuscita. Nome del file: %1" + +#: fileaccess.cpp:1231 msgid "Reading directory: " -msgstr "Lettura cartella: " - -#: fileaccess.cpp:1361 +msgstr "Lettura della cartella: " + +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" -msgstr "Elencazione cartella: %1" - -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +msgstr "Elenco della cartella: %1" + +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" -msgstr "" - -#: diff.cpp:250 +msgstr "&Annulla" + +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." -msgstr "È fallita la copia da appunti a file temporaneo." - -#: diff.cpp:254 +msgstr "La copia da appunti a file temporaneo non è riuscita." + +#: diff.cpp:255 msgid "From Clipboard" msgstr "Dagli appunti" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -608,9 +635,9 @@ "\n" " %1\n" "\n" -"Ora il comando di pre-elaborazione verrà disabilitato." - -#: diff.cpp:542 +"Il comando di pre-elaborazione verrà ora disabilitato." + +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -619,21 +646,22 @@ "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"La pre-ricerca di righe simili non sembra riuscita. Controlla il comando:\n" +"La pre-ricerca di righe simili non sembra riuscita. Controlla questo " +"comando:\n" "\n" " %1\n" "\n" -"Ora il comando di pre-ricerca di righe simili verrà disabilitato." - -#: diff.cpp:1658 diff.cpp:1672 +"Il comando di pre-ricerca di righe simili verrà ora disabilitato." + +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" "Errore: perdita dati\n" -"Se è riproducibile, ti prego di segnalarlo all'autore.\n" - -#: diff.cpp:1660 diff.cpp:1674 +"Se è riproducibile, sei pregato di segnalarlo all'autore.\n" + +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Grave errore interno" @@ -649,20 +677,20 @@ #: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 #: smalldialogs.cpp:144 msgid "Dir..." -msgstr "Directory..." +msgstr "Cartella..." #: smalldialogs.cpp:93 msgid "C (Optional):" msgstr "C (Opzionale):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Fondi" #: smalldialogs.cpp:116 msgid "Swap/Copy Names ..." -msgstr "Scambia/copia Nomi..." +msgstr "Scambia e copia nomi..." #: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123 #, kde-format @@ -672,16 +700,16 @@ #: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 #, kde-format msgid "Copy %1->Output" -msgstr "Copia %1->Output" +msgstr "Copia %1->Uscita" #: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 #, kde-format msgid "Swap %1<->Output" -msgstr "Scambia %1<->Output" +msgstr "Scambia %1<->Uscita" #: smalldialogs.cpp:136 msgid "Output (optional):" -msgstr "Output (Opzionale):" +msgstr "Uscita (opzionale):" #: smalldialogs.cpp:168 msgid "Configure..." @@ -689,7 +717,7 @@ #: smalldialogs.cpp:174 msgid "&OK" -msgstr "" +msgstr "&OK" #: smalldialogs.cpp:362 msgid "Search text:" @@ -697,7 +725,7 @@ #: smalldialogs.cpp:369 msgid "Case sensitive" -msgstr "Maiuscole/minuscole" +msgstr "Distingui le maiuscole" #: smalldialogs.cpp:372 msgid "Search A" @@ -713,7 +741,7 @@ #: smalldialogs.cpp:387 msgid "Search output" -msgstr "Cerca nell'output" +msgstr "Cerca nell'uscita" #: smalldialogs.cpp:392 msgid "&Search" @@ -721,43 +749,43 @@ #: smalldialogs.cpp:409 msgid "Regular Expression Tester" -msgstr "Tester espressione regolare" +msgstr "Tester delle espressioni regolari" #: smalldialogs.cpp:414 optiondialog.cpp:940 msgid "Auto merge regular expression:" -msgstr "Fondi automaticamente espressione regolare:" +msgstr "Espressione regolare di fusione automatica:" #: smalldialogs.cpp:422 msgid "Example auto merge line:" -msgstr "Esempio riga di fusione automatica:" +msgstr "Esempio di riga di fusione automatica:" #: smalldialogs.cpp:424 msgid "For auto merge test copy a line as used in your files." -msgstr "Per il test fusione automatica copia una riga come fai nei tuoi file." +msgstr "Per la prova di fusione automatica copia una riga così com'è nei file." #: smalldialogs.cpp:430 smalldialogs.cpp:459 smalldialogs.cpp:496 msgid "Match result:" -msgstr "Risultato confronto:" +msgstr "Risultato del confronto:" #: smalldialogs.cpp:441 optiondialog.cpp:966 msgid "History start regular expression:" -msgstr "Avvio cronologia dell'espressione regolare:" +msgstr "Espressione regolare dell'inizio di cronologia:" #: smalldialogs.cpp:449 msgid "Example history start line (with leading comment):" -msgstr "Esempio di riga di avvio cronologia (con relativo commento):" +msgstr "Esempio di riga di inizio di cronologia (con commento iniziale):" #: smalldialogs.cpp:452 msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -"Copia una riga di avvio cronologia come fai nei tuoi file,\n" -"includendo il relativo commento." +"Copia una riga di inizio di cronologia così com'è nei file,\n" +"incluso il commento iniziale." #: smalldialogs.cpp:470 optiondialog.cpp:976 msgid "History entry start regular expression:" -msgstr "Espressione regolare di inizio dell'elemento di cronologia:" +msgstr "Espressione regolare di inizio della elemento di cronologia:" #: smalldialogs.cpp:478 msgid "History sort key order:" @@ -765,15 +793,17 @@ #: smalldialogs.cpp:486 msgid "Example history entry start line (without leading comment):" -msgstr "Esempio di riga di avvio cronologia (senza relativo commento):" +msgstr "" +"Esempio di riga di inizio di un elemento di cronologia (senza commento " +"iniziale):" #: smalldialogs.cpp:488 msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Copia una riga di avvio voce di cronologia come fai nei tuoi file,\n" -"ma ometti il relativo commento." +"Copia una riga di inizio di un elemento di cronologia così com'è nei file,\n" +"ma ometti il commento iniziale." #: smalldialogs.cpp:503 msgid "Sort key result:" @@ -781,24 +811,25 @@ #: smalldialogs.cpp:510 msgid "OK" -msgstr "" - -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +msgstr "OK" + +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" -msgstr "" +msgstr "Annulla" #: smalldialogs.cpp:554 smalldialogs.cpp:564 smalldialogs.cpp:585 msgid "Match success." -msgstr "Confronto con successo." +msgstr "Confronto riuscito." #: smalldialogs.cpp:558 smalldialogs.cpp:568 smalldialogs.cpp:591 msgid "Match failed." -msgstr "Confronto fallito." +msgstr "Confronto non riuscito." #: smalldialogs.cpp:576 msgid "Opening and closing parentheses don't match in regular expression." -msgstr "Aprire e chiudere parentesi non confronta le espressioni regolari." +msgstr "" +"Le parentesi aperte e chiuse nell'espressione regolare non corrispondono." #: optiondialog.cpp:367 msgid "Unicode, 8 bit" @@ -814,33 +845,31 @@ #: optiondialog.cpp:388 msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "Cambialo se i caratteri non-ascii non vengono mostrati correttamente." +msgstr "Cambialo se i caratteri non-ASCII non vengono mostrati correttamente." #: optiondialog.cpp:465 -#, fuzzy -#| msgid "Configure..." msgid "Configure" -msgstr "Configura..." +msgstr "Configura" #: optiondialog.cpp:531 msgid "Font" -msgstr "" +msgstr "Carattere" #: optiondialog.cpp:532 msgid "Editor & Diff Output Font" -msgstr "Set di caratteri per l'editor e per l'output di diff" +msgstr "Carattere per l'editor e per l'uscita delle differenze" #: optiondialog.cpp:556 msgid "Italic font for deltas" -msgstr "Metti in corsivo le differenze" +msgstr "Carattere corsivo per le differenze" #: optiondialog.cpp:559 msgid "" "Selects the italic version of the font for differences.\n" "If the font doesn't support italic characters, then this does nothing." msgstr "" -"Imposta per le differenze la versione corsiva del carattere in uso.\n" -"Se il carattere non supporta il corsivo, l'opzione non avrà alcun effetto." +"Seleziona la versione corsiva del carattere per le differenze.\n" +"Se il carattere non supporta il corsivo, non succede nulla." #: optiondialog.cpp:568 msgid "Color" @@ -848,23 +877,23 @@ #: optiondialog.cpp:569 msgid "Colors Settings" -msgstr "Impostazioni colori" +msgstr "Impostazioni dei colori" #: optiondialog.cpp:588 msgid "Editor and Diff Views:" -msgstr "Editor e visualizzatore differenze:" +msgstr "Editor e visore delle differenze:" #: optiondialog.cpp:596 msgid "Foreground color:" -msgstr "Colore del testo:" +msgstr "Colore di primo piano:" #: optiondialog.cpp:603 msgid "Background color:" -msgstr "Colore dello sfondo:" +msgstr "Colore di sfondo:" #: optiondialog.cpp:612 msgid "Diff background color:" -msgstr "Colore dello sfondo per le differenze:" +msgstr "Colore di sfondo per le differenze:" #: optiondialog.cpp:620 msgid "Color A:" @@ -880,15 +909,15 @@ #: optiondialog.cpp:643 msgid "Conflict color:" -msgstr "Colore per conflitti:" +msgstr "Colore per i conflitti:" #: optiondialog.cpp:651 msgid "Current range background color:" -msgstr "Colore di sfondo per questo intervallo:" +msgstr "Colore di sfondo l'intervallo attuale:" #: optiondialog.cpp:659 msgid "Current range diff background color:" -msgstr "Colore differenze per questo intervallo:" +msgstr "Colore di sfondo per le differenze dell'intervallo attuale:" #: optiondialog.cpp:666 msgid "Color for manually aligned difference ranges:" @@ -896,11 +925,11 @@ #: optiondialog.cpp:672 msgid "Directory Comparison View:" -msgstr "Vista di confronto cartelle:" +msgstr "Vista di confronto delle cartelle:" #: optiondialog.cpp:678 msgid "Newest file color:" -msgstr "colore del file più recente:" +msgstr "Colore del file più recente:" #: optiondialog.cpp:682 msgid "" @@ -932,19 +961,20 @@ #: optiondialog.cpp:732 msgid "Tab inserts spaces" -msgstr "Il Tab inserisce spazi" +msgstr "Il tabulatore inserisce spazi" #: optiondialog.cpp:735 msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A Tab-character will be inserted." msgstr "" -"Attivo: premere Tab è come inserire un opportuno numero di spazi.\n" -"Non attivo: viene inserito un carattere Tab." +"Attivo: premere il tabulatore è come inserire l'appropriato numero di " +"spazi.\n" +"Non attivo: viene inserito un carattere di tabulazione." #: optiondialog.cpp:741 msgid "Tab size:" -msgstr "Dimensione di Tab:" +msgstr "Dimensione della tabulazione:" #: optiondialog.cpp:747 msgid "Auto indentation" @@ -956,17 +986,17 @@ #: optiondialog.cpp:754 msgid "Auto copy selection" -msgstr "Copia automaticamente della selezione" +msgstr "Copia automaticamente la selezione" #: optiondialog.cpp:757 msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Attivo: Ogni selezione è immediatamente copiata negli appunti.\n" -"Non attivo: Devi esplicitamente copiarla, ad es. con Ctrl-C." - -#: optiondialog.cpp:762 +"Attivo: ogni selezione è immediatamente copiata negli appunti.\n" +"Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C." + +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Tipo di fine riga:" @@ -975,20 +1005,20 @@ "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -"Imposta il \"fine riga\" da usare quando salvi un file modificato:\n" +"Imposta il fine riga da usare quando salvi un file modificato:\n" "DOS/Windows: CR+LF; Unix: LF; dove CR=0D, LF=0A" #: optiondialog.cpp:788 msgid "Diff" -msgstr "Diff" +msgstr "Differenze" #: optiondialog.cpp:789 msgid "Diff Settings" -msgstr "Impostazioni Diff" +msgstr "Impostazioni delle differenze" #: optiondialog.cpp:813 msgid "Treat as white space." -msgstr "Tratta come spazi bianchi." +msgstr "Tratta come spazio." #: optiondialog.cpp:815 msgid "Ignore numbers" @@ -1000,25 +1030,26 @@ "white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignora i caratteri numerici durante il confronto. (Analogo a \"Ignora spazi" -"\".)\n" +"Ignora i caratteri numerici durante il confronto (simile a «Ignora spazi»).\n" "Può essere utile per confrontare file con dati numerici." #: optiondialog.cpp:823 msgid "Ignore C/C++ comments" -msgstr "Ignora i commenti C/C++" +msgstr "Ignora i commenti C e C++" #: optiondialog.cpp:825 msgid "Treat C/C++ comments like white space." -msgstr "Tratta i commenti C/C++ come spazi bianchi." +msgstr "Tratta i commenti C e C++ come spazi." #: optiondialog.cpp:829 msgid "Ignore case" -msgstr "Ignora maiuscole" +msgstr "Ignora le maiuscole" #: optiondialog.cpp:832 msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "Tratta differenze maiusc./minusc. come spazi bianchi. ('a'<=>'A')" +msgstr "" +"Tratta le differenze tra maiuscole e minuscole come modifiche di spazi " +"(«a»<=>«A»)." #: optiondialog.cpp:836 msgid "Preprocessor command:" @@ -1027,11 +1058,11 @@ #: optiondialog.cpp:840 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -"Preprocessore definito dall'utente. Vedi il manuale per maggiori dettagli" +"Preprocessore definito dall'utente; vedi il manuale per maggiori dettagli." #: optiondialog.cpp:843 msgid "Line-matching preprocessor command:" -msgstr "Preprocessore per confronto righe:" +msgstr "Preprocessore per il confronto di righe:" #: optiondialog.cpp:847 msgid "" @@ -1039,8 +1070,8 @@ "(See the docs for details.)" msgstr "" "Questo preprocessore viene utilizzato solo\n" -"per verificare la corrispondenza di righe.\n" -"Vedi il manuale per maggiori dettagli" +"per verificare la corrispondenza di righe;\n" +"vedi il manuale per maggiori dettagli." #: optiondialog.cpp:850 msgid "Try hard (slower)" @@ -1051,12 +1082,12 @@ "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -"Abilita l'opzione --minimal del \"diff\" esterno.\n" +"Abilita l'opzione --minimal del comando «diff» esterno.\n" "L'analisi di grandi file sarà molto più lenta." #: optiondialog.cpp:858 msgid "Align B and C for 3 input files" -msgstr "" +msgstr "Allinea B e C per tre file di ingresso" #: optiondialog.cpp:861 msgid "" @@ -1064,37 +1095,39 @@ "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" +"Cerca di allineare B e C quando si confrontano o fondono tre file di " +"ingresso.\n" +"Non è raccomandato per la fusione perché potrebbe divenire più complicata.\n" +"Come impostazione predefinita è disattivato." #: optiondialog.cpp:874 msgid "Merge Settings" -msgstr "Impostazioni fusioni" +msgstr "Impostazioni di fusione" #: optiondialog.cpp:889 msgid "Auto advance delay (ms):" -msgstr "Ritardo nell'avanzamento automatico(ms):" +msgstr "Ritardo nell'avanzamento automatico (ms):" #: optiondialog.cpp:894 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"Quando si è in modalità avanzamento automatico, il risultato della\n" -"selezione attuale viene mostrato per questo tempo, prima di passare\n" -"al prossimo conflitto. Valori ammessi: 0-2000 ms" +"Quando si è in modalità di avanzamento automatico, il risultato della\n" +"selezione attuale viene mostrato per il tempo specificato, prima di\n" +"passare al conflitto successivo. Valori ammessi: 0-2000 ms." #: optiondialog.cpp:899 -#, fuzzy -#| msgid "Show Window A" msgid "Show info dialogs" -msgstr "Mostra finestra A" +msgstr "Mostra finestre informative" #: optiondialog.cpp:901 msgid "Show a dialog with information about the number of conflicts." -msgstr "" +msgstr "Mostra una finestra con informazioni sul numero di conflitti." #: optiondialog.cpp:904 msgid "White space 2-file merge default:" -msgstr "Trattamento predefinito degli spazi bianchi nel fondere 2 file:" +msgstr "Trattamento predefinito degli spazi nel fondere due file:" #: optiondialog.cpp:908 optiondialog.cpp:921 msgid "Manual Choice" @@ -1105,16 +1138,16 @@ "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -"Consente all'algoritmo di fusione di definire il file da cui prendere le " -"modifiche per gli spazi bianchi." +"Consenti all'algoritmo di fusione di selezionare automaticamente un ingresso " +"per le modifiche di soli spazi." #: optiondialog.cpp:917 msgid "White space 3-file merge default:" -msgstr "Trattamento predefinito degli spazi bianchi nel fondere 3 file:" +msgstr "Trattamento predefinito degli spazi nel fondere tre file:" #: optiondialog.cpp:931 msgid "Automatic Merge Regular Expression" -msgstr "Fusione automatica espressioni regolari" +msgstr "Espressione regolare di fusione automatica" #: optiondialog.cpp:944 msgid "" @@ -1125,25 +1158,25 @@ msgstr "" "Espressione regolare per le righe dove Kdiff3 dovrebbe scegliere " "automaticamente una fonte.\n" -"Quando una riga con un conflitto corrisponde all'espressione regolare allora " -"sarà scelto\n" -"- se disponibile - C, altrimenti B." +"Quando una riga con un conflitto corrisponde all'espressione regolare,\n" +"sarà scelto (se disponibile) C, altrimenti B." #: optiondialog.cpp:950 msgid "Run regular expression auto merge on merge start" -msgstr "Avvia fusione automatica dell'espressione regolare all'avvio fusione" +msgstr "" +"Esegui la fusione automatica con espressioni regolari all'avvio della fusione" #: optiondialog.cpp:952 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -"Esegue la fusione per l'operazione automatica con le espressioni regolari\n" -"immediatamente all'avvio dell'operazione.\n" +"Esegui la fusione per le espressioni regolari di fusione\n" +"automatica all'avvio dell'operazione.\n" #: optiondialog.cpp:957 msgid "Version Control History Merging" -msgstr "Fusione della cronologia del controllo della versione" +msgstr "Fusione della cronologia del controllo di versione" #: optiondialog.cpp:970 msgid "" @@ -1152,9 +1185,9 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" "Espressione regolare per l'inizio dell'elemento di cronologia del controllo " -"della versione.\n" -"Solitamente questa riga contiene \"$Log$\"-keyword.\n" -"Valore predefinito: \".*\\$Log.*\\$.*\"" +"di versione.\n" +"Di solito questa riga contiene la parola chiave «$Log$».\n" +"Valore predefinito: «.*\\$Log.*\\$.*»." #: optiondialog.cpp:988 msgid "" @@ -1166,15 +1199,15 @@ "entries.\n" "See the documentation for details." msgstr "" -"Un elemento di cronologia del controllo della versione consiste di diverse " +"Un elemento di cronologia del controllo di versione consiste di diverse " "linee.\n" -"Specifica l'espressione regolare per individuare la prima riga (senza il " -"commento principale).\n" -"Usa le parentesi per raggruppare le chiavi che si vogliono usare per " +"Specifica l'espressione regolare per individuarne la prima (senza il " +"commento iniziale).\n" +"Usa le parentesi per raggruppare le chiavi che vuoi usare per " "l'ordinamento.\n" -"Se la parte sinistra è mancante, KDiff3 considera che le linee vuote " -"separano gli elementi di cronologia.\n" -"Consulta la documentazione per ulteriori dettagli." +"Se la parte sinistra è mancante, KDiff3 assume che siano delle linee vuote a " +"separare gli elementi della cronologia.\n" +"Vedi la documentazione per i dettagli." #: optiondialog.cpp:996 msgid "History merge sorting" @@ -1182,12 +1215,12 @@ #: optiondialog.cpp:998 msgid "Sort version control history by a key." -msgstr "Ordina la cronologia del controllo di versione per chiavi." +msgstr "Ordina la cronologia del controllo di versione secondo una chiave." #: optiondialog.cpp:1008 msgid "History entry start sort key order:" msgstr "" -"Ordine della chiave d'ordinamento d'inizio dell'elemento di cronologia:" +"Ordine della chiave d'ordinamento d'inizio degli elementi della cronologia:" #: optiondialog.cpp:1012 msgid "" @@ -1198,11 +1231,11 @@ "If left empty, then no sorting will be done.\n" "See the documentation for details." msgstr "" -"Ogni parentesi usata nell'espressione regolare per la voce di avvio della " -"cronologia\n" -"raggruppa una chiave che può essere usata per l'ordinamento.\n" -"Specifica la lista delle chiavi (che sono numerate in ordine di avvenimento\n" -"iniziando con 1) usando ',' come separatore (p.e. \"4,5,6,1,2,3,7\").\n" +"Ogni parentesi usata nell'espressione regolare per la voce di inizio della\n" +"cronologia raggruppa una chiave che può essere usata per l'ordinamento.\n" +"Specifica l'elenco delle chiavi (numerate in ordine di occorrenza a\n" +"partire da 1) usando «,» come separatore (per esempio «4,5,6,1,2,3,7»).\n" +"Se viene lasciato vuoto, non verrà effettuato nessun ordinamento.\n" "Consulta la documentazione per i ulteriori dettagli." #: optiondialog.cpp:1023 @@ -1212,21 +1245,20 @@ #: optiondialog.cpp:1025 msgid "Run version control history automerge on merge start." msgstr "" -"Avvia l'autofusione della cronologia del controllo di versione all'inizio " -"della fusione." +"Esegui la fusione automatica della cronologia del controllo di versione " +"all'inizio della fusione." #: optiondialog.cpp:1029 msgid "Max number of history entries:" -msgstr "Numero di voci nella cronologia:" +msgstr "Numero massimo di elementi nella cronologia:" #: optiondialog.cpp:1032 msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "" -"Taglia dopo un numero specificato. Usa -1 per un numero infinito di voci." +msgstr "Taglia al numero specificato. Usa -1 per un numero infinito di voci." #: optiondialog.cpp:1036 msgid "Test your regular expressions" -msgstr "Prova le tue espressioni regolari" +msgstr "Prova le espressioni regolari" #: optiondialog.cpp:1041 msgid "Irrelevant merge command:" @@ -1238,13 +1270,13 @@ "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -"Se specificato questo script è avviato dopo la fusione automatica\n" -"quando non sono rilevati altri cambiamenti rilevanti.\n" -"Chiamati con i paramentri: filename1 filename2 filename3" +"Se specificato questo script viene eseguito dopo la fusione\n" +"automatica quando non sono rilevati altri cambiamenti rilevanti.\n" +"Chiamato con i parametri: nome_file1 nome_file2 nome_file3" #: optiondialog.cpp:1051 msgid "Auto save and quit on merge without conflicts" -msgstr "Auto-salvataggio e uscita nella fusione senza conflitti" +msgstr "Salvataggio automatico e uscita in caso di fusione senza conflitti" #: optiondialog.cpp:1054 msgid "" @@ -1253,27 +1285,26 @@ "quit.\n" "(Similar to command line option \"--auto\"." msgstr "" -"Quando viene avviato Kdiff3 per una fusione di file da linea di comando e " -"tutti\n" -"i conflitti sono risolvibili senza l'interazione dell'utente allora salva " -"automaticamente ed esci.\n" -"(simile all'opzione da riga di comando \"--auto\"." +"Quando KDiff3 viene avviato per una fusione di file dalla riga di comando\n" +"e tutti i conflitti sono risolvibili senza azione da parte dell'utente,\n" +"salva automaticamente ed esci.\n" +"È simile all'opzione da riga di comando «--auto»." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Fusione di directory" +msgid "Directory" +msgstr "Cartella" #: optiondialog.cpp:1079 msgid "Recursive directories" -msgstr "Anche sottodirectory" +msgstr "Cartelle ricorsive" #: optiondialog.cpp:1081 msgid "Whether to analyze subdirectories or not." -msgstr "Per scegliere se analizzare anche le sottodirectory o no." +msgstr "Se analizzare o meno anche le sottocartelle." #: optiondialog.cpp:1083 msgid "File pattern(s):" -msgstr "Tipi di file:" +msgstr "Schemi di file:" #: optiondialog.cpp:1088 msgid "" @@ -1281,13 +1312,13 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Categorie di file da analizzare. \n" -"Caratteri jolly ammessi: \"*\" e \"?\"\n" -"Puoi specificare più categorie separandole con un \";\"" +"Schemi di file da analizzare.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." #: optiondialog.cpp:1094 msgid "File-anti-pattern(s):" -msgstr "File da escludere:" +msgstr "Schemi di file da escludere:" #: optiondialog.cpp:1099 msgid "" @@ -1295,13 +1326,13 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Categorie di file da non analizzare. \n" -"Caratteri jolly ammessi: \"*\" e \"?\"\n" -"Puoi specificare più categorie separandole con un \";\"" +"Schemi di file da escludere dall'analisi.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." #: optiondialog.cpp:1105 msgid "Dir-anti-pattern(s):" -msgstr "Directory da escludere:" +msgstr "Schemi di cartelle da escludere:" #: optiondialog.cpp:1110 msgid "" @@ -1309,61 +1340,61 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Categorie di directory da non analizzare. \n" -"Caratteri jolly ammessi: \"*\" e \"?\"\n" -"Puoi specificare più categorie separandole con un \";\"" +"Schemi di cartelle da escludere dall'analisi.\n" +"Caratteri jolly: «*» e «?».\n" +"Si possono specificare più schemi con il separatore «;»." #: optiondialog.cpp:1116 msgid "Use .cvsignore" -msgstr "Utilizza .cvsignore" +msgstr "Usa .cvsignore" #: optiondialog.cpp:1119 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -"Escludi anche tutto quello che sarebbe ignorato dal CVS.\n" -"Puoi usare un file \".cvsignore\" diverso per ogni directory." +"Estendi l'esclusione a tutto quello che sarebbe ignorato da CVS.\n" +"Si possono usare dei file «.cvsignore» diversi per ogni cartella." #: optiondialog.cpp:1124 msgid "Find hidden files and directories" -msgstr "Esamina file e directory nascosti" +msgstr "Trova file e cartelle nascosti" #: optiondialog.cpp:1127 msgid "Finds files and directories with the hidden attribute." -msgstr "Esamina file e directory con l'attributo \"nascosto\"." +msgstr "Trova file e cartelle con l'attributo «nascosto»." #: optiondialog.cpp:1129 msgid "Finds files and directories starting with '.'." -msgstr "Esamina file e directory che iniziano con \".\"." +msgstr "Trova file e cartelle che iniziano con «.»." #: optiondialog.cpp:1133 msgid "Follow file links" -msgstr "Segui i link dei file" +msgstr "Segui i collegamenti dei file" #: optiondialog.cpp:1136 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -"Attivo: Confronta il file a cui punta il link.\n" -"Non attivo: Confronta i link." +"Attivo: confronta il file a cui punta il collegamento.\n" +"Non attivo: confronta i collegamenti." #: optiondialog.cpp:1141 msgid "Follow directory links" -msgstr "Segui i link delle directory" +msgstr "Segui i collegamenti delle cartelle" #: optiondialog.cpp:1144 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -"Attivo: Confronta la directory a cui punta il link.\n" -"Non attivo: Confronta i link." +"Attivo: confronta la cartella a cui punta il collegamento.\n" +"Non attivo: confronta i collegamenti." #: optiondialog.cpp:1160 msgid "Case sensitive filename comparison" -msgstr "Confronto nomi file sensibili alle maiuscole/minuscole" +msgstr "Distingui le maiuscole nel confronto dei nomi dei file" #: optiondialog.cpp:1163 msgid "" @@ -1373,13 +1404,14 @@ "off, otherwise on.)" msgstr "" "Il confronto tra cartelle confronterà file o cartelle quando i loro nomi " -"coincidono.\n" -"Imposta questa opzione se il caso dei nomi deve coincidere. (l'opzione " -"predefinita per Windows è off, altrimenti on.)" +"coincideranno.\n" +"Imposta questa opzione se le lettere maiuscole e minuscole devono essere " +"considerate diverse. L'opzione predefinita per Windows è disattivo, " +"altrimenti è attivo." #: optiondialog.cpp:1167 msgid "File Comparison Mode" -msgstr "Modalità di confronto file" +msgstr "Modalità di confronto dei file" #: optiondialog.cpp:1173 msgid "Binary comparison" @@ -1387,7 +1419,7 @@ #: optiondialog.cpp:1174 msgid "Binary comparison of each file. (Default)" -msgstr "Confronto binario per ogni file. (predefinito)" +msgstr "Confronto binario per ogni file (predefinito)." #: optiondialog.cpp:1177 msgid "Full analysis" @@ -1398,12 +1430,12 @@ "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -"Esegue analisi completa e mostra informazioni statistiche in nuove colonne.\n" -"(Più lento del confronto binario, lentissimo su file binari.)" +"Fai un'analisi completa e mostra informazioni statistiche in nuove colonne.\n" +"È più lento di un confronto binario e lentissimo su file binari." #: optiondialog.cpp:1182 msgid "Trust the size and modification date (unsafe)" -msgstr "Basati sulla grandezza e data di modifica (non sicuro)" +msgstr "Fidati della grandezza e della data di modifica (non sicuro)" #: optiondialog.cpp:1183 msgid "" @@ -1413,17 +1445,18 @@ "different.\n" "Useful for big directories or slow networks." msgstr "" -"Ritieni che i file sono uguali se hanno la stessa data e dimensione.\n" -"I file con contenuti uguali ma diverse date di modifica appariranno come " +"Assumi che i file sono uguali se hanno la stessa data di modifica e " +"dimensione.\n" +"I file con contenuti identici ma diverse date di modifica risulteranno " "diversi.\n" -"Utile per confrontare grandi directory o per connessioni lente." +"Utile per confrontare cartelle grandi o per connessioni lente." #: optiondialog.cpp:1188 msgid "" "Trust the size and date, but use binary comparison if date doesn't match " "(unsafe)" msgstr "" -"Basati sulla grandezza e sulla dat, ma usa il confronto binario se la data " +"Fidati della grandezza e della data, ma usa il confronto binario se la data " "non corrisponde (non sicuro)" #: optiondialog.cpp:1189 @@ -1435,12 +1468,12 @@ msgstr "" "Assumi che i file sono uguali se hanno la stessa data di modifica e " "dimensione.\n" -"Se la data non è uguale ma la grandezza sì, usa il confronto binario.\n" -"Utile per confrontare grandi directory o per connessioni lente." +"Se la data non è uguale ma la dimensione sì, usa il confronto binario.\n" +"Utile per confrontare cartelle grandi o per connessioni lente." #: optiondialog.cpp:1194 msgid "Trust the size (unsafe)" -msgstr "Basati sulla dimensione (non sicuro)" +msgstr "Fidati della dimensione (non sicuro)" #: optiondialog.cpp:1195 msgid "" @@ -1449,12 +1482,12 @@ "download." msgstr "" "Assumi che i file sono uguali se hanno la stessa dimensione.\n" -"Utile per confrontare grandi directory o per connessioni lente,\n" -"quando la data viene modificata durante il download." +"Utile per confrontare cartelle grandi o per connessioni lente,\n" +"dove la data viene modificata nello scaricamento." #: optiondialog.cpp:1203 msgid "Synchronize directories" -msgstr "Sincronizza le directory" +msgstr "Sincronizza le cartelle" #: optiondialog.cpp:1206 msgid "" @@ -1462,21 +1495,21 @@ "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -"Permette di memorizzare i file in entrambe le\n" -"directory, che poi risulteranno uguali.\n" -"Funziona solo quando si confrontano due directory\n" +"Permette di memorizzare i file in entrambe le cartelle,\n" +"in modo che poi risultino uguali.\n" +"Funziona solo quando si confrontano due cartelle\n" "senza specificare una destinazione." #: optiondialog.cpp:1212 msgid "White space differences considered equal" -msgstr "Se diversi per spazi bianchi sono considerati uguali" +msgstr "Differenze di spazi considerate uguali" #: optiondialog.cpp:1215 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -"Considera uguali i file diversi solo per spazi bianchi.\n" +"Se i file differiscono solo per degli spazi, considerali uguali.\n" "Funziona solo quando si effettua un'analisi completa." #: optiondialog.cpp:1221 @@ -1489,22 +1522,22 @@ "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -"Non guarda i contenuti, prende il più recente.\n" -"(Utilizza questo metodo solo a ragion veduta!)\n" -"Ha effetto solo quando si confrontano due directory." +"Non guardare i contenuti, prendi il più recente e basta.\n" +"Usalo solo se sai quello che stai facendo!\n" +"Funziona solo quando si confrontano due cartelle." #: optiondialog.cpp:1229 msgid "Backup files (.orig)" -msgstr "File di backup (.orig)" +msgstr "File di copia di sicurezza (.orig)" #: optiondialog.cpp:1232 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"Quando decidi di salvare un file sovrascrivendone\n" -"uno precedente, quello vecchio non verrà cancellato,\n" -"ma salvato con l'estensione \".orig\"." +"Quando un file sarebbe stato salvato sovrascrivendone su un altro\n" +"quest'ultimo verrà rinominato con l'estensione «.orig» invece di\n" +"essere cancellato." #: optiondialog.cpp:1328 optiondialog.cpp:1329 msgid "Regional Settings" @@ -1512,15 +1545,15 @@ #: optiondialog.cpp:1429 msgid "Language (restart required)" -msgstr "Lingua (bisogna riavviare kdiff3)" +msgstr "Lingua (riavvio necessario)" #: optiondialog.cpp:1461 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -"Scegli una lingua dell'interfaccia grafica o \"Auto\".\n" -"Affinché la lingua venga cambiata, devi uscire e riavviare KDiff3." +"Scegli la lingua dell'interfaccia grafica o «Auto».\n" +"Per cambiare la lingua devi uscire e riavviare KDiff3." #: optiondialog.cpp:1479 msgid "Use the same encoding for everything:" @@ -1536,47 +1569,39 @@ #: optiondialog.cpp:1487 msgid "Note: Local Encoding is " -msgstr "Nota: La codifica locale è " +msgstr "Nota: la codifica locale è " #: optiondialog.cpp:1491 msgid "File Encoding for A:" -msgstr "Codifica per file A:" +msgstr "Codifica per il file A:" #: optiondialog.cpp:1497 -#, fuzzy -#| msgid "" -#| "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -#| "If the file encoding is not detected then the selected encoding will be " -#| "used as fallback.\n" -#| "(Unicode detection depends on the first bytes of a file - the byte order " -#| "mark \"BOM\".)" msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" "If the file is not Unicode then the selected encoding will be used as " "fallback.\n" "(Unicode detection depends on the first bytes of a file.)" msgstr "" -"Se abilitato, la codifica Unicode (UTF-16 o UTF-8) verrà abilitata.\n" -"Se la codifica del file non viene rilevata, la codifica selezionata verrà " -"usata come riserva.\n" -"(la rilevazione unicode dipende dal primo byte di un file - l'indicazione " -"dell'ordine dei byte \"BOM\")." +"Se abilitato, verrà rilevata la codifica Unicode (UTF-16 o UTF-8).\n" +"Se il file non è in Unicode, la codifica selezionata sarà usata come " +"ripiego.\n" +"La rilevazione di Unicode dipende dai primi byte di un file." #: optiondialog.cpp:1501 optiondialog.cpp:1510 optiondialog.cpp:1519 msgid "Auto Detect Unicode" -msgstr "Autorileva Unicode" +msgstr "Rileva Unicode automaticamente" #: optiondialog.cpp:1506 msgid "File Encoding for B:" -msgstr "Codifica per file B:" +msgstr "Codifica per il file B:" #: optiondialog.cpp:1515 msgid "File Encoding for C:" -msgstr "Codifica per file C:" +msgstr "Codifica per il file C:" #: optiondialog.cpp:1524 msgid "File Encoding for Merge Output and Saving:" -msgstr "Codifica per i file fusione e salvataggio:" +msgstr "Codifica per il file fuso e il salvataggio:" #: optiondialog.cpp:1528 msgid "Auto Select" @@ -1588,25 +1613,25 @@ "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -"Se selezionato viene usata la codifica dai file di input.\n" -"In casi ambigui una finestra di dialogo chiederà all'utente di scegliere la " -"codifica per il salvataggio." +"Se abilitato viene usata la codifica dei file di ingresso.\n" +"Nei casi ambigui una finestra chiederà all'utente di scegliere la codifica " +"per il salvataggio." #: optiondialog.cpp:1535 msgid "File Encoding for Preprocessor Files:" -msgstr "Codifica per i file sottoposti al preprocessore:" +msgstr "Codifica per i file del preprocessore:" #: optiondialog.cpp:1546 msgid "Right To Left Language" -msgstr "Lingue scritte da destra a sin." +msgstr "Lingue scritte da destra a sinistra" #: optiondialog.cpp:1549 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -"Alcune lingue si scrivono da destra a sinistra.\n" -"Questa opzione cambia editor e visualizzazione per adattarvisi." +"Alcune lingue si leggono da destra a sinistra.\n" +"Questa opzione cambia in tal senso l'editor e la visualizzazione." #: optiondialog.cpp:1564 msgid "Integration" @@ -1618,7 +1643,7 @@ #: optiondialog.cpp:1579 msgid "Command line options to ignore:" -msgstr "Opzioni di riga di comando da ignorare:" +msgstr "Opzioni da riga di comando da ignorare:" #: optiondialog.cpp:1584 msgid "" @@ -1629,18 +1654,20 @@ msgstr "" "Lista delle opzioni da riga di comando che dovrebbero essere ignorate quando " "KDiff3 viene usato da altri strumenti.\n" -"Molti valori possono essere specificati se separati con ';'\n" -"Questo elimina l'errore \"Opzione sconosciuta\"." +"Si possono specificare diversi valori se separati con «;»\n" +"Questo eliminerà l'errore «Opzione sconosciuta»." #: optiondialog.cpp:1591 msgid "Quit also via Escape key" -msgstr "" +msgstr "Esci anche con il tasto Esc" #: optiondialog.cpp:1594 msgid "" "Fast method to exit.\n" "For those who are used to using the Escape-key." msgstr "" +"Metodo di uscita veloce.\n" +"Per chi è abituato a usare il tasto Esc." #: optiondialog.cpp:1599 msgid "Integrate with ClearCase" @@ -1653,18 +1680,19 @@ "(Only enabled when ClearCase \"bin\" directory is in the path.)" msgstr "" "Integra con Rational ClearCase di IBM.\n" -"Modifica il \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" -"(abilitato solo quando la cartella ClearCase è nel percorso \"bin\".)" +"Modifica il file «map» nella sottocartella di ClearCase «lib/mgrs»\n" +"(abilitato solo quando la cartella «bin» di ClearCase è nel percorso)." #: optiondialog.cpp:1608 msgid "Remove ClearCase Integration" -msgstr "Rimuovi l'integrazione ClearCase" +msgstr "Rimuovi l'integrazione con ClearCase" #: optiondialog.cpp:1611 msgid "" "Restore the old \"map\" file from before doing the Clearcase integration." msgstr "" -"Ripristina dal vecchio file \"map\"prima di fare l'integrazione ClearCase." +"Ripristina il vecchio file «map» com'era prima dell'integrazione con " +"ClearCase." #: optiondialog.cpp:1692 kreplacements/kreplacements.cpp:794 msgid "" @@ -1675,16 +1703,16 @@ "\n" "Do you want to continue or do you want to select another font." msgstr "" -"Hai selezionato un font a spaziatura variabile.\n" +"Hai selezionato un carattere a ampiezza variabile.\n" "\n" -"Poiché questo programma non gestisce correttamente questo\n" -"tipo di font, potresti avere problemi nel modificare i file.\n" +"Siccome questo programma non gestisce correttamente questo\n" +"tipo di caratteri, potresti avere problemi a modificare i file.\n" "\n" -"Vuoi continuare o preferisci cambiare font?" +"Vuoi continuare o preferisci cambiare carattere?" #: optiondialog.cpp:1696 msgid "Incompatible Font" -msgstr "Font incompatibile " +msgstr "Carattere non compatibile" #: optiondialog.cpp:1697 msgid "Continue at Own Risk" @@ -1692,163 +1720,152 @@ #: optiondialog.cpp:1698 msgid "Select Another Font" -msgstr "Scegli un altro font" +msgstr "Scegli un altro carattere" #: optiondialog.cpp:1733 msgid "This resets all options. Not only those of the current topic." msgstr "" -"Verranno ripristinate tutte le opzioni.\n" -"Non solo quelle relative a questo argomento." +"Questo ripristina tutte le opzioni, non solo quelle dell'argomento attuale." #: main.cpp:187 -#, fuzzy -#| msgid "KDiff3" msgid "kdiff3" -msgstr "KDiff3" +msgstr "kdiff3" #: main.cpp:189 msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "Strumento per confrontare e fondere più file o cartelle" +msgstr "Strumento per il confronto e la fusione di file e cartelle" #: main.cpp:190 msgid "(c) 2002-2008 Joachim Eibl" -msgstr "" +msgstr "© 2002-2008 Joachim Eibl" #: main.cpp:197 kdiff3_part.cpp:303 msgid "Joachim Eibl" -msgstr "" +msgstr "Joachim Eibl" #: main.cpp:198 msgid "Eike Sauer" -msgstr "" +msgstr "Eike Sauer" #: main.cpp:198 msgid "Bugfixes, Debian package maintainer" -msgstr "" +msgstr "Correzioni, responsabile del pacchetto di Debian" #: main.cpp:199 msgid "Sebastien Fricker" -msgstr "" +msgstr "Sebastien Fricker" #: main.cpp:199 msgid "Windows installer" -msgstr "" +msgstr "Installatore per Windows" #: main.cpp:200 msgid "Stephan Binner" -msgstr "" +msgstr "Stephan Binner" #: main.cpp:200 msgid "i18n-help" -msgstr "" +msgstr "Aiuto per la localizzazione" #: main.cpp:201 msgid "Stefan Partheymueller" -msgstr "" +msgstr "Stefan Partheymueller" #: main.cpp:201 -#, fuzzy -#| msgid "From Clipboard" msgid "Clipboard-patch" -msgstr "Dagli appunti" +msgstr "Correzione per gli appunti" #: main.cpp:202 msgid "David Faure" -msgstr "" +msgstr "David Faure" #: main.cpp:202 msgid "KIO-Help" -msgstr "" +msgstr "Aiuto per KIO" #: main.cpp:203 msgid "Bernd Gehrmann" -msgstr "" +msgstr "Bernd Gehrmann" #: main.cpp:203 msgid "Class CvsIgnoreList from Cervisia" -msgstr "" +msgstr "Classe CvsIgnoreList da Cervisia" #: main.cpp:204 msgid "Andre Woebbeking" -msgstr "" +msgstr "Andre Woebbeking" #: main.cpp:204 msgid "Class StringMatcher" -msgstr "" +msgstr "Classe StringMatcher" #: main.cpp:205 msgid "Michael Denio" -msgstr "" +msgstr "Michael Denio" #: main.cpp:205 -#, fuzzy -#| msgid "Directory Comparison Status" msgid "Directory Equality-Coloring patch" -msgstr "Stato di confronto di cartelle" +msgstr "Correzione per la colorazione delle cartelle identiche" #: main.cpp:206 msgid "Manfred Koehler" -msgstr "" +msgstr "Manfred Koehler" #: main.cpp:206 msgid "Fix for slow startup on Windows" -msgstr "" +msgstr "Correzione per l'avvio lento su Windows" #: main.cpp:207 -#, fuzzy -#| msgid "Merge Error" msgid "Sergey Zorin" -msgstr "Errore nella fusione" +msgstr "Sergey Zorin" #: main.cpp:207 msgid "Diff Ext for Windows" -msgstr "" +msgstr "Estensione per le differenze su Windows" #: main.cpp:208 msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -msgstr "" +msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" #: main.cpp:208 msgid "GNU-Diffutils" -msgstr "" +msgstr "Diffutils di GNU" #: main.cpp:209 msgid "Tino Boellsterling, Timothy Mee" -msgstr "" +msgstr "Tino Boellsterling, Timothy Mee" #: main.cpp:209 msgid "Intensive test, use and feedback" -msgstr "" +msgstr "Molte prove, uso e segnalazioni" #: main.cpp:210 msgid "Michael Schmidt" -msgstr "" +msgstr "Michael Schmidt" #: main.cpp:210 msgid "Mac support" -msgstr "" +msgstr "Supporto su Macintosh" #: main.cpp:211 msgid "Valentin Rusu" -msgstr "" +msgstr "Valentin Rusu" #: main.cpp:211 main.cpp:212 -#, fuzzy -#| msgid "Do Nothing" msgid "KDE4 porting" -msgstr "Non fare nulla" +msgstr "Trasferimento su KDE4" #: main.cpp:212 msgid "Albert Astals Cid" -msgstr "" +msgstr "Albert Astals Cid" #: main.cpp:214 msgid "+ Many thanks to those who reported bugs and contributed ideas!" -msgstr "+ Mille grazie a coloro che hanno segnalato errori o fornito idee!" +msgstr "E grazie mille a chi ha segnalato errori o fornito idee!" #: main.cpp:220 msgid "Merge the input." -msgstr "Fondi l'input." +msgstr "Fondi l'ingresso." #: main.cpp:221 msgid "Explicit base file. For compatibility with certain tools." @@ -1856,37 +1873,39 @@ #: main.cpp:222 msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "File di output. Implica -m. Ad es.: -o nuovo_file.txt" +msgstr "File di uscita. Implica «-m». Per esempio: -o file_nuovo.txt" #: main.cpp:223 msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "File di output, ancora. (Per compatibilità con certi programmi)" +msgstr "File di uscita, di nuovo. Per compatibilità con certi programmi." #: main.cpp:224 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Senza GUI se ogni conflitto è risolvibile in automatico. (Serve -o file)" +"Senza interfaccia se ogni conflitto è risolvibile automaticamente. Serve «-o " +"file»." #: main.cpp:225 msgid "Don't solve conflicts automatically. (For compatibility...)" -msgstr "Non risolvere i conflitti automaticamente. (Per compatibilità...)" +msgstr "Non risolvere i conflitti automaticamente. Per compatibilità." #: main.cpp:226 msgid "Visible name replacement for input file 1 (base)." -msgstr "Mostra sostituzione nome per il file di input 1 (base)." +msgstr "Mostra sostituzione del nome per il file di ingresso 1 (base)." #: main.cpp:227 msgid "Visible name replacement for input file 2." -msgstr "Mostra sostituzione nome per il file di input 2." +msgstr "Mostra sostituzione del nome per il file di ingresso 2." #: main.cpp:228 msgid "Visible name replacement for input file 3." -msgstr "Mostra sostituzione nome per il file di input 3." +msgstr "Mostra sostituzione del nome per il file di ingresso 3." #: main.cpp:229 msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -"Sostituzione del nome visibile alternativo. Da specificare per ogni input." +"Sostituzione del nome visibile alternativo. Da specificare una volta per " +"ogni ingresso." #: main.cpp:230 msgid "" @@ -1894,12 +1913,12 @@ "\"AutoAdvance=1\"" msgstr "" "Ignora un'impostazione di configurazione. Usa una volta per ogni " -"impostazione. P. e.: --cs \"AutoAdvance=1\"" +"impostazione. Per esempio: «--cs \"AutoAdvance=1\"»" #: main.cpp:231 msgid "Show list of config settings and current values." msgstr "" -"Mostra la lista delle impostazioni di configurazione e i valori correnti." +"Mostra la lista delle impostazioni di configurazione e i valori attuali." #: main.cpp:232 msgid "Use a different config file." @@ -1907,37 +1926,27 @@ #: main.cpp:235 msgid "file1 to open (base, if not specified via --base)" -msgstr "file1 da aprire (base, se non cambiato con --base)" +msgstr "File1 da aprire (base, se non specificato con «--base»)" #: main.cpp:236 msgid "file2 to open" -msgstr "file2 da aprire " +msgstr "File2 da aprire" #: main.cpp:237 msgid "file3 to open" -msgstr "file3 da aprire " - -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 -#, fuzzy -#| msgid "File..." +msgstr "File3 da aprire" + +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" -msgstr "File..." +msgstr "File" #: difftextwindow.cpp:390 -#, fuzzy -#| msgid "Link: " msgid "Line" -msgstr "Collegamento: " +msgstr "Riga" #: difftextwindow.cpp:392 -#, fuzzy -#| msgid "not available" msgid "Line not available" -msgstr "non disponibile" - -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Riga superiore" +msgstr "Riga non disponibile" #: difftextwindow.cpp:1731 msgid "End" @@ -1945,11 +1954,12 @@ #: pdiff.cpp:260 msgid "PreprocessorCmd: " -msgstr "Cmd-Preprocess.:" +msgstr "Comando del preprocessore: " #: pdiff.cpp:265 msgid "The following option(s) you selected might change data:\n" -msgstr "Tra le opzioni selezionate, queste potrebbero modificare dei dati:\n" +msgstr "" +"Le opzioni seguenti che hai selezionato potrebbero modificare dei dati:\n" #: pdiff.cpp:266 msgid "" @@ -1958,389 +1968,387 @@ "Do you want to disable these settings or continue with these settings active?" msgstr "" "\n" -"Di solito non si desidera che ciò accada durante una fusione.\n" +"Di solito questo non è quello che si vuole in una fusione.\n" "Vuoi disabilitare queste opzioni o continuare mantenendole in funzione?" #: pdiff.cpp:268 msgid "Option Unsafe for Merging" -msgstr "Opzioni non sicure per fusione" +msgstr "Opzioni non sicure per la fusione" #: pdiff.cpp:269 msgid "Use These Options During Merge" -msgstr "Utilizza queste opzioni durante la fusione" +msgstr "Usa queste opzioni nella fusione" #: pdiff.cpp:270 msgid "Disable Unsafe Options" -msgstr "Disattiva opzioni non sicure" +msgstr "Disattiva le opzioni non sicure" #: pdiff.cpp:300 msgid "Loading A" -msgstr "Sto caricando A" +msgstr "Caricamento di A" #: pdiff.cpp:304 msgid "Loading B" -msgstr "Sto caricando B" +msgstr "Caricamento di B" #: pdiff.cpp:321 pdiff.cpp:347 msgid "Diff: A <-> B" -msgstr "Diff: A <-> B" +msgstr "Differenze: A <-> B" #: pdiff.cpp:327 pdiff.cpp:372 msgid "Linediff: A <-> B" -msgstr "Diff. righe: A <-> B" +msgstr "Differenze per righe: A <-> B" #: pdiff.cpp:338 msgid "Loading C" -msgstr "Sto caricando C" +msgstr "Caricamento di C" #: pdiff.cpp:350 msgid "Diff: B <-> C" -msgstr "Diff: B <-> C" +msgstr "Differenze: B <-> C" #: pdiff.cpp:353 msgid "Diff: A <-> C" -msgstr "Diff: A <-> C" +msgstr "Differenze: A <-> C" #: pdiff.cpp:375 msgid "Linediff: B <-> C" -msgstr "Diff. righe: B <-> C" +msgstr "Differenze per righe: B <-> C" #: pdiff.cpp:378 msgid "Linediff: A <-> C" -msgstr "Diff. righe: A <-> C" - -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +msgstr "Differenze per righe: A <-> C" + +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." -msgstr "Tutti i file in input sono uguali a livello binario." - -#: pdiff.cpp:530 +msgstr "Tutti i file di ingresso sono uguali a livello binario." + +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Tutti i file in input contengono lo stesso testo, ma non sono uguali a " +"Tutti i file di ingresso contengono lo stesso testo, ma non sono uguali a " "livello binario." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "I file %1 e %2 sono uguali a livello binario.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "I file %1 e %2 contengono lo stesso testo, ma non sono uguali a livello " "binario. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -"Alcuni file di input non sembrano file di testo puri.\n" -"Tieni conto che la fusione di KDiff3 non ha senso per file binari.\n" +"Alcuni file di ingresso non sembrano essere file puramente di testo.\n" +"Tieni conto che la fusione di KDiff3 non è fatta per i file binari.\n" "Se vuoi continuare, lo fai a tuo rischio e pericolo." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Interrompi" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continua la fusione" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Apertura dei file..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Errore nell'apertura del file" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." -msgstr "Taglio selezione..." - -#: pdiff.cpp:1213 +msgstr "Taglio della selezione..." + +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." -msgstr "Copia selezione negli appunti..." - -#: pdiff.cpp:1229 +msgstr "Copia della selezione negli appunti..." + +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." -msgstr "Inserimento dagli appunti..." - -#: pdiff.cpp:1755 +msgstr "Inserimento dei contenuti degli appunti..." + +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Salva e continua" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continua senza salvare" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Ricerca completata." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" -msgstr "Ricerca completata." - -#: pdiff.cpp:2192 +msgstr "Ricerca completata" + +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -"Non è selezionato niente neanche nella finestra di input delle differenze." - -#: pdiff.cpp:2192 +"Non è selezionato niente in nessuna delle finestre di ingresso delle " +"differenze." + +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" -msgstr "Errore nell'aggiungere intervalli di differenza manuali" +msgstr "Errore nell'aggiunta di intervalli di differenze manuali" #: kdiff3_shell.cpp:76 -#, fuzzy -#| msgid "" -#| "Could not find our part!\n" -#| "This usually happens due to an installation problem. Please read the " -#| "README-file in the source package for details." msgid "" "Could not initialize our part!\n" "This usually happens due to an installation problem. Please read the README-" "file in the source package for details." msgstr "" -"Non si trova una componente!\n" +"Impossibile inizializzare il componente.\n" "Questo di solito accade per problemi di installazione. Per maggiori dettagli " -"dovresti leggere il file README nel pacchetto dei sorgenti." - -#: directorymergewindow.cpp:154 +"leggi il file README nel pacchetto del codice sorgente." + +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." -msgstr "Collegamenti e file normali insieme." - -#: directorymergewindow.cpp:161 +msgstr "Insieme di collegamenti e file normali." + +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Collegamento: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Dimensione. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Data e dimensione: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." -msgstr "Non ho potuto creare una copia temporanea di %1." - -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +msgstr "Creazione di una copia temporanea di %1 non riuscita." + +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." -msgstr "Non ho potuto aprire %1." - -#: directorymergewindow.cpp:231 +msgstr "Apertura di %1 non riuscita." + +#: directorymergewindow.cpp:213 msgid "Comparing file..." -msgstr "Confronto file ..." - -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +msgstr "Confronto del file..." + +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Errore nella lettura di %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operazione" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Stato" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Non risolto" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Risolto" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Non vuoto" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Vuoto" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -"Stai fondendo delle cartelle. Sei sicuro? Vuoi interrompere la fusione e " +"Stai fondendo delle cartelle. Sei sicuro di voler interrompere la fusione e " "riesaminare la cartella?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Riesamina" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Apertura di cartelle non riuscita:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Dir A \"%1\" non esiste o non è una cartella.\n" - -#: directorymergewindow.cpp:572 +msgstr "La cartella A «%1» non esiste o non è una cartella.\n" + +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Dir B \"%1\" non esiste o non è una cartella.\n" - -#: directorymergewindow.cpp:575 +msgstr "" +"La cartella B «%1» non esiste o non è una cartella.\n" +".\n" + +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Dir C \"%1\" non esiste o non è una cartella.\n" - -#: directorymergewindow.cpp:577 +msgstr "La cartella C «%1» non esiste o non è una cartella.\n" + +#: directorymergewindow.cpp:559 msgid "Directory Open Error" -msgstr "Errore apertura cartella" - -#: directorymergewindow.cpp:585 +msgstr "Errore nell'apertura di una cartella" + +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -"Quando si fondono tre cartelle, la cartella di destinazione non può essere " -"uguale ad A o B.\n" -"Controlla meglio prima di continuare." - -#: directorymergewindow.cpp:587 +"La cartella di destinazione non può essere la stessa di A o B quando si " +"fondono tre cartelle.\n" +"Ricontrolla prima di continuare." + +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Attenzione ai parametri" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." -msgstr "Esame cartelle in corso..." - -#: directorymergewindow.cpp:625 +msgstr "Esame delle cartelle..." + +#: directorymergewindow.cpp:607 msgid "Reading Directory A" -msgstr "Lettura della cartella A in corso" - -#: directorymergewindow.cpp:647 +msgstr "Lettura della cartella A" + +#: directorymergewindow.cpp:629 msgid "Reading Directory B" -msgstr "Lettura della cartella B in corso" - -#: directorymergewindow.cpp:669 +msgstr "Lettura della cartella B" + +#: directorymergewindow.cpp:651 msgid "Reading Directory C" -msgstr "Lettura della cartella C in corso" - -#: directorymergewindow.cpp:695 +msgstr "Lettura della cartella C" + +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" -msgstr "Alcune sotto-cartelle non erano leggibili" - -#: directorymergewindow.cpp:700 +msgstr "Alcune sottocartelle non erano leggibili" + +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." -msgstr "Controlla i permessi per le sotto-cartelle." - -#: directorymergewindow.cpp:753 +msgstr "Controlla i permessi per le sottocartelle." + +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" -msgstr "Stato di confronto di cartelle" - -#: directorymergewindow.cpp:754 +msgstr "Stato del confronto tra cartelle" + +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" -msgstr "Numero di sotto-cartelle:" - -#: directorymergewindow.cpp:755 +msgstr "Numero di sottocartelle:" + +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Numero di file uguali:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" -msgstr "Numero di file differenti:" - -#: directorymergewindow.cpp:759 +msgstr "Numero di file diversi:" + +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Numero di fusioni manuali:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Questo riguarda tutte le operazioni di fusione." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" -msgstr "Modifica tutte le operazioni di fusione" - -#: directorymergewindow.cpp:1328 +msgstr "Modifica di tutte le operazioni di fusione" + +#: directorymergewindow.cpp:1309 msgid "Processing " -msgstr "Sto elaborando" - -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +msgstr "Elaborazione in corso " + +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Da fare." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copia A su B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copia B su A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Elimina A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Elimina B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Fondi con A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Fondi con B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" -msgstr "Fondi A e B" - -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +msgstr "Fondi con A e B" + +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Elimina (se esiste)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Fondi (manuale)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" -msgstr "Errore: Tipi di file incompatibili" - -#: directorymergewindow.cpp:1896 +msgstr "Errore: tipi di file in conflitto" + +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Errore: le date coincidono ma i file sono diversi." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." -msgstr "Questa operazione per ora non è implementata." - -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +msgstr "Questa operazione non è attualmente possibile." + +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operazione non possibile" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2354,48 +2362,46 @@ "\n" "Se sai come riprodurlo, per favore comunicalo all'autore del programma." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Errore nel programma" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Si è verificato un errore durante la copia.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 -#, fuzzy -#| msgid "Error." +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" -msgstr "Errore." - -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +msgstr "Errore" + +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" -msgstr "Errore nella fusione" - -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +msgstr "Errore di fusione" + +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Errore." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Fatto." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Non salvato." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" -msgstr "Operazione di fusione sconosciuta. (Non deve mai succedere!)" - -#: directorymergewindow.cpp:2127 +msgstr "Operazione di fusione sconosciuta (non deve mai succedere)." + +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Operazione di fusione sconosciuta." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2408,34 +2414,35 @@ msgstr "" "La fusione sta per iniziare.\n" "\n" -"Scegli \"Procedi\" se hai letto le istruzioni e sai cosa stai facendo.\n" +"Scegli «Procedi» se hai letto le istruzioni e sai cosa stai facendo.\n" "\n" -"Scegli \"Simulazione\" per vedere cosa succederebbe.\n" +"Scegli «Simulazione» per vedere cosa succederebbe.\n" "\n" -"Stai attento perché questo programma è ancora una \"beta\" e non c'è NESSUNA " -"GARANZIA che funzioni! Fai una copia di riserva dei tuoi dati importanti!" - -#: directorymergewindow.cpp:2147 +"Stai attento perché questo programma è ancora una «beta» e non c'è <b>nessuna " +"garanzia</b> che funzioni! Fai una copia di sicurezza dei tuoi dati " +"importanti!" + +#: directorymergewindow.cpp:2072 msgid "Starting Merge" -msgstr "Inizio fusione" - -#: directorymergewindow.cpp:2148 +msgstr "Inizio della fusione" + +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Procedi" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulazione" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -"Gli elementi evidenziati sono di tipo diverso nelle diverse cartelle. Scegli " -"cosa fare." - -#: directorymergewindow.cpp:2184 +"L'elemento evidenziato è di diverso tipo nelle diverse cartelle. Scegli cosa " +"fare." + +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2443,15 +2450,15 @@ "Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " "fare." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -"Non si può effettuare questa operazione poiché è in corso la fusione di due " -"cartelle." - -#: directorymergewindow.cpp:2295 +"Attualmente non si può effettuare questa operazione perché è in corso una " +"fusione tra cartelle." + +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2460,580 +2467,549 @@ "Si è verificato un errore nell'ultimo passaggio.\n" "Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" -msgstr "Continua fusione dopo errore" - -#: directorymergewindow.cpp:2298 +msgstr "Continua la fusione dopo un errore" + +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" -msgstr "Continua con il prossimo elemento" - -#: directorymergewindow.cpp:2299 +msgstr "Continua con l'ultimo" + +#: directorymergewindow.cpp:2224 msgid "Skip Item" -msgstr "Salta l'elemento" - -#: directorymergewindow.cpp:2333 +msgstr "Saltalo" + +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Saltato." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "In esecuzione..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Operazione di fusione completata." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Fusione completata" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Terminata simulazione fusione: controlla se le operazioni proposte vanno " -"bene." - -#: directorymergewindow.cpp:2435 +"Fusione simulata completata: controlla se ti vanno bene le operazioni " +"proposte." + +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Si è verificato un errore. Premi OK per maggiori informazioni.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." -msgstr "Errore: nell'eliminare %1: non ho potuto creare una copia di riserva." - -#: directorymergewindow.cpp:2474 +msgstr "Errore: nell'eliminare %1: impossibile creare una copia di sicurezza." + +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "elimina cartella ricorsivamente (%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "elimina (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "Errore: fallita l'eliminazione della cartella durante la sua lettura." - -#: directorymergewindow.cpp:2510 +msgstr "" +"Errore: eliminazione della cartella non riuscita durante la sua lettura." + +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "Errore: non è riuscita l'operazione rmdir (%1)." - -#: directorymergewindow.cpp:2520 +msgstr "Errore: operazione di rimozione di una cartella (%1) non riuscita." + +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." -msgstr "Errore: eliminazione fallita." - -#: directorymergewindow.cpp:2546 +msgstr "Errore: eliminazione non riuscita." + +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusione manuale (%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Nota: Dopo una fusione manuale l'utente deve premere F7 per continuare." - -#: directorymergewindow.cpp:2572 +" Nota: dopo una fusione manuale l'utente dovrebbe premere F7 per " +"continuare." + +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Errore: copia da %1 a %2 non riuscita. Eliminazione destinazione esistente " -"fallita." - -#: directorymergewindow.cpp:2582 +"Errore: copia (%1 -> %2) non riuscita. Eliminazione della destinazione " +"esistente non riuscita." + +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" -msgstr "copiaLink(%1 -> %2)" - -#: directorymergewindow.cpp:2593 +msgstr "copia collegamento (%1 -> %2)" + +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -"Errore: copiaLink impossibile: i link remoti non sono ancora supportati." - -#: directorymergewindow.cpp:2599 +"Errore: copia di collegamento non riuscita: i collegamenti remoti non sono " +"ancora supportati." + +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." -msgstr "Errore: copiaLink non riuscito." - -#: directorymergewindow.cpp:2619 +msgstr "Errore: copia di collegamento non riuscita." + +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" -msgstr "copia(%1 -> %2)" - -#: directorymergewindow.cpp:2645 +msgstr "copia (%1 -> %2)" + +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Errore nel cambio nome (%1 -> %2): Impossibile eliminare la destinazione " +"Errore nella rinomina (%1 -> %2): impossibile eliminare la destinazione " "esistente." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" -msgstr "cambio nome(%1 -> %2)" - -#: directorymergewindow.cpp:2660 +msgstr "rinomina (%1 -> %2)" + +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." -msgstr "Errore: cambio nome non riuscito." - -#: directorymergewindow.cpp:2678 +msgstr "Errore: rinomina non riuscita." + +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "Errore eseguendo makeDir di %1. Impossibile eliminare file esistente." - -#: directorymergewindow.cpp:2694 +msgstr "" +"Errore durante la creazione della cartella %1. Impossibile eliminare un file " +"esistente." + +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" -msgstr "makeDir(%1)" - -#: directorymergewindow.cpp:2704 +msgstr "crea cartella (%1)" + +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." -msgstr "Errore nel creare una cartella." - -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +msgstr "Errore nella creazione di una cartella." + +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" -msgstr "Dest" - -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +msgstr "Destinazione" + +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" -msgstr "Dir" - -#: directorymergewindow.cpp:2733 +msgstr "Cartella" + +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Dimensione" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" -msgstr "Attr" - -#: directorymergewindow.cpp:2734 +msgstr "Attributo" + +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Ultima modifica" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" -msgstr "Collegamento di destinazione" - -#: directorymergewindow.cpp:2781 +msgstr "Destinazione del collegamento" + +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "non disponibile" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " -msgstr "A (Dest): " - -#: directorymergewindow.cpp:2804 +msgstr "A (destinazione): " + +#: directorymergewindow.cpp:2729 msgid "A (Base): " -msgstr "A (Base): " - -#: directorymergewindow.cpp:2810 +msgstr "A (base): " + +#: directorymergewindow.cpp:2735 msgid "B (Dest): " -msgstr "B (Dest): " - -#: directorymergewindow.cpp:2818 +msgstr "B (destinazione): " + +#: directorymergewindow.cpp:2743 msgid "C (Dest): " -msgstr "C (Dest): " - -#: directorymergewindow.cpp:2824 +msgstr "C (destinazione): " + +#: directorymergewindow.cpp:2749 msgid "Dest: " -msgstr "Dest: " - -#: directorymergewindow.cpp:2891 +msgstr "Destinazione: " + +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Salva lo stato di fusione cartelle come..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" -msgstr "Avvia/continua fusione cartelle" - -#: directorymergewindow.cpp:2979 +msgstr "Avvia o continua fusione tra cartelle" + +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" -msgstr "Esegui operazione per questa voce" - -#: directorymergewindow.cpp:2980 +msgstr "Esegui operazione l'elemento attuale" + +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" -msgstr "Confronta file selezionato" - -#: directorymergewindow.cpp:2981 +msgstr "Confronta il file selezionato" + +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Fondi il file attuale" -#: directorymergewindow.cpp:2981 -#, fuzzy -#| msgid "Merge" +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" -msgstr "Fondi" - -#: directorymergewindow.cpp:2982 +msgstr "" +"Fondi\n" +"file" + +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Chiudi tutte le sottocartelle" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Apri tutte le sottocartelle" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" -msgstr "Scegli A in tutti i casi" - -#: directorymergewindow.cpp:2988 +msgstr "Scegli A per tutti gli elementi" + +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" -msgstr "Scegli B in tutti i casi" - -#: directorymergewindow.cpp:2989 +msgstr "Scegli B per tutti gli elementi" + +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" -msgstr "Scegli C in tutti i casi" - -#: directorymergewindow.cpp:2990 +msgstr "Scegli C per tutti gli elementi" + +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" -msgstr "Scelta automatica in tutti i casi" - -#: directorymergewindow.cpp:2991 +msgstr "Operazione di scelta automatica per tutti gli elementi" + +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" -msgstr "Non fare nulla in tutti i casi" - -#: directorymergewindow.cpp:2996 +msgstr "Nessuna operazione per tutti gli elementi" + +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" -msgstr "Mostra file uguali" - -#: directorymergewindow.cpp:2996 -#, fuzzy -#| msgid "Show Identical Files" +msgstr "Mostra file identici" + +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" -msgstr "Mostra file uguali" - -#: directorymergewindow.cpp:2997 +msgstr "" +"File\n" +"identici" + +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Mostra file diversi" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Mostra file solo in A" -#: directorymergewindow.cpp:2998 -#, fuzzy -#| msgid "Show Files only in A" +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" -msgstr "Mostra file solo in A" - -#: directorymergewindow.cpp:2999 +msgstr "" +"File\n" +"solo in A" + +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Mostra file solo in B" -#: directorymergewindow.cpp:2999 -#, fuzzy -#| msgid "Show Files only in B" +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" -msgstr "Mostra file solo in B" - -#: directorymergewindow.cpp:3000 +msgstr "" +"File\n" +"solo in B" + +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Mostra file solo in C" -#: directorymergewindow.cpp:3000 -#, fuzzy -#| msgid "Show Files only in C" +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" -msgstr "Mostra file solo in C" - -#: directorymergewindow.cpp:3004 +msgstr "" +"File\n" +"solo in C" + +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" -msgstr "Confronta file selezionati" - -#: directorymergewindow.cpp:3005 +msgstr "Confronta file esplicitamente selezionati" + +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" -msgstr "Fondi file selezionati" - -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +msgstr "Fondi file esplicitamente selezionati" + +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Non fare nulla" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" -msgstr "Fondi A e B" +msgstr "Fondi con A e B" #: kdiff3_part.cpp:157 kdiff3_part.cpp:234 msgid "Couldn't find files for comparison." -msgstr "Non trovo i file da confrontare." +msgstr "Impossibile trovare i file da confrontare." #: kdiff3_part.cpp:302 msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 -#, fuzzy -#| msgid "C&ontinue" +#: kreplacements/kreplacements.h:103 msgid "Continue" -msgstr "C&ontinua" - -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +msgstr "Continua" + +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" -msgstr "" +msgstr "Esci" #: kreplacements/kreplacements.cpp:183 kreplacements/kreplacements.cpp:345 msgid "Ok" -msgstr "" +msgstr "Ok" #: kreplacements/kreplacements.cpp:187 kreplacements/kreplacements.cpp:721 msgid "Help" -msgstr "" +msgstr "Aiuto" #: kreplacements/kreplacements.cpp:191 msgid "Defaults" -msgstr "" +msgstr "Valori predefiniti" #. i18n: file: kdiff3_shell.rc:4 #. i18n: ectx: Menu (file) #: kreplacements/kreplacements.cpp:302 rc.cpp:12 -#, fuzzy -#| msgid "File..." msgid "&File" -msgstr "File..." +msgstr "&File" #: kreplacements/kreplacements.cpp:303 -#, fuzzy -#| msgid "Editor" msgid "&Edit" -msgstr "Editor" +msgstr "&Modifica" #. i18n: file: kdiff3_shell.rc:7 #. i18n: ectx: Menu (directory) #: kreplacements/kreplacements.cpp:304 rc.cpp:15 msgid "&Directory" -msgstr "&Directory" +msgstr "&Cartella" #. i18n: file: kdiff3_shell.rc:50 #. i18n: ectx: Menu (movement) #: kreplacements/kreplacements.cpp:307 rc.cpp:24 msgid "&Movement" -msgstr "&Va" +msgstr "Mo&vimento" #. i18n: file: kdiff3_shell.rc:61 #. i18n: ectx: Menu (diff) #: kreplacements/kreplacements.cpp:308 rc.cpp:27 msgid "D&iffview" -msgstr "Vista d&iff" +msgstr "V&ista di confronto" #. i18n: file: kdiff3_shell.rc:73 #. i18n: ectx: Menu (merge) #: kreplacements/kreplacements.cpp:309 rc.cpp:30 msgid "&Merge" -msgstr "F&usione" +msgstr "F&ondi" #. i18n: file: kdiff3_shell.rc:95 #. i18n: ectx: Menu (window) #: kreplacements/kreplacements.cpp:310 rc.cpp:33 msgid "&Window" -msgstr "Fine&stra" +msgstr "Fi&nestra" #: kreplacements/kreplacements.cpp:311 -#, fuzzy -#| msgid "Diff Settings" msgid "&Settings" -msgstr "Impostazioni Diff" +msgstr "Imp&ostazioni" #: kreplacements/kreplacements.cpp:312 msgid "&Help" -msgstr "" +msgstr "Ai&uto" #: kreplacements/kreplacements.cpp:359 -#, fuzzy -#| msgid "Abort" msgid "&About" -msgstr "Interrompi" +msgstr "&Informazioni" #: kreplacements/kreplacements.cpp:375 msgid "A&uthor" -msgstr "" +msgstr "A&utore" #: kreplacements/kreplacements.cpp:389 msgid "&Thanks To" -msgstr "" +msgstr "&Ringraziamenti" #. i18n: file: kdiff3_shell.rc:30 #. i18n: ectx: Menu (dir_current_merge_menu) #: kreplacements/kreplacements.cpp:494 kreplacements/kreplacements.cpp:503 #: rc.cpp:18 msgid "Current Item Merge Operation" -msgstr "Operazione di fusione su questo file/dir." +msgstr "Operazione di fusione dell'elemento attuale" #. i18n: file: kdiff3_shell.rc:38 #. i18n: ectx: Menu (dir_current_sync_menu) #: kreplacements/kreplacements.cpp:495 kreplacements/kreplacements.cpp:504 #: rc.cpp:21 msgid "Current Item Sync Operation" -msgstr "Operazione di sincronizzazione su questo file/dir." +msgstr "Operazione di sincronizzazione dell'elemento attuale" #: kreplacements/kreplacements.cpp:603 -#, fuzzy -#| msgid "Operation" msgid "Open" -msgstr "Operazione" +msgstr "Apri" #: kreplacements/kreplacements.cpp:612 -#, fuzzy -#| msgid "Solved" msgid "Save" -msgstr "Risolto" +msgstr "Salva" #: kreplacements/kreplacements.cpp:629 -#, fuzzy -#| msgid "Printing..." msgid "Print..." msgstr "Stampa..." #: kreplacements/kreplacements.cpp:645 msgid "Cut" -msgstr "" +msgstr "Taglia" #: kreplacements/kreplacements.cpp:653 msgid "Copy" -msgstr "" +msgstr "Copia" #: kreplacements/kreplacements.cpp:661 msgid "Paste" -msgstr "" +msgstr "Incolla" #: kreplacements/kreplacements.cpp:669 -#, fuzzy -#| msgid "Delete A" msgid "Select All" -msgstr "Elimina A" +msgstr "Seleziona tutto" #: kreplacements/kreplacements.cpp:677 msgid "Show Toolbar" -msgstr "" +msgstr "Mostra la barra degli strumenti" #: kreplacements/kreplacements.cpp:685 msgid "Show &Statusbar" -msgstr "" +msgstr "Mostra la barra di &stato" #: kreplacements/kreplacements.cpp:693 -#, fuzzy, kde-format -#| msgid "Configure..." +#, kde-format msgid "&Configure %1..." -msgstr "Configura..." +msgstr "&Configura %1..." #: kreplacements/kreplacements.cpp:705 kreplacements/kreplacements.cpp:713 -#, fuzzy -#| msgid "Abort" msgid "About" -msgstr "Interrompi" +msgstr "Informazioni" #: kreplacements/kreplacements.cpp:728 msgid "Find" -msgstr "" +msgstr "Trova" #: kreplacements/kreplacements.cpp:736 msgid "Find Next" -msgstr "" +msgstr "Trova successivo" #: kreplacements/kreplacements.cpp:756 -#, fuzzy -#| msgid "Selection" msgid "Select Font" -msgstr "Selezione" +msgstr "Seleziona carattere" #: kreplacements/kreplacements.cpp:798 -#, fuzzy -#| msgid "Incompatible Font" msgid "Incompatible font." -msgstr "Font incompatibile " +msgstr "Carattere non compatibile." #: kreplacements/kreplacements.cpp:799 -#, fuzzy -#| msgid "Continue at Own Risk" msgid "Continue at my own risk" -msgstr "Continua a tuo rischio" +msgstr "Continuo a mio rischio" #: kreplacements/kreplacements.cpp:799 -#, fuzzy -#| msgid "Select Another Font" msgid "Select another font" -msgstr "Scegli un altro font" +msgstr "Seleziona un altro carattere" #: kreplacements/kreplacements.cpp:1138 msgid "For more documentation, see the help-menu or the subdirectory doc." msgstr "" +"Per maggiore documentazione, vedi il menu «Aiuto» o la sottocartella doc." #: kreplacements/kreplacements.cpp:1141 -#, fuzzy -#| msgid "KDiff3" msgid "KDiff3-Usage" -msgstr "KDiff3" +msgstr "Uso di KDiff3" #: kreplacements/kreplacements.cpp:1141 -#, fuzzy -#| msgid "Ignore case" msgid "Ignore" -msgstr "Ignora maiuscole" +msgstr "Ignora" #: kreplacements/kreplacements.cpp:1141 -#, fuzzy -#| msgid "Editor" msgid "Exit" -msgstr "Editor" +msgstr "Esci" #: mergeresultwindow.cpp:152 mergeresultwindow.cpp:970 #: mergeresultwindow.cpp:984 mergeresultwindow.cpp:996 #: mergeresultwindow.cpp:1008 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" -"Numero di conflitti non ancora risolti: %1 (di cui %2 relativi a spazi " -"bianchi)" +msgstr "Numero di conflitti non ancora risolti: %1 (di cui %2 sono di spazi)" #: mergeresultwindow.cpp:301 msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -"L'output è stato modificato.\n" +"L'uscita è stata modificata.\n" "Se continui le modifiche andranno perse." #: mergeresultwindow.cpp:830 msgid "All input files contain the same text." -msgstr "Tutti i file in input contengono lo stesso testo." +msgstr "Tutti i file di ingresso contengono lo stesso testo." #: mergeresultwindow.cpp:833 mergeresultwindow.cpp:835 #: mergeresultwindow.cpp:837 #, kde-format msgid "Files %1 and %2 have equal text.\n" -msgstr "I file %1 e %2 contengono lo stesso testo.\n" +msgstr "I file %1 e %2 hanno lo stesso testo.\n" #: mergeresultwindow.cpp:843 msgid "Total number of conflicts: " @@ -3045,7 +3021,7 @@ "Nr of automatically solved conflicts: " msgstr "" "\n" -"N. di conflitti risolti automaticamente: " +"Nº di conflitti risolti automaticamente: " #: mergeresultwindow.cpp:845 msgid "" @@ -3053,7 +3029,7 @@ "Nr of unsolved conflicts: " msgstr "" "\n" -"N. di conflitti non risolti: " +"Nº di conflitti non risolti: " #: mergeresultwindow.cpp:847 msgid "Conflicts" @@ -3061,60 +3037,81 @@ #: mergeresultwindow.cpp:1714 msgid "<No src line>" -msgstr "<riga origine mancante>" +msgstr "<riga sorgente mancante>" #: mergeresultwindow.cpp:1722 msgid "<Merge Conflict (Whitespace only)>" -msgstr "<Conflitto nel fondere (relativo solo a spazi bianchi)>" - -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +msgstr "<Conflitto di fusione (di soli spazi)>" + +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" -msgstr "<Conflitto nel fondere>" - -#: mergeresultwindow.cpp:2706 +msgstr "<Conflitto di fusione>" + +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -"Permangono dei conflitti non risolti.\n" -"Il file non verrà salvato.\n" - -#: mergeresultwindow.cpp:2708 +"Non sono ancora risolti tutti i conflitti.\n" +"File non salvato.\n" + +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" -msgstr "Conflitti restanti" +msgstr "Conflitti rimanenti" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"C'è un conflitto di stili di fine riga. Seleziona manualmente lo stile.\n" +"File non salvato.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" "\n" "\n" -"Impossibile fare una copia di riserva. File non salvato." - -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +"Creazione della copia di sicurezza non riuscita. File non salvato." + +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" -msgstr "Errore nel salvare il file" - -#: mergeresultwindow.cpp:2761 +msgstr "Errore nel salvataggio del file" + +#: mergeresultwindow.cpp:2778 msgid "Error while writing." -msgstr "Errore di scrittura." - -#: mergeresultwindow.cpp:3091 +msgstr "Errore in scrittura." + +#: mergeresultwindow.cpp:3108 msgid "Output" -msgstr "Output" - -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +msgstr "Uscita" + +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modificato]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codifica per il salvataggio" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Conflitto" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Codec da" @@ -3140,17 +3137,20 @@ #. i18n: ectx: ToolBar (mainToolBar) #: rc.cpp:36 msgid "Main Toolbar" -msgstr "" +msgstr "Barra degli strumenti principale" #: rc.cpp:37 msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Federico Zenith,Marcello Anni,Andrea Celli" #: rc.cpp:38 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "federico.zenith@member.fsf.org" + +#~ msgid "Directory Merge" +#~ msgstr "Fusione di directory" #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" @@ -3165,11 +3165,5 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Mostra/nascondi la barra degli strumenti" -#~ msgid "Printing aborted." -#~ msgstr "Stampa interrotta." - -#~ msgid "Printing completed." -#~ msgstr "Stampa completata." - #~ msgid "Ignored. (User defined.)" #~ msgstr "Ignorato. (definito dall'utente)"
--- a/kdiff3/po/ja/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ja/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-09-23 23:41+0900\n" "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n" "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n" @@ -17,99 +17,99 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "現在の設定:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "設定オプションのエラー:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" "オプション <icode>--auto</icode> を使用していますが、出力ファイルが指定されて" "いません。" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" "オプション <icode>--auto</icode> はディレクトリ比較時には無視されます。" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "保存に失敗しました。" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "以下のファイルを開けませんでした:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "ファイルのオープンエラー" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "比較のために文書を開きます..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "再読み込み" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "マージ結果を保存します。すべての衝突を解決しなければなりません。" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "現在の文書を別名で保存します..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "差異を印刷します" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "アプリケーションを終了します" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "選択範囲を切り取り、クリップボードに格納します" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "選択範囲をコピーし、クリップボードに格納します" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "クリップボードの内容を現在の位置に貼り付けます" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "現在のウィンドウのすべてを選択します" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "文字列を検索します" # StatusTip for FindNext -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "文字列の次のマッチを検索します" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "ステータスバーの表示/非表示を切り替えます" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 を設定..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "現在の異なる部分に移動" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -117,11 +117,11 @@ "現在の\n" "異なる部分" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "最初の異なる部分に移動" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -129,11 +129,11 @@ "最初の\n" "異なる部分" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "最後の異なる部分に移動" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -141,23 +141,23 @@ "最後の\n" "異なる部分" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(ホワイトスペースの表示が無効なときはホワイトスペースの差異をスキップする)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" "(ホワイトスペースの表示が無効なときもホワイトスペースの差異をスキップしない)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "前の異なる部分に移動" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -165,11 +165,11 @@ "前の\n" "異なる部分" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "次の異なる部分に移動" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -177,11 +177,11 @@ "次の\n" "異なる部分" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "前の衝突に移動" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -189,11 +189,11 @@ "前の\n" "衝突" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "次の衝突に移動" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -201,11 +201,11 @@ "次の\n" "衝突" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "前の未解決の衝突に移動" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -213,11 +213,11 @@ "前の\n" "未解決" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "次の未解決の衝突に移動" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -225,11 +225,11 @@ "次の\n" "未解決" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "A からの選択行" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -237,11 +237,11 @@ "選択\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "B からの選択行" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -249,11 +249,11 @@ "選択\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "C からの選択行" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -261,21 +261,21 @@ "選択\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "ソース選択後に自動的に次の未解決の衝突に移動" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" msgstr "自動" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "スペースとタブ文字を表示" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -283,11 +283,11 @@ "ホワイト\n" "スペース文字" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "ホワイトスペースを表示" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -295,189 +295,215 @@ "ホワイト\n" "スペース" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "行番号を表示" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "行番号" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "常に A を選択" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "常に B を選択" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "常に C を選択" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "未解決の衝突について常に A を選択" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "未解決の衝突について常に B を選択" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "未解決の衝突について常に C を選択" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に A を選択" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に B を選択" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に C を選択" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "単純な衝突を自動的に解決" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "異なる部分を衝突として設定" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "正規表現による自動マージを実行" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "履歴の衝突を自動的に解決" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "選択した差異を分離" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "選択した差異を結合" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "ウィンドウ A を表示" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "ウィンドウ B を表示" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "ウィンドウ C を表示" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "次のウィンドウにフォーカス" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "すべて比較 (標準)" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A と B を比較" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A と C を比較" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B と C を比較" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Diff ウィンドウで行を折り返す" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "前のウィンドウにフォーカス" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "分割方向を切り替え" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "ディレクトリ/テキスト分割画面表示" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "ディレクトリ表示/テキスト表示を切り替え" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "準備完了。" -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "マージ結果は保存されていません。" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "警告" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "保存/終了" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "保存せずに終了" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "マージ結果の保存に失敗しました。" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "ディレクトリマージを実行中です。本当に中止しますか？" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "ファイルを保存中..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "名前を付けてファイルを保存中..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "名前を付けて保存..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +#| msgid "Print..." +msgid "Printing..." +msgstr "印刷..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "上部行" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Font" +msgid "Selection" +msgstr "フォントを選択" + +#: kdiff3.cpp:977 +#, fuzzy +#| msgid "Merge operation complete." +msgid "Printing completed." +msgstr "マージ操作が完了しました。" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "終了中..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "ツールバーの表示/非表示を切り替え中..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "ステータスバーの表示/非表示を切り替え中..." @@ -574,28 +600,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "ファイルコピー中にエラー: 書き込みに失敗しました。ファイル名: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "ディレクトリを読み込み中: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "ディレクトリの内容一覧を作成中: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "キャンセル(&C)" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "クリップボードから" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -605,7 +631,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -615,7 +641,7 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -623,7 +649,7 @@ "データ消失エラー:\n" "再現可能であれば、プログラムの作者に連絡してください。\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "深刻な内部エラー" @@ -645,8 +671,8 @@ msgid "C (Optional):" msgstr "C (オプション):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "マージ" @@ -771,7 +797,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "キャンセル" @@ -950,7 +976,7 @@ "オン: すべての選択は直ちにクリップボードに格納されます。\n" "オフ: Ctrl+C などで明示的にコピーする必要があります。" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "改行コード:" @@ -1220,8 +1246,10 @@ "(コマンドラインオプションの <icode>--auto</icode> に類似)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "ディレクトリマージ" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "ディレクトリ(&D)" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1846,7 +1874,7 @@ msgid "file3 to open" msgstr "開く file3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "ファイル" @@ -1858,10 +1886,6 @@ msgid "Line not available" msgstr "行がありません" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "上部行" - #: difftextwindow.cpp:1731 msgid "End" msgstr "最後" @@ -1932,28 +1956,28 @@ msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "すべての入力ファイルはバイナリ的に同じです。" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "ファイル %1 と %2 はバイナリ的に同じです。\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "ファイル %1 と %2 のテキストは同じですが、バイナリ的に等しくありません。\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1963,55 +1987,55 @@ "KDiff3 のマージはバイナリデータでの使用を想定していません。\n" "自己責任で続行してください。" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "中止" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "マージを続行" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "ファイルを開いています..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "ファイルのオープンエラー" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "選択範囲を切り取り..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "選択範囲をクリップボードにコピー..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "クリップボードの内容を挿入..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "保存/続行" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "保存せずに続行" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "検索が完了しました。" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "検索完了" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "ディレクトリ作成中にエラー" @@ -2026,70 +2050,70 @@ "普通これはインストールの問題です。詳細についてはソースパッケージの README " "ファイルを参照してください。" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "リンクと普通のファイルが混在しています。" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "リンク: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "サイズ" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "日付とサイズ: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 の一時コピーの作成に失敗しました。" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1 を開けませんでした。" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "ファイルを比較中..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1 からの読み込みエラー" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "名前" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "状態" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "未解決" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "解決済み" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "ホワイトスペース以外" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "ホワイトスペース" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2097,40 +2121,40 @@ "ディレクトリマージを実行中です。本当にマージを中止し、ディレクトリを再スキャ" "ンしますか？" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "再スキャン" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "ディレクトリを開けませんでした:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" "ディレクトリ A <filename>%1</filename> は存在しないか、ディレクトリではありま" "せん。\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" "ディレクトリ B <filename>%1</filename> は存在しないか、ディレクトリではありま" "せん。\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" "ディレクトリ C <filename>%1</filename> は存在しないか、ディレクトリではありま" "せん。\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "ディレクトリのオープンエラー" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2140,129 +2164,129 @@ "あってはいけません。\n" "続行する前にもう一度確認してください。" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "パラメータ警告" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "ディレクトリをスキャン中..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "ディレクトリ A を読み込み中" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "ディレクトリ B を読み込み中" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "ディレクトリ C を読み込み中" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "いくつかのサブディレクトリが読み込み不可でした" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "サブディレクトリのパーミッションを確認してください。" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "ディレクトリ比較状態" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "サブディレクトリ数:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "等しいファイルの数:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "異なるファイルの数:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "手作業でのマージ数:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "これはすべてのマージ操作に影響します。" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "すべてのマージ操作を更新中" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "処理中" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A を B にコピー" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B を A にコピー" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A を削除" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B を削除" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A と B を削除" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "A にマージ" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "B にマージ" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "A と B にマージ" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "(存在すれば) 削除" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "マージ (手作業)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "エラー: ファイルタイプが衝突しています" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "エラー: 日付は同じですが、ファイルは等しくありません。" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "この操作は今はできません。" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "操作不可" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2276,46 +2300,46 @@ "\n" "再現可能であれば、プログラムの作者に連絡してください。" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "プログラムエラー" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "コピー中にエラーが発生しました。\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "エラー" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "マージエラー" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "エラー" -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "完了" -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "未保存" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "不明なマージ操作 (これは起きてはならないことです)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "不明なマージ操作です。" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2337,19 +2361,19 @@ "このプログラムはまだベータ段階で何が起きても無保証だということに注意してくだ" "さい!重要なデータはバックアップを取ってください!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "マージ開始" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "実行" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "試行" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2357,7 +2381,7 @@ "強調表示された項目は異なるディレクトリの異なるタイプです。何をするか選択して" "ください。" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2365,13 +2389,13 @@ "ファイルの更新日時は同じですが、ファイルは等しくありません。何をするか選択し" "てください。" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "ディレクトリマージ中なのでこの操作を実行することはできません。" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2381,213 +2405,213 @@ "エラーを起した項目について続行しますか？それともスキップしますか？" # @title:window? -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "エラー後のマージ続行" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "最後の項目について続行" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "項目をスキップ" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "スキップしました。" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "進行中..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "マージ操作が完了しました。" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "マージ完了" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "マージ試行完了: この操作をしてもよいか確認してください。" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "エラーが発生しました。詳細情報を見るには<interface>OK</interface>をクリックし" "てください。\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "エラー: %1 の削除中にバックアップファイルを作成できませんでした。" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "再帰的にディレクトリを削除 (%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "削除 (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "エラー: ディレクトリの削除がディレクトリの読み込み中に失敗しました。" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "エラー: ディレクトリの削除 (%1) に失敗しました。" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "エラー: 削除に失敗しました。" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手作業でのマージ (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" "<note label='注'>手作業でのマージ後に続行するには F7 を押してください。</" "note>" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "エラー: コピー (%1 -> %2) に失敗しました。既存のコピー先を削除できませんでし" "た。" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "リンクをコピー (%1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "エラー: リンクのコピーに失敗しました。リモートリンクは未サポートです。" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "エラー: リンクのコピーに失敗しました。" -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "コピー (%1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "名前変更 (%1 -> %2) 中にエラー: 既存のコピー先を削除できません。" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "名前変更 (%1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "エラー: 名前変更に失敗しました。" -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "ディレクトリの作成 (%1) 中にエラーが発生しました。既存のファイルを削除できま" "せん。" -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "ディレクトリを作成 (%1)" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "ディレクトリの作成中にエラーが発生しました。" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "先" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "ディレクトリ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "タイプ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "サイズ" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "最終更新" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "リンク先" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "利用不可" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (先): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (元): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (先): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (先): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "先: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "ディレクトリマージの状態を保存..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "ディレクトリマージを開始/続行" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "現在の項目について操作を実行" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "選択ファイルを比較 " -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "現在のファイルをマージ " -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2595,39 +2619,39 @@ "ファイル\n" "をマージ" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "すべてのサブディレクトリをたたむ" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "すべてのサブディレクトリを展開" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "すべての項目について A を選択" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "すべての項目について B を選択" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "すべての項目について C を選択" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "すべての項目について自動選択" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "すべての項目について操作なし" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "等しいファイルを表示" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2635,15 +2659,15 @@ "等しい\n" "ファイル" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "異なるファイルを表示" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "A にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2651,11 +2675,11 @@ "A にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "B にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2663,11 +2687,11 @@ "B にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "C にのみ存在するファイルを表示" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2675,35 +2699,35 @@ "C にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "明示的に選択したファイルを比較" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "明示的に選択したファイルをマージ" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "何もしない" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A と B を削除" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "A と B にマージ" @@ -2715,11 +2739,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "続行" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "終了" @@ -2953,11 +2977,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<マージ衝突 (ホワイトスペースのみ)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<マージ衝突>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2965,12 +2989,19 @@ "未解決の衝突がまだ残っています。\n" "ファイルは保存されていません。\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "未解決の衝突があります" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -2979,28 +3010,42 @@ "\n" "バックアップファイルの作成に失敗しました。ファイルは保存されていません。" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "ファイルの保存エラー" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "書き込み中にエラーが発生しました。" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "出力" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[更新]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "保存時のエンコーディング" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "衝突" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3037,3 +3082,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "ss@kde.gr.jp,ybando@k6.dion.ne.jp" + +#~ msgid "Directory Merge" +#~ msgstr "ディレクトリマージ"
--- a/kdiff3/po/ka/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ka/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2006-03-28 01:44+0400\n" "Last-Translator: Giasher <giasher@telenet.ge>\n" "Language-Team: <www.gia.ge>\n" @@ -16,100 +16,100 @@ "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "მიმდინარე ელემენტის სინქრონიზაციის ოპერაცია" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" "პარამეტრი --auto გამოყენებულია, მაგრამ გამონატანი ფაილი არაა მითითებული." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "პარამეტრი --auto დირექტორიების შედარებისთვის იგნორირებულია." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "შენახვა ვერ შედგა." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "ამ ფაილების გახსნა ვერ შედგა:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "ხსნის დოკუმენტებს შესადარებლად..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "მზად." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ინახავს შერწყმის შედეგებს. ყველა კონფლიქტი უნდა გადაიჭრას!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "მიმდინარე დოკუმენტს ინახავს როგორც..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "პროგრამის დახურვა" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "ჭრის მონიშნულ სექციას და გაცვლით ბუფერში ათავსებს" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "მონიშნულ სექციის ასლს ქმნის გაცვლით ბუფერში" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "გაცვლის ბუფერის შემადგენლობას სვამს მიმდინარე პოზიციაზე" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "სტრიქონის ძიება" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "სტრიქონის თავიდან ძიება" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "სტატუსის ველს რთავს" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 კონფიგურაცია..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "მიმდინარე დელტაზე გადასვლა" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -117,11 +117,11 @@ "Delta" msgstr "მიმდინარე დელტაზე გადასვლა" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "პირველ დელტაზე გადასვლა" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -129,11 +129,11 @@ "Delta" msgstr "პირველ დელტაზე გადასვლა" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "უკანასკნელ დელტაზე გადასვლა" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -141,21 +141,21 @@ "Delta" msgstr "უკანასკნელ დელტაზე გადასვლა" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "წინა დელტაზე გადასვლა" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -163,11 +163,11 @@ "Delta" msgstr "წინა დელტაზე გადასვლა" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "შემდეგ დელტაზე გადასვლა" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -175,11 +175,11 @@ "Delta" msgstr "შემდეგ დელტაზე გადასვლა" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "წინა კონფლიქტზე გადასვლა" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -187,11 +187,11 @@ "Conflict" msgstr "კონფლიქტები" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "შემდეგ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -199,11 +199,11 @@ "Conflict" msgstr "შემდეგ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "წინა გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -211,11 +211,11 @@ "Unsolved" msgstr "გადაუჭრელი" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "შემდეგ გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -223,72 +223,72 @@ "Unsolved" msgstr "გადაუჭრელი" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "აირჩიეთ ხაზ(ებ)ი A-დან" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "აირჩიეთ ხაზ(ებ)ი B-დან" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "აირჩიეთ ხაზ(ებ)ი C-დან" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "წყაროს არჩევისას ავტომატურად გადასვლა შემდეგ გადაუჭრელ კონფლიკტზე" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "მონიშვნის ავტო ასლი" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "ღარების ჩვენება და ტაბულაციის სიმბოლოების განსხვავებისთვის" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "ხაზების ნომრების ჩვენება" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -296,181 +296,207 @@ "Numbers" msgstr "ხაზების ნომრების ჩვენება" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "ყველგან A-ს არჩევა" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "ყველგან B-ს არჩევა" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "ყველგან C-ს არჩევა" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "A-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "B-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "C-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "კონფლიქტებისთვის დელტას მინიჭება" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "მონიშნული ფაილების შედარება" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "ფანჯარა A-ს ჩვენება " -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "ფანჯარა B-ს ჩვენება" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "ფანჯარა C-ს ჩვენება" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "ფოკუსი შემდეგ ფანჯარაზე" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "ჩვეულებრივი გადახედვა" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A წინააღმდეგ B გადახედვა" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff ფანჯრები" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "ფოკუსი წინა ფანჯარაზე" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "გახლეჩვის ორიენტაციის გადართვა" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "დირექტორიისა და ტექსტი განლაგების ეკრანის ხედი" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "დირექტორიათა და ტექსტის ხედებს შორის გადართვა" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "მზად." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "შერწყმის შედეგები არ იყო შენახული." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "შენახვა და გასვლა" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "გასვლა შენახვის გარეშე" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "შერწყმის შედეგების შენახვა ვერ შედგა." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "თქვენ ახლა დირექტორიათა შერწყმას აკეთებთ. ნამდვილად გსურთ შეწყვეტა?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "ფაილის შენახვა..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "ფაილის ახალი სახელით შენახვა..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "გამოსვლა..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "ზედა ხაზი %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "სხვა შრიფტის ამორჩევა" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "შერწყმის ოპერაცია დასრულდა." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "შერწყმის ოპერაცია დასრულდა." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "გამოსვლა..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "ხელსაწყოთა პანელის გადართვა..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "სტატუსის ზოლის გადართვა..." @@ -570,28 +596,28 @@ msgstr "" "შეცდომა ასლის გაკეთების ოპერაციისას: ჩაწერა ვერ შედგა. ფაილის სახელი: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "დირექტორიის წაკითხვა:" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "დირექტორიის სია: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "ბუფერის მონაცემის დროებით ფაილში ჩაწერა ვერ შედგა." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "გაცვლის ბუფერიდან " -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -606,7 +632,7 @@ "\n" "გაგრძელების ბრძანება ახლა გამოირთვება." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -621,7 +647,7 @@ "\n" "ხაზთა დამთხვევა ახლა გამოირთვება." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -629,7 +655,7 @@ "მონაცემების დაკარგვის შეცდომა:\n" "თუ ეს მეორდება, გთხოვთ დაუკავშირდეთ ავტორს.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "მკაცრი შინაგანი შეცდომა" @@ -651,8 +677,8 @@ msgid "C (Optional):" msgstr "C (არასავალდებულო_:" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "შერწყმა" @@ -775,7 +801,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -959,7 +985,7 @@ "ჩართულია: ნებისმიერი მონიშვნა ჯდება გაცვლის ბუფერში.\n" "გამორთულია: თქვენ ასლი უნდა გააკეთოთ მაგ. Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "ხაზის დასარულის სტილი:" @@ -1212,8 +1238,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "დირექტორიათა შერწყმა" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&დირექტორია" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1835,7 +1863,7 @@ msgid "file3 to open" msgstr "ფაილი3-ის გახსნა" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1853,11 +1881,6 @@ msgid "Line not available" msgstr "ხელმიუწვდომელია" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "ზედა ხაზი %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "დასასრული" @@ -1929,27 +1952,27 @@ msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "ყველა შეტანილი ბაილის ბინარი ტოლია." -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "ყველა შეტანილი ფაილის შეიცავს ერთიდაიგივე ტექსტი." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "B და C ბინარულად ტოლია.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "A და B ბინარულად ტოლია.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1959,55 +1982,55 @@ "გაითვალისწინეთ რომ KDiff3-შერწყმა არ გულისხმობს ბინარულ მონაცემებს.\n" "გააგრძელეთ საკუთარი თავის იმედათ." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "შეწყვეტა" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "შერწყმის გაგრძელება" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "ფაილთა გახსნა..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "ფაილის გახსნის შეცდომა" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "მონიშნული ფრაგმენტის მოჭრა..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "მონიშნულის გაცვლით ბიფერში განთავსება..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "გაცვლის ბუფერის შიგთავსის ჩასმა..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "შენახვა და გაგრძელება" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "შენახვის გარეშე გაგრძელება" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "ძიება დასრულდა." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "ძიება დასრულდა" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "დირექტორიის შექმნისას შეცდომა." @@ -2027,70 +2050,70 @@ "ეს როგორც წესი დაყენების პრობლემების გამო ხდება. გთხოვთ წაიკითხოთ README-" "ფაილი წყაროს პაკეტში დამასტებითი ცნობებისთვის." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "ბმულების და ჩოულებრივი ფაილების ნარევი." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "ბმული: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "ზომა. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "თარიღი და ზომა: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1-ს დროებითი ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1-ს გახსნა ვერ შედგა." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "ფაილების შედარება..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1-ს წაკითხვის შეცდომა" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "სახელი" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "ოპერაცია" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "სტატუსი" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "გადაუჭრელი" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "გადაჭრილი" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "არათეთრი" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "თეთრი" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2098,34 +2121,34 @@ "თქვენ ახლა დირექტორიების შერწყმას ახორციელებთ.დარწმუნებული ხართ რომ გსურთ " "შერწყმის შეწყვეტა და დირექტორიის თავიდან სკანირება?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "თავიდან სკანირება" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "დირექტორიის გახსნა ვერ შედგა:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "დირექტორიის გახსნის შეცდომა" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2135,129 +2158,129 @@ "დირექტორიის შერწყმა.\n" "გაგრძელებამდე კიდევ შეამოწმეთ." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "გაფრთხილების პარამეტრი" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "დირექტორიების სკანირება..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "დირექტორია A-ს წაკითხვა" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "დირექტორია B-ს წაკითხვა" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "დირექტორია C-ს წაკითხვა" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "ზოგიერთი ქვედირექტორიის წაკითხვა ვერ განხორციელდა" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "ქვედირექტორიების უფლებების შემოწმება." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "დირექტორიის შედარების სტატუსი" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "ქვედირექტორიების რაოდენობა:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "ტოლი ფაილების რაოდენობა:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "ხელით შერწყმების რაოდენობა:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "ეს მოსდის ყველა შერწყმის ოპერაციას." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "ყველა შერწყმის ოპერაციების შეცვლა" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "მიმდინარეობა " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "გასაკეთებელი." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A-ს ასლი B-ში" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B-ს ასლი A-ში" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A-ს წაშლა" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B-ს წაშლა" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A და B-ს წაშლა" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "შერწყმა A-სკენ" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "შერწყმა B-სკენ" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "შერწყმა A და B-სკენ" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "წაშლა (თუ არსებობს)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "შერწყმა (ხელით)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "შეცდომა: კონფლიქტურ ფაილთა ტიპები" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "შეცდომა: თარიღები იდენტურია, მარა ფაილები არა." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "ეს ოპერაცია ახლა შეუძლებელია." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "ოპერაცია შეუძლებელია" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2271,48 +2294,48 @@ "\n" "თუ იცით როგორ განახორციალოთ ეს, გთხოვთ დაუკავსირდეთ პროგრამის ავტორს." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "პროგრამის შეცდომა" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "ასლის გაკეთებისას შეცდომა მოხდა.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "შეცდომა." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "შერწმის შეცდომა" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "შეცდომა." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "შესრულებულია." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "არაა შენახული." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "შერწყმის უცნობი ოპერაცია. (ეს არასდროს არ უნდა მომხდარიყო!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "შერწყმის უცნობი ოპერაცია." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2331,40 +2354,40 @@ "გაითვალისწინეთ ეს პროგრამა ჯერ კიდევ ბეტაა და არანაერი გარანტია არ არსებობს! " "სასიცოცხლო მნიშვნელობის მონაცემების სარეზერვო ასლები გააკეთეთ!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "შერწყმის დაწყება" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "გააკეთე" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "სიმულაცია" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "მარკირებული ელემენტი სხვადასხვა დირექტორიებში სხვადასხვაა. აირჩიეთ რა ქნათ." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "ფაილის მოდიფიკაციის თარიღები იდენტურია მარა ფაილები არა. აირჩიეთ რა გააკეთოთ." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "ოპერაცია ახლა შეუძლებელია, რადგან დირექტორიათა შერწყმა უკვე გაშვებულია." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2374,215 +2397,215 @@ "გსურთ ამ ელემენტით გაგრძელება, რომლის გამოც გდება შეცდომა, თუ გსურთ " "გადაახტეთ მას?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "შეცდომის შემდეგ შერწმის გაგრძელება" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "უკანასკნელი ელემენტით გაგრძელება" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "ელემენტის გაცდენა" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "გაცდენილია." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "მიმდინარეობს..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "შერწყმის ოპერაცია დასრულდა." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "შერწყმა დასრულდა" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "შერწყმის სიმულაცია დასრულდა: შეამოწმეთ თუ ეთანხმებით შემოთავაზებულ " "ოპერაციებს." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "შეცდომა მოხდა. დააწკაპუნეთ OK დეტალური ცნობების სანახავად.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "შეცდომა: %1-ს წასლის დროს: სარეზერვო ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "დირექტორიის რეკურსიულად წაშლა( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "წაშლა( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "შეცდომა: დირექტორიის წაშლის ოპერაცია ვერ შედგა წაკითხვის მცდელობისას." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "შეცდომა: rmdir( %1 ) ოპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "შეცდომა: წაშლის ოპპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ხელით შერწყმა( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " გაითვალისწინეთ: ხელით შერწყმის შემდეგ მომხმარებელმა უნდა გააგრძელოს F7-" "ის დაჭერით." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "შეცდომა: ასლი( %1 -> %2 ) ვერ შედგა.არსებული დანიშნულების ფაილის წაშლა ვერ " "შედგა." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "შეცდომა copyLink ვერ შედგა: დაშორებული ბმულები ჯერ არ არის მხარდაჭერილი." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "შეცდომა: copyLink ვერ შედგა." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "ასლი( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "შეცდომა სახელის გადარქმევისას( %1 -> %2 ): არსებული დანიშნულების წაშლა " "შეუძლებელია." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "შეცდომა: სახელის გადარქმევა ვერ შედგა." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "შეცდომა %1-ს makeDir-ის დროს. არსებული ფაილის წაშლა შეუძლებელია," -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "დირექტორიის შექმნისას შეცდომა." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "ტიპი" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "ზომა" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "უკანასკნელად ჩასწორებულია" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "ბმულის დანიშნულება" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "ხელმიუწვდომელია" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (ფუძე): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest:" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "დირექტორიათა შერწყმა" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "დირექტორიის შერწყმის დაწყება/გაგრძელება" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "მიმდინარე ელემენტიდან ოპერაციის გაშვება" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "მიმდინარე ფაილის შერწყმა" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2590,110 +2613,110 @@ "File" msgstr "შერწყმა" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "ყველა ქვედირექტორიის ჩაკეცვა" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "ყველა ქვედირექტორიის არჩაკეცვა" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "A -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "B -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "C -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "ყველა ელემენტების ოპერაციების ავტო-არჩევა" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "ყველა ელემენტისთვის არავითარი ოპერაცია" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "არაფრის არ გაკეთება" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A და B წაშლა" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "შერწყმა A და B-სკენ" @@ -2705,13 +2728,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&გაგრძელება" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2975,11 +2998,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Merge Conflict (Whitespace only)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Merge Conflict>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2987,12 +3010,19 @@ "ყველა კონფლიქტი ჯერ არაა გადაჭრილი.\n" "ფაილი არაა შენახული.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "დარჩენილი კონფლიქტები" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3001,29 +3031,43 @@ "\n" "სარეზერვო ასლის შექმნა ვერ შედგა. ფაილი არაა შენახული." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "ფაილის შენახვის შეცდომა" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "ჩაწერისას შეცდომა." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "გამონატანი" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[ჩასწორებულია]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "ფაილის კოდირება C-თვის:" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "კონფლიქტები" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3061,6 +3105,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "დირექტორიათა შერწყმა" + #~ msgid "C&ontinue" #~ msgstr "&გაგრძელება" @@ -3077,10 +3124,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "ხელსაწყოთა პანელს რთავს" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "შერწყმის ოპერაცია დასრულდა." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "A და B ბინარულად ტოლია.\n"
--- a/kdiff3/po/lt/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/lt/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: ziogelis 77\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2005-02-23 01:27+0100\n" -"Last-Translator: Automatically generated\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-30 23:13+0300\n" +"Last-Translator: Andrius Štikonas <stikonas@gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,39 +15,39 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" -msgstr "" - -#: kdiff3.cpp:172 +msgstr "Dabartinė konfigūracija:" + +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." -msgstr "" - -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +msgstr "Išsaugojimas nepavyko." + +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" -msgstr "" - -#: kdiff3.cpp:474 +msgstr "Failo atvėrimo klaida" + +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy msgid "Reload" msgstr "" @@ -82,19 +82,19 @@ "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 #, fuzzy msgid "Quits the application" msgstr "" @@ -111,332 +111,342 @@ "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Baigs programos darbą" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iškirps pažymėtą sritį ir padės į talpyklą" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Nukopijuos pažymėtą sritį į talpyklą" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Padės talpyklės turinį dabartinėje pozicijoje" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Įjungs arba išjungs būsenos juostą" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." -msgstr "" - -#: kdiff3.cpp:527 +msgstr "Konfigūruoti KDiff3..." + +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" -msgstr "" - -#: kdiff3.cpp:539 +msgstr "Eiti į ankstesnį konfliktą" + +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" msgstr "" - -#: kdiff3.cpp:541 +"Ankstesnis\n" +"konfliktas" + +#: kdiff3.cpp:544 msgid "Go to Next Conflict" -msgstr "" - -#: kdiff3.cpp:541 +msgstr "Eiti į kitą konfliktą" + +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "" - -#: kdiff3.cpp:543 +"Kitas\n" +"konfliktas" + +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" - -#: kdiff3.cpp:548 +"Pasirinkti\n" +"A" + +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" - -#: kdiff3.cpp:549 +"Pasirinkti\n" +"B" + +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" - -#: kdiff3.cpp:550 +"Pasirinkti\n" +"C" + +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "Iškerpamas žymėjimas..." -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 #, fuzzy msgid "Ready." msgstr "" @@ -471,48 +481,37 @@ "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" -msgstr "" - -#: kdiff3.cpp:651 +msgstr "Dėmesio" + +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 -#, fuzzy +#: kdiff3.cpp:699 msgid "Saving file..." -msgstr "" -"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" -"Išsaugoma byla...\n" -"#-#-#-#-# kwordquiz.po (kwordquiz) #-#-#-#-#\n" -"Išsaugojama byla...\n" -"#-#-#-#-# kverbos.po (kverbos) #-#-#-#-#\n" -"Išsaugojama byla...\n" -"#-#-#-#-# ksync.po (ksync) #-#-#-#-#\n" -"Išsaugojama byla...\n" -"#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" -"Išsaugojama byla..." - -#: kdiff3.cpp:713 +msgstr "Išsaugomas failas..." + +#: kdiff3.cpp:716 #, fuzzy msgid "Saving file with a new filename..." msgstr "" @@ -527,19 +526,39 @@ "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Išsaugojama byla nauju vardu..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." -msgstr "" - -#: kdiff3.cpp:974 +msgstr "Įrašyti kaip..." + +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Spausdinama..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Viršutinė eilutė" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Pažymėjimas" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Spausdinimas baigtas." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Spausdinimas nutrauktas." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Išeinama..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Perjungti būsenos juostą..." @@ -563,46 +582,46 @@ #: fileaccess.cpp:686 #, kde-format msgid "Reading file: %1" -msgstr "" +msgstr "Skaitomas failas: %1" #: fileaccess.cpp:723 #, kde-format msgid "Writing file: %1" -msgstr "" +msgstr "Rašomas failas: %1" #: fileaccess.cpp:751 msgid "Out of memory" -msgstr "" +msgstr "Nepakanka atminties" #: fileaccess.cpp:786 #, kde-format msgid "Making directory: %1" -msgstr "" +msgstr "Kuriamas aplankas: %1" #: fileaccess.cpp:806 #, kde-format msgid "Removing directory: %1" -msgstr "" +msgstr "Šalinamas aplankas: %1" #: fileaccess.cpp:821 #, kde-format msgid "Removing file: %1" -msgstr "" +msgstr "Šalinamas failas: %1" #: fileaccess.cpp:837 #, kde-format msgid "Creating symbolic link: %1 -> %2" -msgstr "" +msgstr "Kuriama simbolinė nuoroda: %1 -> %2" #: fileaccess.cpp:864 #, kde-format msgid "Renaming file: %1 -> %2" -msgstr "" +msgstr "Pervadinamas failas: %1 -> %2" #: fileaccess.cpp:897 #, kde-format msgid "Copying file: %1 -> %2" -msgstr "" +msgstr "Kopijuojamas failas: %1 -> %2" #: fileaccess.cpp:911 #, kde-format @@ -628,28 +647,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " -msgstr "" - -#: fileaccess.cpp:1361 +msgstr "Skaitomas aplankas:" + +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" -msgstr "" - -#: diff.cpp:250 +msgstr "&Atšaukti" + +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -659,7 +678,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -669,13 +688,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "" @@ -686,7 +705,7 @@ #: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99 #: smalldialogs.cpp:142 msgid "File..." -msgstr "" +msgstr "Failas..." #: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101 #: smalldialogs.cpp:144 @@ -697,10 +716,10 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" -msgstr "" +msgstr "Apjungti" #: smalldialogs.cpp:116 msgid "Swap/Copy Names ..." @@ -726,45 +745,12 @@ msgstr "" #: smalldialogs.cpp:168 -#, fuzzy msgid "Configure..." -msgstr "" -"#-#-#-#-# kxkb.po (kxkb) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kxsldbg.po (kxsldbg) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kplato.po (kplato) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdehighscores.po (libkdehighscores) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kwin4.po (kwin4) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdegames.po (libkdegames) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmkamera.po (kcmkamera) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kpilot.po (kpilot) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# uachangerplugin.po (uachangerplugin) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katemake.po (katemake) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" -"Derinti..." +msgstr "Konfigūruoti..." #: smalldialogs.cpp:174 msgid "&OK" -msgstr "" +msgstr "&Gerai" #: smalldialogs.cpp:362 msgid "Search text:" @@ -863,12 +849,12 @@ #: smalldialogs.cpp:510 msgid "OK" -msgstr "" - -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +msgstr "Gerai" + +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" -msgstr "" +msgstr "Atšaukti" #: smalldialogs.cpp:554 smalldialogs.cpp:564 smalldialogs.cpp:585 msgid "Match success." @@ -887,19 +873,8 @@ msgstr "" #: optiondialog.cpp:368 -#, fuzzy msgid "Unicode" -msgstr "" -"#-#-#-#-# kcmkonsole.po (kcmkonsole) #-#-#-#-#\n" -"Unikodinis\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" -"Unikodas\n" -"#-#-#-#-# kofficefilters.po (kofficefilters) #-#-#-#-#\n" -"Unikodas\n" -"#-#-#-#-# kmouth.po (kmouth) #-#-#-#-#\n" -"Unikodas\n" -"#-#-#-#-# kaddressbook.po (kaddressbook) #-#-#-#-#\n" -"Unikodas" +msgstr "Unikodas" #: optiondialog.cpp:369 msgid "Latin1" @@ -910,45 +885,12 @@ msgstr "" #: optiondialog.cpp:465 -#, fuzzy msgid "Configure" -msgstr "" -"#-#-#-#-# kxkb.po (kxkb) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kxsldbg.po (kxsldbg) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kplato.po (kplato) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdehighscores.po (libkdehighscores) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kwin4.po (kwin4) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdegames.po (libkdegames) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmkamera.po (kcmkamera) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kpilot.po (kpilot) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# uachangerplugin.po (uachangerplugin) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katemake.po (katemake) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" -"Derinti..." +msgstr "Konfigūruoti" #: optiondialog.cpp:531 msgid "Font" -msgstr "" +msgstr "Šriftas" #: optiondialog.cpp:532 msgid "Editor & Diff Output Font" @@ -970,22 +912,15 @@ #: optiondialog.cpp:569 msgid "Colors Settings" -msgstr "" +msgstr "Spalvų nustatymai" #: optiondialog.cpp:588 msgid "Editor and Diff Views:" msgstr "" #: optiondialog.cpp:596 -#, fuzzy msgid "Foreground color:" -msgstr "" -"#-#-#-#-# clockapplet.po (clockapplet) #-#-#-#-#\n" -"Priekinio plano spalva:\n" -"#-#-#-#-# ksysguard.po (ksysguard) #-#-#-#-#\n" -"Teksto spalva:\n" -"#-#-#-#-# ffrs.po (ffrs) #-#-#-#-#\n" -"Priekinio plano spalva:" +msgstr "Priekinio plano spalva:" #: optiondialog.cpp:603 msgid "Background color:" @@ -997,19 +932,19 @@ #: optiondialog.cpp:620 msgid "Color A:" -msgstr "" +msgstr "Spalva A:" #: optiondialog.cpp:628 msgid "Color B:" -msgstr "" +msgstr "Spalva B:" #: optiondialog.cpp:636 msgid "Color C:" -msgstr "" +msgstr "Spalva C:" #: optiondialog.cpp:643 msgid "Conflict color:" -msgstr "" +msgstr "Konflikto spalva:" #: optiondialog.cpp:651 msgid "Current range background color:" @@ -1089,9 +1024,9 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" -msgstr "" +msgstr "Eilutės pabaigos stilius:" #: optiondialog.cpp:776 msgid "" @@ -1113,7 +1048,7 @@ #: optiondialog.cpp:815 msgid "Ignore numbers" -msgstr "" +msgstr "Ignoruoti skaičius" #: optiondialog.cpp:818 msgid "" @@ -1124,7 +1059,7 @@ #: optiondialog.cpp:823 msgid "Ignore C/C++ comments" -msgstr "" +msgstr "Ignoruoti C/C++ komentarus" #: optiondialog.cpp:825 msgid "Treat C/C++ comments like white space." @@ -1327,8 +1262,8 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +msgid "Directory" +msgstr "Aplankas" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1487,7 +1422,7 @@ #: optiondialog.cpp:1203 msgid "Synchronize directories" -msgstr "" +msgstr "Sinchronizuoti aplankus" #: optiondialog.cpp:1206 msgid "" @@ -1688,7 +1623,7 @@ #: main.cpp:187 msgid "kdiff3" -msgstr "" +msgstr "kdiff3" #: main.cpp:189 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1696,15 +1631,15 @@ #: main.cpp:190 msgid "(c) 2002-2008 Joachim Eibl" -msgstr "" +msgstr "(c) 2002-2008 Joachim Eibl" #: main.cpp:197 kdiff3_part.cpp:303 msgid "Joachim Eibl" -msgstr "" +msgstr "Joachim Eibl" #: main.cpp:198 msgid "Eike Sauer" -msgstr "" +msgstr "Eike Sauer" #: main.cpp:198 msgid "Bugfixes, Debian package maintainer" @@ -1712,7 +1647,7 @@ #: main.cpp:199 msgid "Sebastien Fricker" -msgstr "" +msgstr "Sebastien Fricker" #: main.cpp:199 msgid "Windows installer" @@ -1720,7 +1655,7 @@ #: main.cpp:200 msgid "Stephan Binner" -msgstr "" +msgstr "Stephan Binner" #: main.cpp:200 msgid "i18n-help" @@ -1728,7 +1663,7 @@ #: main.cpp:201 msgid "Stefan Partheymueller" -msgstr "" +msgstr "Stefan Partheymueller" #: main.cpp:201 msgid "Clipboard-patch" @@ -1736,7 +1671,7 @@ #: main.cpp:202 msgid "David Faure" -msgstr "" +msgstr "David Faure" #: main.cpp:202 msgid "KIO-Help" @@ -1744,7 +1679,7 @@ #: main.cpp:203 msgid "Bernd Gehrmann" -msgstr "" +msgstr "Bernd Gehrmann" #: main.cpp:203 msgid "Class CvsIgnoreList from Cervisia" @@ -1752,7 +1687,7 @@ #: main.cpp:204 msgid "Andre Woebbeking" -msgstr "" +msgstr "Andre Woebbeking" #: main.cpp:204 msgid "Class StringMatcher" @@ -1760,7 +1695,7 @@ #: main.cpp:205 msgid "Michael Denio" -msgstr "" +msgstr "Michael Denio" #: main.cpp:205 msgid "Directory Equality-Coloring patch" @@ -1768,7 +1703,7 @@ #: main.cpp:206 msgid "Manfred Koehler" -msgstr "" +msgstr "Manfred Koehler" #: main.cpp:206 msgid "Fix for slow startup on Windows" @@ -1776,7 +1711,7 @@ #: main.cpp:207 msgid "Sergey Zorin" -msgstr "" +msgstr "Sergey Zorin" #: main.cpp:207 msgid "Diff Ext for Windows" @@ -1784,7 +1719,7 @@ #: main.cpp:208 msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" -msgstr "" +msgstr "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower" #: main.cpp:208 msgid "GNU-Diffutils" @@ -1792,7 +1727,7 @@ #: main.cpp:209 msgid "Tino Boellsterling, Timothy Mee" -msgstr "" +msgstr "Tino Boellsterling, Timothy Mee" #: main.cpp:209 msgid "Intensive test, use and feedback" @@ -1800,15 +1735,15 @@ #: main.cpp:210 msgid "Michael Schmidt" -msgstr "" +msgstr "Michael Schmidt" #: main.cpp:210 msgid "Mac support" -msgstr "" +msgstr "Mac palaikymas" #: main.cpp:211 msgid "Valentin Rusu" -msgstr "" +msgstr "Valentin Rusu" #: main.cpp:211 main.cpp:212 #, fuzzy @@ -1817,7 +1752,7 @@ #: main.cpp:212 msgid "Albert Astals Cid" -msgstr "" +msgstr "Albert Astals Cid" #: main.cpp:214 msgid "+ Many thanks to those who reported bugs and contributed ideas!" @@ -1889,23 +1824,18 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" -msgstr "" +msgstr "Failas" #: difftextwindow.cpp:390 -#, fuzzy msgid "Line" -msgstr "Latin1" +msgstr "Eilutė" #: difftextwindow.cpp:392 msgid "Line not available" msgstr "" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Pab" @@ -1973,81 +1903,81 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Nutraukti" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." -msgstr "" - -#: pdiff.cpp:1089 pdiff.cpp:1160 +msgstr "Atveriami failai..." + +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Klaida atveriant bylą" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Iškerpamas žymėjimas..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Kopijuojama pažymėtą vietą į talpyklę..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Įterpamas talpyklės turinys..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -2058,42 +1988,42 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " -msgstr "" - -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +msgstr "Dydis. " + +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 #, fuzzy msgid "Name" msgstr "" @@ -2216,232 +2146,193 @@ "#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n" "Vardas" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:376 -#, fuzzy +#: directorymergewindow.cpp:358 msgid "Status" -msgstr "" -"#-#-#-#-# kdmchooser.po (kdmchooser) #-#-#-#-#\n" -"Statusas\n" -"#-#-#-#-# kdmgreet.po (kdmgreet) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# khelpcenter.po (khelpcenter) #-#-#-#-#\n" -"Būvis\n" -"#-#-#-#-# kcminfo.po (kcminfo) #-#-#-#-#\n" -"Statusas\n" -"#-#-#-#-# konqueror.po (konqueror) #-#-#-#-#\n" -"Būvis\n" -"#-#-#-#-# kcmkded.po (kcmkded) #-#-#-#-#\n" -"Būvis\n" -"#-#-#-#-# ksysguard.po (ksysguard) #-#-#-#-#\n" -"Būklė\n" -"#-#-#-#-# ktorrent.po (ktorrent) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kbackgammon.po (kbackgammon) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kstars.po (kstars) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# libkdepim.po (libkdepim) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# korganizer.po (korganizer) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# akregator.po (akregator) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kmail.po (kmail) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kbabel.po (kbabel) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# kpf.po (kpf) #-#-#-#-#\n" -"Būsena\n" -"#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n" -"Būsena" - -#: directorymergewindow.cpp:377 +msgstr "Būsena" + +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2450,47 +2341,46 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 -#, fuzzy +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" -msgstr "Klaida." - -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +msgstr "Klaida" + +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Klaida." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Baigta." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2502,349 +2392,348 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" +#: directorymergewindow.cpp:2544 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2570 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#: directorymergewindow.cpp:2576 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "" + +#: directorymergewindow.cpp:2585 +msgid "Error: Rename failed." +msgstr "" + +#: directorymergewindow.cpp:2603 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + #: directorymergewindow.cpp:2619 #, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2645 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#: directorymergewindow.cpp:2651 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2660 -msgid "Error: Rename failed." -msgstr "" - -#: directorymergewindow.cpp:2678 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#: directorymergewindow.cpp:2694 -#, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipas" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Dydis" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 -#, fuzzy +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" -msgstr "Nieko" - -#: directorymergewindow.cpp:3008 +msgstr "Nieko nedaryti" + +#: directorymergewindow.cpp:2969 msgid "A" -msgstr "" - -#: directorymergewindow.cpp:3009 +msgstr "A" + +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" -msgstr "" - -#: directorymergewindow.cpp:3022 +msgstr "Trinti A ir B" + +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2856,23 +2745,21 @@ msgid "KDiff3Part" msgstr "" -#: kreplacements/kreplacements.h:102 -#, fuzzy -#| msgid "C&ontinue" +#: kreplacements/kreplacements.h:103 msgid "Continue" -msgstr "&Tęsti" - -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +msgstr "Tęsti" + +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" -msgstr "" +msgstr "Išjungti" #: kreplacements/kreplacements.cpp:183 kreplacements/kreplacements.cpp:345 msgid "Ok" -msgstr "" +msgstr "Gerai" #: kreplacements/kreplacements.cpp:187 kreplacements/kreplacements.cpp:721 msgid "Help" -msgstr "" +msgstr "Pagalba" #: kreplacements/kreplacements.cpp:191 msgid "Defaults" @@ -2882,18 +2769,17 @@ #. i18n: ectx: Menu (file) #: kreplacements/kreplacements.cpp:302 rc.cpp:12 msgid "&File" -msgstr "" +msgstr "&Failas" #: kreplacements/kreplacements.cpp:303 -#, fuzzy msgid "&Edit" -msgstr "Redaktorius" +msgstr "&Keisti" #. i18n: file: kdiff3_shell.rc:7 #. i18n: ectx: Menu (directory) #: kreplacements/kreplacements.cpp:304 rc.cpp:15 msgid "&Directory" -msgstr "" +msgstr "&Aplankas" #. i18n: file: kdiff3_shell.rc:50 #. i18n: ectx: Menu (movement) @@ -2921,20 +2807,19 @@ #: kreplacements/kreplacements.cpp:311 msgid "&Settings" -msgstr "" +msgstr "&Nustatymai" #: kreplacements/kreplacements.cpp:312 msgid "&Help" -msgstr "" +msgstr "&Pagalba" #: kreplacements/kreplacements.cpp:359 -#, fuzzy msgid "&About" -msgstr "Nutraukti" +msgstr "&Apie" #: kreplacements/kreplacements.cpp:375 msgid "A&uthor" -msgstr "" +msgstr "A&utorius" #: kreplacements/kreplacements.cpp:389 msgid "&Thanks To" @@ -2955,96 +2840,61 @@ msgstr "" #: kreplacements/kreplacements.cpp:603 -#, fuzzy msgid "Open" -msgstr "Operacija" +msgstr "Atverti" #: kreplacements/kreplacements.cpp:612 msgid "Save" -msgstr "" +msgstr "Išsaugoti" #: kreplacements/kreplacements.cpp:629 -#, fuzzy msgid "Print..." -msgstr "Išeinama..." +msgstr "Spausdinti..." #: kreplacements/kreplacements.cpp:645 msgid "Cut" -msgstr "" +msgstr "Iškirpti" #: kreplacements/kreplacements.cpp:653 msgid "Copy" -msgstr "" +msgstr "Kopijuoti" #: kreplacements/kreplacements.cpp:661 msgid "Paste" -msgstr "" +msgstr "Padėti" #: kreplacements/kreplacements.cpp:669 msgid "Select All" -msgstr "" +msgstr "Pažymėti viską" #: kreplacements/kreplacements.cpp:677 msgid "Show Toolbar" -msgstr "" +msgstr "Rodyti įrankių juostą" #: kreplacements/kreplacements.cpp:685 msgid "Show &Statusbar" msgstr "" #: kreplacements/kreplacements.cpp:693 -#, fuzzy, kde-format +#, kde-format msgid "&Configure %1..." -msgstr "" -"#-#-#-#-# kxkb.po (kxkb) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kxsldbg.po (kxsldbg) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kplato.po (kplato) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdehighscores.po (libkdehighscores) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kwin4.po (kwin4) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdegames.po (libkdegames) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmkamera.po (kcmkamera) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kpilot.po (kpilot) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# uachangerplugin.po (uachangerplugin) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katemake.po (katemake) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" -"Derinti..." +msgstr "&Konfigūruoti %1..." #: kreplacements/kreplacements.cpp:705 kreplacements/kreplacements.cpp:713 -#, fuzzy msgid "About" -msgstr "Nutraukti" +msgstr "Apie" #: kreplacements/kreplacements.cpp:728 msgid "Find" -msgstr "" +msgstr "Rasti" #: kreplacements/kreplacements.cpp:736 msgid "Find Next" -msgstr "" +msgstr "Rasti kitą" #: kreplacements/kreplacements.cpp:756 msgid "Select Font" -msgstr "" +msgstr "Pasirinkite šriftą" #: kreplacements/kreplacements.cpp:798 msgid "Incompatible font." @@ -3068,12 +2918,11 @@ #: kreplacements/kreplacements.cpp:1141 msgid "Ignore" -msgstr "" +msgstr "Ignoruoti" #: kreplacements/kreplacements.cpp:1141 -#, fuzzy msgid "Exit" -msgstr "Redaktorius" +msgstr "Išeiti" #: mergeresultwindow.cpp:152 mergeresultwindow.cpp:970 #: mergeresultwindow.cpp:984 mergeresultwindow.cpp:996 @@ -3116,7 +2965,7 @@ #: mergeresultwindow.cpp:847 msgid "Conflicts" -msgstr "" +msgstr "Konfliktai" #: mergeresultwindow.cpp:1714 msgid "<No src line>" @@ -3126,54 +2975,68 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" -msgstr "" - -#: mergeresultwindow.cpp:2761 +msgstr "Failo išsaugojimo klaida" + +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 -#, fuzzy +#: mergeresultwindow.cpp:3108 msgid "Output" -msgstr "" -"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n" -"Išvedimas\n" -"#-#-#-#-# kbabel.po (kbabel) #-#-#-#-#\n" -"Išvestis" - -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +msgstr "Išvestis" + +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Konfliktas" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3181,35 +3044,35 @@ #. i18n: ectx: Menu (movement) #: rc.cpp:3 msgid "&KDiff3" -msgstr "" +msgstr "&KDiff3" #. i18n: file: kdiff3_part.rc:13 #. i18n: ectx: Menu (movement) #: rc.cpp:6 msgid "Configure KDiff3" -msgstr "" +msgstr "Konfigūruoti KDiff3" #. i18n: file: kdiff3_part.rc:16 #. i18n: ectx: ToolBar (mainToolBar) #: rc.cpp:9 msgid "KDiff3" -msgstr "" +msgstr "KDiff3" #. i18n: file: kdiff3_shell.rc:106 #. i18n: ectx: ToolBar (mainToolBar) #: rc.cpp:36 msgid "Main Toolbar" -msgstr "" +msgstr "Pagrindinė įrankių juosta" #: rc.cpp:37 msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Andrius Štikonas" #: rc.cpp:38 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "stikonas@gmail.com" #~ msgid "C&ontinue" #~ msgstr "&Tęsti"
--- a/kdiff3/po/nb/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/nb/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-07 11:24+0100\n" "PO-Revision-Date: 2008-10-10 13:32+0200\n" "Last-Translator: Bjorn Steensrud <bsteensr@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -18,95 +18,95 @@ "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Gjeldende oppsett:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Feil i oppsett:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "--auto brukt, men ingen utdatafil er oppgitt." -#: kdiff3.cpp:366 +#: kdiff3.cpp:368 msgid "Option --auto ignored for directory comparison." msgstr "--auto ignorert for mappesammelikning." -#: kdiff3.cpp:402 +#: kdiff3.cpp:404 msgid "Saving failed." msgstr "Lagring mislyktes." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:439 pdiff.cpp:1082 pdiff.cpp:1153 msgid "Opening of these files failed:" msgstr "Klarte ikke åpne disse filene:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:448 msgid "File Open Error" msgstr "Feil ved åpning av fil" -#: kdiff3.cpp:474 +#: kdiff3.cpp:476 msgid "Opens documents for comparison..." msgstr "Åpner dokumentere for sammenlikning …" -#: kdiff3.cpp:476 +#: kdiff3.cpp:478 msgid "Reload" msgstr "Last på nytt" -#: kdiff3.cpp:479 +#: kdiff3.cpp:481 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:483 msgid "Saves the current document as..." msgstr "Lagrer gjeldende dokument som …" -#: kdiff3.cpp:483 +#: kdiff3.cpp:485 msgid "Print the differences" msgstr "Skriv ut forskjellene" -#: kdiff3.cpp:485 +#: kdiff3.cpp:487 msgid "Quits the application" msgstr "Avslutter programmet" -#: kdiff3.cpp:487 +#: kdiff3.cpp:489 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut det markerte og legger det på utklippstavla" -#: kdiff3.cpp:489 +#: kdiff3.cpp:491 msgid "Copies the selected section to the clipboard" msgstr "Kopierer det markerte til utklippstavla" -#: kdiff3.cpp:491 +#: kdiff3.cpp:493 msgid "Pastes the clipboard contents to actual position" msgstr "Limer innholdet inn der markøren står" -#: kdiff3.cpp:493 +#: kdiff3.cpp:495 msgid "Select everything in current window" msgstr "Velg alt i gjeldende vindu" -#: kdiff3.cpp:495 +#: kdiff3.cpp:497 msgid "Search for a string" msgstr "Søk etter en streng" -#: kdiff3.cpp:497 +#: kdiff3.cpp:499 msgid "Search again for the string" msgstr "Søk igjen etter strengen" -#: kdiff3.cpp:502 +#: kdiff3.cpp:504 msgid "Enables/disables the statusbar" msgstr "Slår statuslinja av/på" -#: kdiff3.cpp:506 +#: kdiff3.cpp:508 msgid "Configure KDiff3..." msgstr "Sett opp KDiff3 …" -#: kdiff3.cpp:527 +#: kdiff3.cpp:529 msgid "Go to Current Delta" msgstr "Gå til gjeldende Delta" -#: kdiff3.cpp:527 +#: kdiff3.cpp:529 msgid "" "Current\n" "Delta" @@ -114,11 +114,11 @@ "Gjeldende\n" "Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:531 msgid "Go to First Delta" msgstr "Gå til første Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:531 msgid "" "First\n" "Delta" @@ -126,11 +126,11 @@ "Første\n" "Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:533 msgid "Go to Last Delta" msgstr "Gå til siste Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:533 msgid "" "Last\n" "Delta" @@ -138,22 +138,22 @@ "Siste\n" "Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:535 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Hopper over forskjeller i tomrom når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:536 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:537 msgid "Go to Previous Delta" msgstr "Gå til forrige Delta" -#: kdiff3.cpp:535 +#: kdiff3.cpp:537 msgid "" "Prev\n" "Delta" @@ -161,11 +161,11 @@ "Forrige\n" "Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:539 msgid "Go to Next Delta" msgstr "Gå til neste Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:539 msgid "" "Next\n" "Delta" @@ -173,11 +173,11 @@ "Neste\n" "Delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:541 msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:539 +#: kdiff3.cpp:541 msgid "" "Prev\n" "Conflict" @@ -185,11 +185,11 @@ "Forrige\n" "lonflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:543 msgid "Go to Next Conflict" msgstr "Gå til neste konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:543 msgid "" "Next\n" "Conflict" @@ -197,11 +197,11 @@ "Neste\n" "konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:545 msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:545 msgid "" "Prev\n" "Unsolved" @@ -209,11 +209,11 @@ "Forrige\n" "uløste" -#: kdiff3.cpp:545 +#: kdiff3.cpp:547 msgid "Go to Next Unsolved Conflict" msgstr "Gå til neste uløste konflikt" -#: kdiff3.cpp:545 +#: kdiff3.cpp:547 msgid "" "Next\n" "Unsolved" @@ -221,11 +221,11 @@ "Neste\n" "uløste" -#: kdiff3.cpp:547 +#: kdiff3.cpp:549 msgid "Select Line(s) From A" msgstr "Velg linje(r) fra A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:549 msgid "" "Choose\n" "A" @@ -233,11 +233,11 @@ "Velg\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:550 msgid "Select Line(s) From B" msgstr "Velg linje(r) fra B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:550 msgid "" "Choose\n" "B" @@ -245,11 +245,11 @@ "Velg\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:551 msgid "Select Line(s) From C" msgstr "Velg linje(r) fra C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:551 msgid "" "Choose\n" "C" @@ -257,11 +257,11 @@ "Velg\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:552 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatisk til neste uløste konflikt etter at kildene er valgt" -#: kdiff3.cpp:550 +#: kdiff3.cpp:552 msgid "" "Auto\n" "Next" @@ -269,11 +269,11 @@ "Auto\n" "neste" -#: kdiff3.cpp:552 +#: kdiff3.cpp:554 msgid "Show Space && Tabulator Characters for Differences" msgstr "Vis mellomrom og tabulatortegn for forskjeller" -#: kdiff3.cpp:552 +#: kdiff3.cpp:554 msgid "" "White\n" "Characters" @@ -281,11 +281,11 @@ "Tomroms\n" "tegn" -#: kdiff3.cpp:553 +#: kdiff3.cpp:555 msgid "Show White Space" msgstr "Vis tomrom" -#: kdiff3.cpp:553 +#: kdiff3.cpp:555 msgid "" "White\n" "Deltas" @@ -293,11 +293,11 @@ "Tomroms\n" "deltaer" -#: kdiff3.cpp:555 +#: kdiff3.cpp:557 msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:555 +#: kdiff3.cpp:557 msgid "" "Line\n" "Numbers" @@ -305,179 +305,203 @@ "Linje\n" "numre" -#: kdiff3.cpp:556 +#: kdiff3.cpp:558 msgid "Choose A Everywhere" msgstr "Velg A overalt" -#: kdiff3.cpp:557 +#: kdiff3.cpp:559 msgid "Choose B Everywhere" msgstr "Velg B overalt" -#: kdiff3.cpp:558 +#: kdiff3.cpp:560 msgid "Choose C Everywhere" msgstr "Velg C overalt" -#: kdiff3.cpp:559 +#: kdiff3.cpp:561 msgid "Choose A for All Unsolved Conflicts" msgstr "Velg A for alle uløste konflikter" -#: kdiff3.cpp:560 +#: kdiff3.cpp:562 msgid "Choose B for All Unsolved Conflicts" msgstr "Velg B for alle uløste konflikter" -#: kdiff3.cpp:561 +#: kdiff3.cpp:563 msgid "Choose C for All Unsolved Conflicts" msgstr "Velg C for alle uløste konflikter" -#: kdiff3.cpp:562 +#: kdiff3.cpp:564 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Velg A for alle uløste tomromkonflikter" -#: kdiff3.cpp:563 +#: kdiff3.cpp:565 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Velg B for alle uløste tomromkonflikter" -#: kdiff3.cpp:564 +#: kdiff3.cpp:566 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Velg C for alle uløste tomromkonflikter" -#: kdiff3.cpp:565 +#: kdiff3.cpp:567 msgid "Automatically Solve Simple Conflicts" msgstr "Løs enkle konflikter automatisk" -#: kdiff3.cpp:566 +#: kdiff3.cpp:568 msgid "Set Deltas to Conflicts" msgstr "Sett deltaer til konflikter" -#: kdiff3.cpp:567 +#: kdiff3.cpp:569 msgid "Run Regular Expression Auto Merge" msgstr "Kjør autofletting med regulære uttrykk" -#: kdiff3.cpp:568 +#: kdiff3.cpp:570 msgid "Automatically Solve History Conflicts" msgstr "Løs opp historiekonflikter automatisk" -#: kdiff3.cpp:569 +#: kdiff3.cpp:571 msgid "Split Diff At Selection" msgstr "Splitt differansen ved utvalget" -#: kdiff3.cpp:570 +#: kdiff3.cpp:572 msgid "Join Selected Diffs" msgstr "Slå sammen valgte differ" -#: kdiff3.cpp:572 +#: kdiff3.cpp:574 msgid "Show Window A" msgstr "Vis vindu A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:575 msgid "Show Window B" msgstr "Vis vindu B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:576 msgid "Show Window C" msgstr "Vis vindu C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:577 kdiff3.cpp:588 msgid "Focus Next Window" msgstr "Fokus på neste vindu" -#: kdiff3.cpp:577 +#: kdiff3.cpp:579 msgid "Normal Overview" msgstr "Normal oversikt" -#: kdiff3.cpp:578 +#: kdiff3.cpp:580 msgid "A vs. B Overview" msgstr "Oversikt A mot B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:581 msgid "A vs. C Overview" msgstr "Oversikt A mot C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:582 msgid "B vs. C Overview" msgstr "Oversikt B mot C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:583 msgid "Word Wrap Diff Windows" msgstr "Ordbryt i diff-vinduer" -#: kdiff3.cpp:582 +#: kdiff3.cpp:584 msgid "Add Manual Diff Alignment" msgstr "Legg til manuell diff-innretting" -#: kdiff3.cpp:583 +#: kdiff3.cpp:585 msgid "Clear All Manual Diff Alignments" msgstr "Tilbakestill all manuell diff-innretting" -#: kdiff3.cpp:588 +#: kdiff3.cpp:590 msgid "Focus Prev Window" msgstr "Fokus på forrige vindu" -#: kdiff3.cpp:589 +#: kdiff3.cpp:591 msgid "Toggle Split Orientation" msgstr "Bytt om splitt-orientering" -#: kdiff3.cpp:591 +#: kdiff3.cpp:593 msgid "Dir && Text Split Screen View" msgstr "Mappe og tekst delt visning" -#: kdiff3.cpp:593 +#: kdiff3.cpp:595 msgid "Toggle Between Dir && Text View" msgstr "Bytt mellom mappe- og tekstvisning" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:617 kdiff3.cpp:709 kdiff3.cpp:734 kdiff3.cpp:1015 +#: kdiff3.cpp:1036 pdiff.cpp:1100 pdiff.cpp:1172 pdiff.cpp:1210 pdiff.cpp:1226 +#: pdiff.cpp:1256 pdiff.cpp:1267 directorymergewindow.cpp:721 msgid "Ready." msgstr "Klar." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:651 pdiff.cpp:1756 msgid "The merge result hasn't been saved." msgstr "Fletteresultatet er ikke lagret." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:652 kdiff3.cpp:662 kdiff3.cpp:674 pdiff.cpp:1018 pdiff.cpp:1757 +#: pdiff.cpp:1767 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Advarsel" -#: kdiff3.cpp:651 +#: kdiff3.cpp:653 msgid "Save && Quit" msgstr "Lagre og avslutt" -#: kdiff3.cpp:652 +#: kdiff3.cpp:654 msgid "Quit Without Saving" msgstr "Avslutt uten lagring" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:662 pdiff.cpp:1767 msgid "Saving the merge result failed." msgstr "Fletteresultatet kunne ikke lagres." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:673 pdiff.cpp:1017 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:698 msgid "Saving file..." msgstr "Lagrer fil …" -#: kdiff3.cpp:713 +#: kdiff3.cpp:715 msgid "Saving file with a new filename..." msgstr "Lagrer fil med nytt filnavn …" -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:717 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Lagre som …" -#: kdiff3.cpp:974 +#: kdiff3.cpp:809 +#, fuzzy +#| msgid "Print..." +msgid "Printing..." +msgstr "Skriv ut …" + +#: kdiff3.cpp:825 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Øverste linje" + +#: kdiff3.cpp:950 +#, fuzzy +#| msgid "Select Font" +msgid "Selection" +msgstr "Velg skrift" + +#: kdiff3.cpp:976 +msgid "Printing completed." +msgstr "Utskrift fullført." + +#: kdiff3.cpp:980 +msgid "Printing aborted." +msgstr "Utskrift avbrutt." + +#: kdiff3.cpp:986 msgid "Exiting..." msgstr "Avslutter …" -#: kdiff3.cpp:987 +#: kdiff3.cpp:999 msgid "Toggling toolbar..." msgstr "Slår verktøylinje av/på …" -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1020 msgid "Toggle the statusbar..." msgstr "Slå statuslinje av/på …" @@ -571,16 +595,16 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Feil under filkopiering: Skriving mislyktes. Filnavn: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Leser mappe: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Lister mappe: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Avbryt" @@ -592,7 +616,7 @@ msgid "From Clipboard" msgstr "Fra utklippstavla" -#: diff.cpp:502 +#: diff.cpp:503 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -607,7 +631,7 @@ "\n" "Kommandoen for forarbeide blir nå slått av." -#: diff.cpp:542 +#: diff.cpp:543 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -622,7 +646,7 @@ "\n" "Forarbeide-kommandoen for linjesamordning blir nå slått av." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1661 diff.cpp:1675 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -630,7 +654,7 @@ "Datatap-feil:\n" "Hvis det kan gjenskapes, vennligst kontakt forfatteren.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1663 diff.cpp:1677 msgid "Severe Internal Error" msgstr "Alvorlig intern feil" @@ -652,8 +676,8 @@ msgid "C (Optional):" msgstr "C (valgfri):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1875 +#: directorymergewindow.cpp:1876 directorymergewindow.cpp:2993 msgid "Merge" msgstr "Flett sammen" @@ -963,7 +987,7 @@ "På: Alt som markeres skrives straks til utklippstavla.\n" "Av: Du må uttrykkelig kopiere, f.eks. med Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3130 msgid "Line end style:" msgstr "Linjeavslutning:" @@ -1871,7 +1895,7 @@ msgid "file3 to open" msgstr "fil 3 som skal åpnes" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2746 msgid "File" msgstr "Fil" @@ -1883,10 +1907,6 @@ msgid "Line not available" msgstr "Linje ikke tilgjengelig" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Øverste linje" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Slutt" @@ -1957,26 +1977,26 @@ msgid "Linediff: A <-> C" msgstr "Linjediff A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:530 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Alle inn-filer er binært like." -#: pdiff.cpp:530 +#: pdiff.cpp:532 msgid "All input files contain the same text, but are not binary equal." msgstr "Alle inn-filene inneholder samme tekst, men er ikke binært like." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:534 pdiff.cpp:536 pdiff.cpp:538 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filene %1 og %2 er binært like.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:535 pdiff.cpp:537 pdiff.cpp:539 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Filene %1 og %2 har lik tekst, men er ikke binært like. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:549 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1986,55 +2006,55 @@ "Merk at KDiff3-fletting ikke er beregnet for binære data.\n" "Fortsett på egen risiko." -#: pdiff.cpp:1017 +#: pdiff.cpp:1019 msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1020 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Fortsett fletting" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1026 pdiff.cpp:1114 msgid "Opening files..." msgstr "Åpner filer …" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1091 pdiff.cpp:1162 msgid "File open error" msgstr "Feil ved filåpning" -#: pdiff.cpp:1192 +#: pdiff.cpp:1194 msgid "Cutting selection..." msgstr "Klipper ut utvalget …" -#: pdiff.cpp:1213 +#: pdiff.cpp:1215 msgid "Copying selection to clipboard..." msgstr "Kopierer utvalg til utklippstavla …" -#: pdiff.cpp:1229 +#: pdiff.cpp:1231 msgid "Inserting clipboard contents..." msgstr "Setter inn fra utklippstavla …" -#: pdiff.cpp:1755 +#: pdiff.cpp:1758 msgid "Save && Continue" msgstr "Lagre og fortsett" -#: pdiff.cpp:1756 +#: pdiff.cpp:1759 msgid "Continue Without Saving" msgstr "Fortsett uten lagring" -#: pdiff.cpp:1958 +#: pdiff.cpp:1961 msgid "Search complete." msgstr "Søk fullført." -#: pdiff.cpp:1958 +#: pdiff.cpp:1961 msgid "Search Complete" msgstr "Søk fullført" -#: pdiff.cpp:2192 +#: pdiff.cpp:2195 msgid "Nothing is selected in either diff input window." msgstr "Ingenting er valgt i noe av inndata-vinduene." -#: pdiff.cpp:2192 +#: pdiff.cpp:2195 msgid "Error while adding manual diff range" msgstr "Feil oppsto ved tillegg av manuelt diff-område" @@ -2048,70 +2068,70 @@ "Dette skyldes oftest et installasjonsproblem. Det står mer om dette i README-" "fila i kildekoden." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Blanding av lenker og normale filer." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Lenke: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Størrelse: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Dato og størrelse: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Klarte ikke opprette midlertidig kopi av %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Klarte ikke åpne %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Sammenlikner fil …" -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Feil ved lesing fra %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Handling" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Ikkehvitt" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Hvitt" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2119,34 +2139,34 @@ "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " "og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2966 msgid "Rescan" msgstr "Les på nytt" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Klarte ikke åpne mapper:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Feil ved åpning av mappe" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2155,129 +2175,129 @@ "Målmappa må være en annen enn A eller B når tre mapper flettes.\n" "Kontroller igjen før du fortsetter." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameter-advarsel" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Leser mapper …" -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Leser mappe A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Leser mappe B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Leser mappe C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Noen undermapper var ikke lesbare i" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Kontroller rettigheter på undermappene." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status for mappesammenlikning" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Antall undermapper:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Antall like filer:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Antall forskjellige filer:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Antall manuelle flettinger:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:910 msgid "This affects all merge operations." msgstr "Dette påvirker alle flettehandlinger." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:911 msgid "Changing All Merge Operations" msgstr "Endre alle flette-handlinger" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1310 msgid "Processing " msgstr "Arbeider " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1789 directorymergewindow.cpp:1795 msgid "To do." msgstr "Gjenstår." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1863 directorymergewindow.cpp:2997 msgid "Copy A to B" msgstr "Kopier A til B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1864 directorymergewindow.cpp:2998 msgid "Copy B to A" msgstr "Kopier B til A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1865 directorymergewindow.cpp:2999 msgid "Delete A" msgstr "Slett A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1866 directorymergewindow.cpp:3000 msgid "Delete B" msgstr "Slett B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1867 msgid "Delete A & B" msgstr "Slett A & B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1868 directorymergewindow.cpp:3002 msgid "Merge to A" msgstr "Flett til A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1869 directorymergewindow.cpp:3003 msgid "Merge to B" msgstr "Flett til B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1870 msgid "Merge to A & B" msgstr "Flett til A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1874 directorymergewindow.cpp:2994 msgid "Delete (if exists)" msgstr "Slett (hvis det finnes)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1875 directorymergewindow.cpp:1876 msgid "Merge (manual)" msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1877 msgid "Error: Conflicting File Types" msgstr "Feil: Konflikt mellom filtyper" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1878 msgid "Error: Dates are equal but files are not." msgstr "Feil: Datoene er like, men ikke filene." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1904 directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1958 msgid "This operation is currently not possible." msgstr "Denne handlinga er ikke mulig nå." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1904 directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1958 directorymergewindow.cpp:2217 msgid "Operation Not Possible" msgstr "Handling ikke mulig" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1997 msgid "" "This should never happen: \n" "\n" @@ -2291,46 +2311,46 @@ "\n" "Hvis du vet hvordan dette kan gjenskapes, ta kontakt med programforfatteren." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1997 msgid "Program Error" msgstr "Programfeil" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:2008 msgid "An error occurred while copying.\n" msgstr "Det oppsto en feil under kopiering.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2008 directorymergewindow.cpp:2077 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2157 +#: directorymergewindow.cpp:2166 directorymergewindow.cpp:2417 msgid "Error" msgstr "Feil" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:2009 directorymergewindow.cpp:2418 msgid "Merge Error" msgstr "Flettefeil" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2014 directorymergewindow.cpp:2423 msgid "Error." msgstr "Feil." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:2019 directorymergewindow.cpp:2315 +#: directorymergewindow.cpp:2355 msgid "Done." msgstr "Ferdig." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:2042 msgid "Not saved." msgstr "Ikke lagret." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2077 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukjent flettehandling. (Dette må aldri skje!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2109 msgid "Unknown merge operation." msgstr "Ukjent flettehandling." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2124 msgid "" "The merge is about to begin.\n" "\n" @@ -2349,19 +2369,19 @@ "Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET " "INGEN GARANTI! Ta sikkerhetskopi av vitale data!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2129 msgid "Starting Merge" msgstr "Starter fletting" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2130 msgid "Do It" msgstr "Gjør det" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2131 msgid "Simulate It" msgstr "Simuler det" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2157 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2369,7 +2389,7 @@ "Det markerte elementet har forskjellig type i de forskjellige mappene. Velg " "hva som skal gjøres." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2166 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2377,13 +2397,13 @@ "Filene er ulike men har samme dato for siste endring. Velg hva som skal " "gjøres." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2217 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Denne handlinga er ikke mulig nå fordi en mappefletting pågår." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2277 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2392,209 +2412,209 @@ "Det var en feil i siste steg.\n" "Vil du fortsette med elementet som ga feil, eller hoppe over det?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2279 msgid "Continue merge after an error" msgstr "Fortsett fletting etter feil" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2280 msgid "Continue With Last Item" msgstr "Fortsett med siste element" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2281 msgid "Skip Item" msgstr "Hopp over element" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2315 msgid "Skipped." msgstr "Hoppet over." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2322 directorymergewindow.cpp:2536 msgid "In progress..." msgstr "Pågår …" -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2370 msgid "Merge operation complete." msgstr "Flettehandling fullført." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2370 directorymergewindow.cpp:2373 msgid "Merge Complete" msgstr "Fletting fullført" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2383 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulert fletting fullført. Se etter om du er enig i de foreslåtte " "handlingene." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2417 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2449 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2456 #, kde-format msgid "delete directory recursively( %1 )" msgstr "slett mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2458 #, kde-format msgid "delete( %1 )" msgstr "slett ( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2473 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2492 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Feil: rmdir( %1 ) mislyktes." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2502 msgid "Error: delete operation failed." msgstr "Feil: sletting mislyktes." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2528 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuell fletting( %1, %2, %3 → %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2531 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2554 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Feil: kopiering (%1 → %2) mislyktes. Eksisterende mål kunne ikke slettes." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2564 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 → %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2575 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2581 msgid "Error: copyLink failed." msgstr "Feil: copyLink mislyktes." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2601 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopier(%1 → %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2627 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Feil under navneendring( %1 → %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2633 #, kde-format msgid "rename( %1 -> %2 )" msgstr "endre navn ( %1 → %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2642 msgid "Error: Rename failed." msgstr "Feil: navneendring mislyktes." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2660 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2676 #, kde-format msgid "makeDir( %1 )" msgstr "Lag mappe( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2686 msgid "Error while creating directory." msgstr "Feil under oppretting av mappe." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2711 directorymergewindow.cpp:2821 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2715 directorymergewindow.cpp:2746 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2715 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2715 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2716 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2716 msgid "Last Modification" msgstr "Siste endring" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2716 msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2763 msgid "not available" msgstr "ikke tilgjengelig" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2783 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2786 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2792 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2800 msgid "C (Dest): " msgstr "C (mål) :" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2806 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2873 msgid "Save Directory Merge State As..." msgstr "Lagre status for mappefletting som …" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2960 msgid "Start/Continue Directory Merge" msgstr "Start/fortsett mappefletting" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2961 msgid "Run Operation for Current Item" msgstr "Kjør handling for gjeldende element" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2962 msgid "Compare Selected File" msgstr "Sammenlikne valgt fil" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2963 msgid "Merge Current File" msgstr "Flett gjeldende fil" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2963 msgid "" "Merge\n" "File" @@ -2602,39 +2622,39 @@ "Flett\n" "Fil" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2964 msgid "Fold All Subdirs" msgstr "Brett sammen alle undermapper" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2965 msgid "Unfold All Subdirs" msgstr "Fold ut alle undermapper" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2969 msgid "Choose A for All Items" msgstr "Velg A for alle elementer" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2970 msgid "Choose B for All Items" msgstr "Velg B for alle elementer" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2971 msgid "Choose C for All Items" msgstr "Velg C for alle elementer" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2972 msgid "Auto-Choose Operation for All Items" msgstr "Auto-velg handling for alle elementer" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2973 msgid "No Operation for All Items" msgstr "Ingen handling for alle elementer" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2978 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2978 msgid "" "Identical\n" "Files" @@ -2642,15 +2662,15 @@ "Identiske\n" "filer" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2979 msgid "Show Different Files" msgstr "Vis forskjellige filer" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2980 msgid "Show Files only in A" msgstr "Vis filer bare i A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2980 msgid "" "Files\n" "only in A" @@ -2658,11 +2678,11 @@ "Filer \n" "bare i A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2981 msgid "Show Files only in B" msgstr "Vis filer bare i B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2981 msgid "" "Files\n" "only in B" @@ -2670,11 +2690,11 @@ "Filer \n" "bare i B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2982 msgid "Show Files only in C" msgstr "Vis filer bare i C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2982 msgid "" "Files\n" "only in C" @@ -2682,35 +2702,35 @@ "Filer \n" "bare i C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2986 msgid "Compare Explicitly Selected Files" msgstr "Sammenlikne uttrykkelig valgte filer" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2987 msgid "Merge Explicitly Selected Files" msgstr "Flett uttrykkelig valgte filer" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2989 directorymergewindow.cpp:2996 msgid "Do Nothing" msgstr "Ikke gjør noe" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2990 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2991 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2992 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:3001 msgid "Delete A && B" msgstr "Slett A && B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:3004 msgid "Merge to A && B" msgstr "Flett til A && B" @@ -2970,11 +2990,18 @@ "Ikke alle konflikter er løst ennå.\n" "Fila er ikke lagret.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2708 mergeresultwindow.cpp:2717 msgid "Conflicts Left" msgstr "Gjenstående konflikter" -#: mergeresultwindow.cpp:2720 +#: mergeresultwindow.cpp:2715 +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2729 msgid "" "\n" "\n" @@ -2984,28 +3011,42 @@ "\n" "Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2729 mergeresultwindow.cpp:2773 msgid "File Save Error" msgstr "Feil ved fillagring" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2773 msgid "Error while writing." msgstr "Feil ved skriving." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3103 msgid "Output" msgstr "Utdata" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3115 mergeresultwindow.cpp:3295 msgid "[Modified]" msgstr "[Endret]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3122 msgid "Encoding for saving" msgstr "Koding for lagring" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3175 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3176 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3210 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Konflikter" + +#: mergeresultwindow.cpp:3242 mergeresultwindow.cpp:3244 +#: mergeresultwindow.cpp:3246 msgid "Codec from" msgstr "Kodek fra"
--- a/kdiff3/po/nds/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/nds/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,111 +1,111 @@ # Translation of kdiff3.po to Low Saxon # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Sönke Dibbern <s_dibbern@web.de>, 2008. +# Sönke Dibbern <s_dibbern@web.de>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-28 00:44+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-19 01:43+0100\n" "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\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" +"X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Aktuell Instellen:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fehler binnen de Instellen:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Optschoon \"--auto\" bruukt, man keen Utgaavdatei angeven." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Optschoon \"--auto\" warrt bi't Verglieken vun Ornern övergahn." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Sekern fehlslaan." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Disse Dateien laat sik nich opmaken:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fehler bi't Opmaken" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Dokmenten warrt för't Verglieken opmaakt..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Nieg laden" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Sekert dat Resultaat vun't Tosamenföhren. All Konflikten mööt oplööst wesen!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Sekert dat aktuelle Dokment as..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Verscheel drucken" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Maakt dat Programm ut" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Knippt dat utsöchte Rebeet un föögt dat na de Twischenaflaag in" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopeert den utsöchten Afsnitt na de Twischenaflaag" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Föögt de Twischenaflaag ehr Inholt bi de aktuelle Steed in" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Allens binnen dat aktuelle Finster utsöken" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Na en Tekenkeed söken" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Nochmaal na en Tekenkeed söken" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Maakt den Statusbalken an oder ut" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 instellen..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Na aktuellen Verscheel gahn" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -113,11 +113,11 @@ "Aktuell\n" "Verscheel" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Na eersten Verscheel gahn" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -125,11 +125,11 @@ "Eerst\n" "Verscheel" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Na lesten Verscheel gahn" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -137,22 +137,22 @@ "Lest\n" "Verscheel" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Övergeiht Freeruum-Verschelen, wenn \"Freerüüm wiesen\" utmaakt is.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" "(Övergeiht Freeruum-Verschelen nich, ok wenn \"Freerüüm wiesen\" utmaakt is.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Na verleden Verscheel gahn" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -160,11 +160,11 @@ "Verleden\n" "Verscheel" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Na nakamen Verscheel gahn" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -172,11 +172,11 @@ "Nakamen\n" "Verscheel" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Na verleden Konflikt gahn" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -184,11 +184,11 @@ "Verleden\n" "Konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Na nakamen Konflikt gahn" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -196,11 +196,11 @@ "Nakamen\n" "Konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Na verleden Konflikt gahn, de nich oplööst is" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -208,11 +208,11 @@ "Verleden\n" "n. oplööst" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Na nakamen Konflikt gahn, de nich oplööst is" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -220,11 +220,11 @@ "Nakamen\n" "n. oplööst" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Reeg ut A bruken" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -232,11 +232,11 @@ "A\n" "bruken" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Reeg ut B bruken" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -244,11 +244,11 @@ "B\n" "bruken" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Reeg ut C bruken" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -256,11 +256,11 @@ "C\n" "bruken" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Na Bornköör automaatsch na nakamen nich oplöösten Konflikt gahn" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -268,21 +268,21 @@ "Autom.\n" "Nakamen" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Free- un Tab-Tekens as Verscheel wiesen" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "Freerüüm" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Freerüüm wiesen" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -290,11 +290,11 @@ "Freeruum-\n" "Verschelen" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Reegnummern wiesen" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -302,179 +302,199 @@ "Reeg-\n" "nummern" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Jümmers A bruken" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Jümmers B bruken" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Jümmers C bruken" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "A för all nich oplööst Konflikten bruken" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "B för all nich oplööst Konflikten bruken" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "C för all nich oplööst Konflikten bruken" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A för all nich oplööst Freeruum-Konflikten bruken" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B för all nich oplööst Freeruum-Konflikten bruken" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C för all nich oplööst Freeruum-Konflikten bruken" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Eenfach Konflikten automaatsch oplösen" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "All Verschelen as Konflikten markeren" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Automaatsch Tosamenföhren mit reguleer Utdruck" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Vörgeschicht-Konflikten automaatsch oplösen" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Verscheel bi Köör delen" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Utsöcht Verschelen tosamenstellen" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Finster A wiesen" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Finster B wiesen" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Finster C wiesen" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Nakamen Finster anmaken" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normaal Översicht" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A-B-Översicht" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A-C-Översicht" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B-C-Översicht" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Regen ümbreken" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Verscheel-Utrichten vun Hand tofögen" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "All Vun-Hand-Utrichten wegmaken" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Verleden Finster anmaken" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Deelricht wesseln" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Deelt Ansicht för Orner un Text" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Orner- un Text-Ansicht wesseln" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Praat." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Tosamenföhr-Resultaat wöör nich sekert" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Wohrschoen" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Sekern && Utmaken" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Utmaken un nich Sekern" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Tosamenföhr-Resultaat lett sik nich sekern" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Du föhrst jüst Ornern tosamen. Wullt Du dat redig afbreken?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Datei warrt sekert..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Datei warrt mit en nieg Dateinaam sekert..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Sekern as..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "An't Drucken..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Böverst Reeg" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Köör" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Drucken afslaten." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Drucken afbraken." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Bi to utstiegen..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Warktüüchbalken warrt an-/utmaakt..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Statusbalken an-/utmaken..." @@ -568,28 +588,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fehler bi't Koperen: Schrieven fehlslaan. Dateinaam: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Orner warrt leest: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Orner warrt oplist: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Afbreken" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Twischenaflaag-Daten laat sik nich as Temporeerdatei sekern." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Ut Twischenaflaag" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -604,7 +624,7 @@ "\n" "De Vörverarbeid-Befehl warrt nu utmaakt." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -620,7 +640,7 @@ "\n" "De Vörverarbeid-Befehl för de Regenutrichten warrt nu utmaakt." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -628,7 +648,7 @@ "Daten sünd wegkamen:\n" "Lett sik dit wedderhalen, snack dor bitte den Autor op an.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Swoor intern Fehler" @@ -650,8 +670,8 @@ msgid "C (Optional):" msgstr "C (köörwies):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Tosamenföhren" @@ -783,7 +803,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Afbreken" @@ -965,7 +985,7 @@ "An: All Kören warrt fuurts na de Twischenaflaag kopeert.\n" "Ut: Du muttst dat Koperen sülven maken, a.B. mit Strg+C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Reegenn-Stil:" @@ -1263,8 +1283,8 @@ "(Liek to de Befehlsreegoptschoon \"--auto\".)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Orner-Tosamenföhren" +msgid "Directory" +msgstr "Orner" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1904,7 +1924,7 @@ msgid "file3 to open" msgstr "Drüdde Datei, de Du opmaken wullt" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Datei" @@ -1916,10 +1936,6 @@ msgid "Line not available" msgstr "Reeg nich verföögbor" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Böverst Reeg" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Enn" @@ -1990,27 +2006,27 @@ msgid "Linediff: A <-> C" msgstr "Reegverscheel: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "All Ingaavdateien sünd bineer liek." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "All Ingaavdateien bargt den sülven Text, man sünd bineer nich liek." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "De Dateien %1 un %2 sünd bineer liek.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "De Dateien %1 un %2 bargt den sülven Text, man sünd bineer nich liek.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2020,55 +2036,55 @@ "Beacht, KDiff3 is nich för't Tosamenföhren vun Bineerdaten maakt.\n" "Maak man op Dien egen Riskanz wieder." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Afbreken" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Tosamenföhren wiedermaken" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Dateien warrt opmaakt..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fehler bi't Datei-Opmaken" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Köör warrt knippt..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Köör warrt na de Twischenaflaag kopeert..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Twischenaflaag-Inholt warrt inföögt..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Sekern un wiedermaken" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Ahn Sekern wiedermaken" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Söök afslaten." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Söök afslaten" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Binnen keen Verscheel-Ingaavfinster is wat utsöcht." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Fehler bi't Tofögen vun en Verscheelrebeet vun Hand" @@ -2082,70 +2098,70 @@ "Dit kummt normalerwies bi Problemen mit de Installatschoon vör. De " "Enkelheiten staht binnen de README-Datei vun't Born-Paket." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mischen vun Links un normaal Dateien" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Grött: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Datum un Grött: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Temporeerkopie vun \"%1\" lett sik nich opstellen" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "\"%1\" lett sik nich opmaken" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Datei warrt vergleken..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "\"%1\" lett sik nich lesen" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Akschoon" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Nich oplööst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Oplööst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nichfree" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Free" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2153,34 +2169,34 @@ "Du büst jüst togang un föhrst Ornern tosamen. Wullt Du dat Tosamenföhren " "redig afbreken un den Orner nieg dörkieken?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Nieg dörkieken" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Opmaken vun Ornern fehlslaan:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Orner A \"%1\" gifft dat nich oder is keen Orner.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Orner B \"%1\" gifft dat nich oder is keen Orner.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Orner C \"%1\" gifft dat nich oder is keen Orner.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Fehler bi't Ornern-Opmaken" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2191,129 +2207,129 @@ "\n" "Prööv dat bitte, ehr Du wiedermaakst." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameter-Wohrschoen" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Ornern warrt dörkeken..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Orner A warrt leest" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Orner B warrt leest" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Orner C warrt leest" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "En Reeg Ünnerornern lett sik nich lesen binnen" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Prööv bitte de Verlöven vun de Ünnerornern." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Ornervergliek-Status" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Tall vun Ünnerornern:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Tall vun liek Dateien:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Tall vun verscheden Dateien:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Tall vun Tosamenföhren vun Hand:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Dit bedröppt all Tosamenföhr-Akschonen" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "All Tosamenföhr-Akschonen ännern" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Bi to verarbeiden: " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Opgaav" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A op B koperen" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B op A koperen" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A wegdoon" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B wegdoon" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A un B wegdoon" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Mit A tosamenföhren" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Mit B tosamenföhren" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Mit A un B tosamenföhren" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Wegdoon (wenn vörhannen)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Tosamenföhren (vun Hand)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Fehler: Inkompatibel Dateitypen" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Fehler: De Daten sünd liek, man de Dateien nich." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Disse Akschoon is opstunns nich mööglich." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Akschoon nich mööglich" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2327,46 +2343,46 @@ "\n" "Lett sik dit wedderhalen, snack dor bitte den Programmschriever op an." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programmfehler" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Dat geev en Fehler bi't Koperen.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Fehler" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Tosamenföhr-Fehler" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fehler." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Afslaten." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Nich sekert" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nich begäng Tosamenföhrakschoon (Dit mutt nienich vörkamen!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Nich begäng Tosamenföhrakschoon" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2386,19 +2402,19 @@ "Beacht bitte, dit Programm hett jümmers noch Beta-Status un dat gifft keen " "Garantien, för gor nix. Maak Sekerheitkopien vun Dien wichtige Daten!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Tosamenföhren starten" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Doon" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2406,7 +2422,7 @@ "De rutheevte Indrag hett binnen de verscheden Ornern verscheden Typen. Wat " "wullt Du doon?" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2414,7 +2430,7 @@ "De Ännerdaten vun de Dateien sünd liek, man de Dateien sünd dat nich. Wat " "wullt Du doon?" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2422,7 +2438,7 @@ "Disse Akschoon lett sik opstunns nich utföhren, dor löppt en Orner-" "Tosamenföhren." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2432,216 +2448,216 @@ "Wullt Du mit dat Element wiedermaken, dat den Fehler utlööst hett, oder " "wullt Du dat utlaten?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Tosamenföhren na Fehler wiedermaken" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Mit verleden Element wiedermaken" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Element utlaten" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Utlaten." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "In de Maak..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Tosamenföhren afslaten." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Tosamenföhren afslaten" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Dat simuleerte Tosamensmölten is afslaten Kiek, wat Du de vörslaan Akschonen " "utföhren wullt." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Dat hett en Fehler geven. Klick op OK, wenn Du de Enkelheiten ankieken " "wullt.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Fehler bi't Wegdoon vun \"%1\": Opstellen vun Sekerheitkopie fehlslaan." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Orner un Ünnerornern wegdoon (%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "wegdoon (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Fehler: Wegdoon vun Orner fehlslaan, bides he leest wöör." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: rmdir-Akschoon (%1) fehlslaan." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fehler: Wegdoon fehlslaan." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Vun Hand tosamenföhren (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Beacht bitte: Na't Tosamenföhren vun Hand schull de Bruker mit F7 " "wiedermaken" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fehler: Koperen (%1 -> %2) fehlslaan. Wegdoon vun vörhannen Teel fehlslaan." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Link koperen (%1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fehler: Koperen vun Link fehlslaan. Feern links warrt noch nich ünnerstütt." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Fehler: Koperen vun Link fehlslaan." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "Koperen (%1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fehler bi't Ümnömen (%1 -> %2): Vörhannen Teel lett sik nich wegmaken." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Ümnömen (%1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Fehler: Ümnömen fehlslaan." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fehler bi't Opstellen vun Orner \"%1\". Vörhannen Datei lett sik nich " "wegdoon." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Orner opstellen (%1)" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Fehler bi't Opstellen vun Orner." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Teel" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Orner" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Grött" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Verleden Ännern" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Link-Teel" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "nich verföögbor" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Teel): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "B (Grundl.): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Teel): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Teel): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Teel: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Orner-Tosamenföhrstatus sekern as..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Orner-Tosamenföhren starten/wiedermaken" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Akschoon mit aktuell Element utföhren" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Utsöcht Datei verglieken" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Aktuell Datei tosamenföhren" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2649,39 +2665,39 @@ "Datei\n" "tosamenföhren" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "All Ünnerornern infoolden" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "All Ünnerornern utfoolden" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "A bi all Indrääg utsöken" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "B bi all Indrääg utsöken" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "C bi all Indrääg utsöken" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Akschoon bi all Indrääg automaatsch utsöken" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Keen Akschoon för all Indrääg" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Liek Dateien wiesen" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2689,15 +2705,15 @@ "Liek\n" "Dateien" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Verscheden Dateien wiesen" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Dateien bloots in A wiesen" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2705,11 +2721,11 @@ "Dateien\n" "bloots in A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Dateien bloots in B wiesen" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2717,11 +2733,11 @@ "Dateien\n" "bloots in B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Dateien bloots in C wiesen" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2729,35 +2745,35 @@ "Dateien\n" "bloots in C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Utsöcht Dateien verglieken" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Utsöcht Dateien tosamenföhren" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nix doon" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A un B wegdoon" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Na A un B tosamenföhren" @@ -2769,11 +2785,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Wiedermaken" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Utmaken" @@ -3008,11 +3024,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Tosamenföhrkonflikt (Freeruum)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Tosamenförkonflikt>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3020,12 +3036,22 @@ "Noch sünd nich all Konflikten oplööst.\n" "Datei nich sekert.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Konflikten na" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Dat giffft en Konflikt mit de Reegennen. Söök bitte den Reegenn-Stil vun " +"Hand ut.\n" +"Datei nich sekert.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3034,28 +3060,40 @@ "\n" "Sekerheitkopie lett sik nich opstellen. Datei nich sekert." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fehler bi't Sekern" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fehler bi't Schrieven" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Utgaav" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Ännert]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Koderen bi't Sekern" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Konflikt" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Koderen vun" @@ -3093,5 +3131,8 @@ msgid "Your emails" msgstr "s_dibbern@web.de" +#~ msgid "Directory Merge" +#~ msgstr "Orner-Tosamenföhren" + #~ msgid "C&ontinue" #~ msgstr "Wieder&maken"
--- a/kdiff3/po/nl/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/nl/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,20 +1,20 @@ # translation of kdiff3.po to Dutch # translation of kdiff3.po to # translation of kdiff3.po to -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # Rinse de Vries <rinse@kde.nl>, 2004. # Rinse de Vries <rinsedevries@kde.nl>, 2004, 2005, 2006, 2007. # Sander Koning <sanderkoning@kde.nl>, 2005. # Rinse de Vries <RinseDeVries@home.nl>, 2005. # Bram Schoenmakers <bramschoenmakers@kde.nl>, 2006. -# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2008. +# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-14 15:13+0200\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-25 22:57+0100\n" "Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" @@ -23,96 +23,96 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Huidige configuratie:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fout bij configuratie-optie:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Optie '--auto' is gebruikt, maar er is geen uitvoerbestand opgegeven." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." -msgstr "Optie '--auto' is genegeerd voor directorypenvergelijking." - -#: kdiff3.cpp:402 +msgstr "Optie '--auto' is genegeerd voor mappenvergelijking." + +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Opslag is mislukt." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Het openen van deze bestanden is mislukt:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fout bij bestanden openen" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Opent documenten voor vergelijking..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Opnieuw laden" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Slaat het samenvoegresultaat op. Alle conflicten dienen te worden opgelost!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Slaat het huidige document op als..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Verschillen afdrukken" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Sluit de toepassing" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Knipt de geselecteerde sectie uit en plaatst deze op het klembord" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopieert de geselecteerde sectie naar het klembord" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Plakt de inhoud van het klembord op de huidige cursorpositie" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Alles in huidig venster selecteren" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Tekst opzoeken" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Opnieuw zoeken" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Activeert/deactiveert de statusbalk" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 instellen..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Ga naar huidig verschil" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -120,21 +120,21 @@ "Huidig\n" "Verschil" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Ga naar eerste verschil" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "Ga naar eerste verschil" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Ga naar laatste verschil" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -142,12 +142,12 @@ "Laatste\n" "Verschil" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Slaat witruimteverschillen over als \"Witruimte tonen\" is uitgeschakeld.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -155,11 +155,11 @@ "(Slaat witruimteverschillen niet over, zelfs als \"Witruimte tonen\" is " "uitgeschakeld.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Ga naar vorig verschil" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -167,11 +167,11 @@ "Voorgaand\n" "Verschil" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Ga naar volgend verschil" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -179,11 +179,11 @@ "Volgende\n" "Verschil" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Ga naar vorig conflict" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -191,11 +191,11 @@ "Vorig\n" "Conflict" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Ga naar volgend conflict" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -203,11 +203,11 @@ "Volgend\n" "Conflict" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Ga naar vorig onopgelost conflict" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -215,11 +215,11 @@ "Voorgaand\n" "Niet opgelost" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Ga naar volgend onopgelost conflict" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -227,11 +227,11 @@ "Volgend\n" "Niet opgelost" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Regel(s) van A selecteren" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -239,11 +239,11 @@ "Kies\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Regel(s) van B selecteren" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -251,11 +251,11 @@ "Kies\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Regel(s) van C selecteren" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -263,12 +263,12 @@ "Kies\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automatisch naar het volgende onopgeloste conflict gaan na bronselectie" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -276,11 +276,11 @@ "Automatisch\n" "Volgende" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Spaties && tabulator-tekens in verschillen tonen" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -288,11 +288,11 @@ "Witruimte\n" "Tekens" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Witruimte tonen" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -300,11 +300,11 @@ "Witruimte\n" "Verschil" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Regelnummering tonen" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -312,181 +312,201 @@ "Regel\n" "nummers" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "A overal kiezen" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "B overal kiezen" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "C overal kiezen" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "A voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "B voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "C voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Automatisch eenvoudige conflicten oplossen" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Elk onderscheid maken bij conflicten" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Automatisch samenvoegen d.m.v. reguliere expressie uitvoeren" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Automatisch geschiedenisconflicten oplossen" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Vergelijking bij selectie splitsen" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Geselecteerde verschillen samenvoegen" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Venster A tonen" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Venster B tonen" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Venster C tonen" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Focus op volgend venster zetten" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normaal overzicht" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A vs B overzicht" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A vs C overzicht" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B vs C overzicht" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Regels afbreken in vensters met verschillen" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Handmatige uitlijning van vergelijking toevoegen" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Alle handmatige uitlijningen van vergelijkingen wissen" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Focus op vorig venster zetten" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Splitsen van vensters omschakelen" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Directory- en tekstweergave splitsen in hoofdvenster" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" -msgstr "Tussen directory- en tekstweergave wisselen" - -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +msgstr "Tussen map- en tekstweergave wisselen" + +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Gereed." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Het resultaat van de samenvoeging is niet opgeslagen." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Waarschuwing" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Opslaan && afsluiten" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Afsluiten zonder opslag" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "De opslag van het resultaat van de samenvoeging is mislukt." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"U bent momenteel bezig met het samenvoegen van directorypen. Wilt u " -"werkelijk afbreken?" - -#: kdiff3.cpp:696 +"U bent momenteel bezig met het samenvoegen van mappen. Wilt u werkelijk " +"afbreken?" + +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Bestand wordt opgeslagen..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Bestand wordt opgeslagen met een nieuwe naam..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Opslaan als..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Afdrukken..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Bovenste regel" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Selectie" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Afdrukken is voltooid." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Afdrukken is afgebroken." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Programma wordt afgesloten..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Werkbalk aan/uit..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Statusbalk aan/uit..." @@ -588,28 +608,28 @@ "Fout tijdens bestanden kopiëren: het opslaan is mislukt.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Directory lezen: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Directory inlezen: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "Ann&uleren" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Het opslaan van de klembordinhoud in een tijdelijk bestand is mislukt." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Van klembord" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -624,7 +644,7 @@ "\n" "Dit commando zal nu worden uitgeschakeld." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -640,7 +660,7 @@ "\n" "Dit commando zal nu worden uitgeschakeld." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -648,7 +668,7 @@ "Fout met dataverlies:\n" "Als dit reproduceerbaar is, neem dan contact op met de auteur.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Ernstige interne fout" @@ -670,8 +690,8 @@ msgid "C (Optional):" msgstr "C (optioneel):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Samenvoegen" @@ -803,7 +823,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Annuleren" @@ -917,7 +937,7 @@ #: optiondialog.cpp:672 msgid "Directory Comparison View:" -msgstr "Weergave directorypenvergelijking:" +msgstr "Weergave mappenvergelijking:" #: optiondialog.cpp:678 msgid "Newest file color:" @@ -929,7 +949,7 @@ "comparison." msgstr "" "Het wijzigen van deze kleur is pas van kracht als u de volgende " -"directoryvergelijking start." +"mappenvergelijking start." #: optiondialog.cpp:687 msgid "Oldest file color:" @@ -988,7 +1008,7 @@ "Aan: elke selectie zal onmiddellijk op het klembord geplaatst worden.\n" "Uit: kopiëren gebeurt expliciet, bijvoorbeeld via Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Regeleinde:" @@ -1079,7 +1099,7 @@ #: optiondialog.cpp:858 msgid "Align B and C for 3 input files" -msgstr "" +msgstr "Lijn B en C uit voor 3 invoerbestanden" #: optiondialog.cpp:861 msgid "" @@ -1087,6 +1107,10 @@ "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" +"Probeer B en C uit te lijnen bij het vergelijken of samenvoegen van drie " +"invoerbestanden.\n" +"Niet aanbevolen voor samenvoegen omdat dit veel gecompliceerder kan worden.\n" +"(Standaard is uit.)" #: optiondialog.cpp:874 msgid "Merge Settings" @@ -1282,16 +1306,16 @@ "(Vergelijkbaar met de commandoregeloptie \"--auto\"." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Directorysamenvoeging" +msgid "Directory" +msgstr "Map" #: optiondialog.cpp:1079 msgid "Recursive directories" -msgstr "Recursieve directorypen" +msgstr "Recursieve mappen" #: optiondialog.cpp:1081 msgid "Whether to analyze subdirectories or not." -msgstr "Bepaalt of subdirectorypen wel of niet worden ingelezen." +msgstr "Bepaalt of submappen wel of niet worden ingelezen." #: optiondialog.cpp:1083 msgid "File pattern(s):" @@ -1331,9 +1355,9 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Patroon(en) van directorypen die niet zullen worden ingelezen. \n" +"Patro(o)n(en) van mappen die niet zullen worden ingelezen. \n" "Jokers: '*' en '?'\n" -"Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken. ';'" +"Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken: ';'" #: optiondialog.cpp:1116 msgid "Use .cvsignore" @@ -1345,19 +1369,19 @@ "Via local \".cvsignore\"-files this can be directory specific." msgstr "" "Breidt het antipatroon uit met alles dat genegeerd zou worden door CVS.\n" -"Via lokale \".cvsignore\"-bestanden kan dit directoryspecifiek zijn." +"Via lokale \".cvsignore\"-bestanden kan dit mapspecifiek zijn." #: optiondialog.cpp:1124 msgid "Find hidden files and directories" -msgstr "Verborgen bestanden en directorypen zoeken" +msgstr "Verborgen bestanden en mappen zoeken" #: optiondialog.cpp:1127 msgid "Finds files and directories with the hidden attribute." -msgstr "Zoekt naar verborgen bestanden en directorypen." +msgstr "Zoekt naar verborgen bestanden en mappen." #: optiondialog.cpp:1129 msgid "Finds files and directories starting with '.'." -msgstr "Zoekt naar bestanden en directorypen die beginnen met '.'." +msgstr "Zoekt naar bestanden en mappen die beginnen met '.'." #: optiondialog.cpp:1133 msgid "Follow file links" @@ -1380,8 +1404,8 @@ "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -"Aan: vergelijk de directory naarwaar de koppeling verwijst.\n" -"Uit: vergelijk de koppeling." +"Aan: vergelijk de map waarnaar de koppeling verwijst.\n" +"Uit: vergelijk de koppelingen." #: optiondialog.cpp:1160 msgid "Case sensitive filename comparison" @@ -1394,8 +1418,8 @@ "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" msgstr "" -"De directorypenvergelijking zal bestanden en directorypen vergelijken als de " -"namen ervan overeen komen.\n" +"De mappenvergelijking zal bestanden en mappen vergelijken als de namen ervan " +"overeenkomen.\n" "Schakel deze optie in als ook het gebruik van hoofd-/kleine letters overeen " "moet komen. (Standaard voor Windows is uit, anders aan.)" @@ -1474,7 +1498,7 @@ msgstr "" "Gaat er van uit dat bestanden gelijk zijn als de bestandsgroottes gelijk " "zijn.\n" -"Nuttig voor grote directorypen en trage netwerken wanneer de datum verandert " +"Nuttig voor grote mappen en trage netwerken wanneer de datum verandert " "tijdens een download." #: optiondialog.cpp:1203 @@ -1487,9 +1511,9 @@ "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -"Bestanden worden in beide directorypen opgeslagen zodat beide achteraf " -"hetzelfde zijn.\n" -"Werkt alleen wanneer twee directorypen vergeleken worden zonder dat er een " +"Bestanden worden in beide mappen opgeslagen zodat beide achteraf hetzelfde " +"zijn.\n" +"Werkt alleen wanneer twee mappen vergeleken worden zonder dat er een " "bestemming is opgegeven." #: optiondialog.cpp:1212 @@ -1517,7 +1541,7 @@ msgstr "" "De inhoud niet controleren, enkel het nieuwe bestand nemen.\n" "(Gebruik dit enkel als u weet wat u doet!)\n" -"Alleen effectief wanneer men twee directorypen met elkaar vergelijkt." +"Alleen effectief wanneer men twee mappen met elkaar vergelijkt." #: optiondialog.cpp:1229 msgid "Backup files (.orig)" @@ -1655,13 +1679,15 @@ #: optiondialog.cpp:1591 msgid "Quit also via Escape key" -msgstr "" +msgstr "Stoppen kan ook via de Escape-toets" #: optiondialog.cpp:1594 msgid "" "Fast method to exit.\n" "For those who are used to using the Escape-key." msgstr "" +"Snelle methode om te eindigen.\n" +"Voor hen die het gewoon zijn om de Escape-toets te gebruiken." #: optiondialog.cpp:1599 msgid "Integrate with ClearCase" @@ -1726,8 +1752,7 @@ #: main.cpp:189 msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" -"Hulpmiddel voor het vergelijken en samenvoegen van bestanden en directorypen" +msgstr "Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen" #: main.cpp:190 msgid "(c) 2002-2008 Joachim Eibl" @@ -1931,7 +1956,7 @@ msgid "file3 to open" msgstr "Derde bestand om te openen" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Bestand" @@ -1943,10 +1968,6 @@ msgid "Line not available" msgstr "Regel niet beschikbaar" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Bovenste regel" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Einde" @@ -2018,29 +2039,29 @@ msgid "Linediff: A <-> C" msgstr "Regelvergelijking: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Alle invoerbestanden zijn binair gelijk." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Alle invoerbestanden bevatten dezelfde tekst, maar zijn binair gezien niet " "gelijk." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Bestanden %1 en %2 zijn binair gelijk.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Bestanden %1 en %2 hebben dezelfde tekst, maar zijn binair gezien ongelijk.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2050,55 +2071,55 @@ "Opmerking: KDiff3 is niet bedoeld voor binaire gegevens.\n" "U kunt verder gaan op eigen risico." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Afbreken" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Doorgaan met samenvoegen" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Bestanden openen..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fout bij openen van bestand" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Selectie wordt geknipt..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Selectie wordt op het klembord geplaatst..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Klembordinhoud wordt ingevoegd..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Opslaan && doorgaan" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Doorgaan zonder opslaan" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Zoeken voltooid." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Zoeken voltooid" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Er is niets geselecteerd in beide invoervensters voor de vergelijking." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Fout bij het toevoegen van handmatig vergelijkingsbereik" @@ -2112,238 +2133,237 @@ "Dit doet zich meestal voor door een installatieprobleem. Lees a.u.b. het " "README-bestand van het broncodepakket voor meer details." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mix van koppelingen en bestanden." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Koppeling: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Grootte: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Datum en grootte: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Het aanmaken van de tijdelijke kopie van %1 is mislukt." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Het openen van %1 is mislukt." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Bestand wordt vergeleken..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Fout bij het lezen van %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Handeling" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Niet opgelost" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Opgelost" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Niet-wit" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Wit" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -"U bent momenteel bezig met het samenvoegen van een directory. Wilt u dat " -"werkelijk, of wilt u het samenvoegen afbreken en de directory opnieuw " -"inlezen?" - -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +"U bent momenteel bezig met het samenvoegen van een map. Wilt u dat " +"werkelijk, of wilt u het samenvoegen afbreken en de map opnieuw inlezen?" + +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Opnieuw inlezen" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" -msgstr "Het openen van de directorypen is mislukt:" - -#: directorymergewindow.cpp:569 +msgstr "Het openen van de mappen is mislukt:" + +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "Directory A \"%1\" bestaat niet of is geen directory.\n" - -#: directorymergewindow.cpp:572 +msgstr "Map A \"%1\" bestaat niet of is geen map.\n" + +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "Directory B \"%1\" bestaat niet of is geen directory.\n" - -#: directorymergewindow.cpp:575 +msgstr "Map B \"%1\" bestaat niet of is geen map.\n" + +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "Directory C \"%1\" bestaat niet of is geen directory.\n" - -#: directorymergewindow.cpp:577 +msgstr "Map C \"%1\" bestaat niet of is geen map.\n" + +#: directorymergewindow.cpp:559 msgid "Directory Open Error" -msgstr "Fout bij openen van directory" - -#: directorymergewindow.cpp:585 +msgstr "Fout bij openen van map" + +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -"De doeldirectory kan niet hetzelfde zijn als A of B als er drie directorypen " -"worden samengevoegd.\n" +"De doelmap kan niet hetzelfde zijn als A of B als er drie mappen worden " +"samengevoegd.\n" "Controleer dit opnieuw voordat u doorgaat." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parameter-waarschuwing" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Directorypen worden geanalyseerd..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" -msgstr "Inlezen van directory A" - -#: directorymergewindow.cpp:647 +msgstr "Inlezen van map A" + +#: directorymergewindow.cpp:629 msgid "Reading Directory B" -msgstr "Inlezen van directory B" - -#: directorymergewindow.cpp:669 +msgstr "Inlezen van map B" + +#: directorymergewindow.cpp:651 msgid "Reading Directory C" -msgstr "Inlezen van directory C" - -#: directorymergewindow.cpp:695 +msgstr "Inlezen van map C" + +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" -msgstr "Sommige subdirectorypen waren niet leesbaar in" - -#: directorymergewindow.cpp:700 +msgstr "Sommige submappen zijn niet ingelezen" + +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." -msgstr "Controleer de toegangsrechten van de subdirectorypen." - -#: directorymergewindow.cpp:753 +msgstr "Controleer de toegangsrechten van de submappen." + +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" -msgstr "Status van directorypenvergelijking" - -#: directorymergewindow.cpp:754 +msgstr "Status van mappenvergelijking" + +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" -msgstr "Aantal subdirectorypen:" - -#: directorymergewindow.cpp:755 +msgstr "Aantal submappen:" + +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Aantal identieke bestanden:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Aantal verschillende bestanden:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Aantal handmatige samenvoegingen:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Dit heeft effect op alle samenvoegingen." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Verandering van alle samenvoegingen" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Voortgang" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Onvoltooid." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A naar B kopiëren" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B naar A kopiëren" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A verwijderen" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B verwijderen" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A & B verwijderen" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Samenvoegen met A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Samenvoegen met B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Samenvoegen met A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Verwijderen (indien voorhanden)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Samenvoegen (handmatig)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Fout: botsende bestandstypen" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Fout: de datums zijn hetzelfde, maar de bestanden niet." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Deze handeling is momenteel niet beschikbaar." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Handeling niet mogelijk" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2358,46 +2378,46 @@ "Als u dit kunt reproduceren, neem dan contact op met de auteur van dit " "programma." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programmafout" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Er deed zich een fout voor tijdens het kopiëren.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Fout" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Fout bij samenvoegen" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fout." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Gereed." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Niet opgeslagen." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Onbekende samenvoeging. (Dit mag niet voorkomen!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Onbekende samenvoeging." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2418,27 +2438,27 @@ "GEEN ENKELE GARANTIE dat het programma naar behoren zal werken. Maak " "reservekopieën van uw vitale gegevens!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Samenvoeging starten" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Starten" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Het gemarkeerde item is van een verschillend type in de verschillende " -"directorypen. Kies wat er moet gebeuren." - -#: directorymergewindow.cpp:2184 +"mappen. Kies wat er moet gebeuren." + +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2446,15 +2466,15 @@ "De wijzigingsdatums van het bestanden zijn gelijk, maar de bestanden niet. " "Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -"Deze handeling is niet mogelijk omdat er momenteel een directory wordt " +"Deze handeling is niet mogelijk omdat er momenteel een map wordt " "samengevoegd." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2464,219 +2484,218 @@ "Wilt u doorgaan met het item dat de fout veroorzaakte of wilt u dit item " "overslaan?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Samenvoegen voortzetten na een foutmelding" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Verdergaan met het laatste item" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Item overslaan" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Overgeslagen." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "In uitvoering..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "De samenvoeging is voltooid." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Samenvoeging voltooid" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Samenvoegsimulatie is voltooid. Controleer of u akkoord kunt gaan met de " "voorgestelde handelingen." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Er deed zich een fout voor. Klik op OK voor meer details.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fout tijdens het wissen van %1: reservekopie aanmaken is mislukt." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" -msgstr "directory ( %1 ) recursief wissen" - -#: directorymergewindow.cpp:2476 +msgstr "map ( %1 ) recursief wissen" + +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "wissen ( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -"Fout: het wissen van de directory is mislukt omdat de directory niet kon " -"worden geopend." - -#: directorymergewindow.cpp:2510 +"Fout: het wissen van de map is mislukt omdat de map niet kon worden geopend." + +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "Fout: handeling voor directory verwijderen( %1 ) is mislukt." - -#: directorymergewindow.cpp:2520 +msgstr "Fout: handeling voor map verwijderen( %1 ) is mislukt." + +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fout: wissen is mislukt." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "handmatig samenvoegen ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Opmerking: na een handmatige samenvoeging dient de gebruiker verder te " "gaan via F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fout: kopiëren( %1 -> %2 ) is mislukt. De bestaande bestemming kon niet " "gewist worden." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Koppeling kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fout: koppeling kopiëren is mislukt: externe koppelingen worden vooralsnog " "niet ondersteund." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Fout: koppeling kopiëren is mislukt." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Fout tijdens het hernoemen ( %1 -> %2 ): de bestaande bestemming kan niet " "worden gewist." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "hernoemen( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Fout: hernoemen is mislukt." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -"Fout tijdens het aanmaken van de directory %1. Bestaand bestand kan niet " -"worden gewist." - -#: directorymergewindow.cpp:2694 +"Fout tijdens het aanmaken van de map %1. Bestaand bestand kan niet worden " +"gewist." + +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Directory aanmaken( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." -msgstr "Fout bij het aanmaken van de directory." - -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +msgstr "Fout bij het aanmaken van de map." + +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Doel" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Directory" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Grootte" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Laatste wijziging" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Koppelingsbestemming" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "niet beschikbaar" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (doel): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (doel): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (doel): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Doel: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." -msgstr "Staat van directorypen samenvoegen opslaan als..." - -#: directorymergewindow.cpp:2978 +msgstr "Staat van mappen samenvoegen opslaan als..." + +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Directorysamenvoeging starten/voortzetten" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Handeling uitvoeren voor huidig item" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Huidig bestand samenvoegen" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2684,39 +2703,39 @@ "Samenvoegen\n" "Bestand" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" -msgstr "Alle subdirectorypen invouwen" - -#: directorymergewindow.cpp:2983 +msgstr "Alle submappen invouwen" + +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" -msgstr "Alle subdirectorypen uitvouwen" - -#: directorymergewindow.cpp:2987 +msgstr "Alle submappen uitvouwen" + +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Voor alle items A kiezen" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Voor alle items B kiezen" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Voor alle items C kiezen" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Handeling voor alle items automatisch kiezen" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Geen handeling voor alle items" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Identieke bestanden tonen" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2724,15 +2743,15 @@ "Identieke\n" "Bestanden" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Verschillende bestanden tonen" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Bestanden alleen in A tonen" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2740,11 +2759,11 @@ "Bestanden\n" "alleen in A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Bestanden alleen in B tonen" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2752,11 +2771,11 @@ "Bestanden\n" "alleen in B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Bestanden alleen in C tonen" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2764,35 +2783,35 @@ "Bestanden\n" "alleen in C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Expliciet geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Expliciet geselecteerde bestanden samenvoegen" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Niets doen" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A && B verwijderen" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Samenvoegen met A && B" @@ -2804,11 +2823,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Doorgaan" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Stoppen" @@ -3041,11 +3060,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Samenvoegconflict (alleen witruimte)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Samenvoegingsconflict>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3053,12 +3072,22 @@ "Nog niet alle conflicten zijn opgelost.\n" "Bestand is niet opgeslagen.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Er zijn nog onopgeloste conflicten" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Er is een conflict met de stijl aan het regeleinde. Kies deze stijl " +"handmatig.\n" +"Bestand is niet opgeslagen.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3067,28 +3096,40 @@ "\n" "Het aanmaken van de reservekopie is mislukt. Het bestand is niet opgeslagen." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fout bij opslaan van het bestand" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fout bij het opslaan." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Uitvoer" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Gewijzigd]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codering voor opslaan" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Conflicten" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Codec van" @@ -3127,3 +3168,6 @@ msgstr "" "rinsedevries@kde.nl, sanderkoning@kde.nl, bramschoenmakers@kde.nl, f.de." "kruijf@hetnet.nl" + +#~ msgid "Directory Merge" +#~ msgstr "Directorysamenvoeging"
--- a/kdiff3/po/pl/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/pl/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-12-30 14:10+0100\n" "Last-Translator: Robert Gomulka <rgom@o2.pl>\n" "Language-Team: polish <pl@li.org>\n" @@ -26,100 +26,100 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "Operacja synchronizacji dla bieżącej pozycji" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Błąd otwarcia pliku" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Użyta opcja --auto, ale nie określone wyjście." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Opcja --auto-zignorowana przy porównywaniu katalogów." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Nieudany zapis." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Nieudane otwarcie następujących plików:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Błąd otwarcia pliku" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Otwieranie dokumentów do porównania..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Gotowe." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Zapisywanie rezultatu połączenia. Wszystkie konflikty muszą być rozwiązane!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Zapisywanie bieżącego dokumentu jako..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Wyjście z programu" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Wycina zaznaczony fragment i umieszcza go w schowku" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopiuje zaznaczony fragment do schowka" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Wklejanie zawartości schowka w aktualne położenie" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Znajdź tekst" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Szukaj ponownie tekstu" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Włącza/wyłącza pasek statusu" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Konfiguracja KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Idź do bieżącej różnicy" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -127,11 +127,11 @@ "Delta" msgstr "Idź do bieżącej różnicy" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Idź do pierwszej różnicy" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -139,11 +139,11 @@ "Delta" msgstr "Idź do pierwszej różnicy" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Idź do ostatniej różnicy" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -151,13 +151,13 @@ "Delta" msgstr "Idź do ostatniej różnicy" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Pomija różnice w znakach odstępu gdy opcja \"Pokaż znaki odstępu\" jest " "wyłączona)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -165,11 +165,11 @@ "(Nie pomija różnic w znakach odstępu gdy opcja \"Pokaż znaki odstępu\" jest " "wyłączona)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Idź do poprzedniej różnicy" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -177,11 +177,11 @@ "Delta" msgstr "Idź do poprzedniej różnicy" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Idź do następnej różnicy" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -189,11 +189,11 @@ "Delta" msgstr "Idź do następnej różnicy" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Idź do poprzedniego konfliktu" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -201,11 +201,11 @@ "Conflict" msgstr "Konflikty" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Idź do następnego konfliktu" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -213,11 +213,11 @@ "Conflict" msgstr "Idź do następnego konfliktu" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Idź do poprzedniego nie rozwiązanego konfliktu" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -225,11 +225,11 @@ "Unsolved" msgstr "Nierozwiązane" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Idź do następnego nie rozwiązanego konfliktu" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -237,73 +237,73 @@ "Unsolved" msgstr "Nierozwiązane" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Wybierz linie z A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Wybierz linie z B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Wybierz linie z C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automatycznie idź do następnego nierozwiązanego konfliktu po wybraniu źródła" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "Wybór auto kopiowania" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Pokaż spacje i tabulację w miejsce różnic" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Pokaż znaki odstępu" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Pokaż numery linii" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -311,182 +311,208 @@ "Numbers" msgstr "Pokaż numery linii" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Wybierz wszędzie A" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Wybierz wszędzie B" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Wybierz wszędzie C" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Automatycznie rozwiąż proste konflikty" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Zamień różnice na konflikty" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatycznie rozwiąż proste konflikty" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "Porównaj zaznaczone pliki" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Pokaż okno A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Pokaż okno B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Pokaz okno C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Uaktywnij następne okno" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normalne przeglądanie" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Przegląd różnic między A i B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Przegląd różnic między A i C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Przegląd różnic między B i C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Zawijanie wyrazów w oknach różnic" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Uaktywnij poprzednie okno" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Przełącz orientację podziału okien" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Widok dzielony katalogu i tekstu" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Przełącza między widokiem katalogów i tekstu" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Gotowe." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Rezultat połączenia nie został zapisany." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Zapisz i Wyjdź" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Zakończ bez zapisywania" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Nieudany zapis rezultatu połączenia." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Obecnie wykonujesz połączenie katalogów. Jesteś pewny że chcesz przerwać?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Zapisywanie pliku..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Zapisywanie pliku pod nową nazwą..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Wyjście..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Nr pierwszej linii na ekranie: %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "Wybierz inną czcionkę" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Operacja połączenia zakończona." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Operacja połączenia zakończona." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Wyjście..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Przełączanie paska narzędzi..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Przełączanie paska statusu..." @@ -583,28 +609,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Błąd w czasie kopiowania. Nieudany zapis. Nazwa pliku: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Czytanie katalogu: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Wyświetlenie zawartości katalogu: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Błąd zapisu zawartości schowka do pliku tymczasowego." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "ze schowka" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -619,7 +645,7 @@ "\n" "Polecenie przetwarzenia wstępnego zostanie wyłączone." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -635,7 +661,7 @@ "\n" "Polecenie przetwarzenia wstępnego dopasowywania wierszy zostanie wyłączone." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -643,7 +669,7 @@ "Błąd utraty danych:\n" "Jeśli jest powtarzalny, to skontaktuj się z autorem programu.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Poważny błąd wewnętrzny" @@ -665,8 +691,8 @@ msgid "C (Optional):" msgstr "C (Opcjonalnie):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Połącz" @@ -789,7 +815,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -973,7 +999,7 @@ "Włą: Jakiekolwiek zaznaczenie powoduje natychmiastowy zapis do schowka.\n" "Wył: Musisz jawnie skopiować np. poprzez Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Znaki końca linii:" @@ -1231,8 +1257,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Połączenia katalogów" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Katalog" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1865,7 +1893,7 @@ msgid "file3 to open" msgstr "Otwórz plik3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1883,11 +1911,6 @@ msgid "Line not available" msgstr "niedostępne" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Nr pierwszej linii na ekranie: %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Koniec" @@ -1958,27 +1981,27 @@ msgid "Linediff: A <-> C" msgstr "Różnica: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Wszystkie pliki wejściowe są binarnie równe." -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "Wszystkie wejściowe pliki zawierając ten sam tekst." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Pliki B i C są binarnie identyczne.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Pliki A i B są binarnie identyczne.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1988,55 +2011,55 @@ "Zauważ że KDiff3 nie nadaje się do łączenia danych binarnych.\n" "Kontynuuj na własne ryzyko." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "O programie" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Wznów łączenie" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Otwieranie plików..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Błąd otwarcia pliku" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Wytnij zaznaczenie..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Kopiuj zaznaczony fragment do schowka..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Wkleja zawartość schowka..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Zapisz i Kontynuuj" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Zakończ bez zapisywania" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Wynik szukania." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Połączenie zakończone" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Błąd w trakcie tworzenia katalogu." @@ -2056,70 +2079,70 @@ "Może to być spowodowane niepoprawną instalacją. Przeczytaj README aby " "uzyskać szczegółowe informacje." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Pomieszane dowiązania i normalne pliki." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Dowiązanie: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Rozmiar. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Data & Rozmiar: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Tworzenie tymczasowej kopii %1 nieudane." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Otwieranie %1 nie powiodło się." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Porównywanie pliku..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Błąd czytania z %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nazwa" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operacja" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Nierozwiązane" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Rozwiązane" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nie biały" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Biały" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2127,34 +2150,34 @@ "Obecnie wykonywane jest łączenie katalogów. Jesteś pewny że chcesz przerwać " "tą operację i ponownie przeskanować katalog?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Ponowne skanowanie" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Otwieranie katalogu nie powiodło się:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Katalog A \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Katalog B \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Katalog C \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Błąd otwierania katalogu" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2164,129 +2187,129 @@ "katalogi.\n" "Sprawdź ponownie zanim będziesz kontynuować." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Ostrzeżenie co do parametru" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Skanowanie katalogów ..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Czytanie katalogu A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Czytanie katalogu B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Czytanie katalogu C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Niektóre podkatalogi są nie do odczytu w" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Sprawdź prawa dostępu do podkatalogów." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status porównywania katalogów" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Liczba podkatalogów:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Liczba identycznych plików:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Liczba ręcznych połączeń:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "To wpłynie na wszystkie operacje łączenia." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Zmiana wszystkich operacji łączenia" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "W trakcie " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Do zrobienia." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Kopiuj A do B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Kopiuj B do A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Usuń A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Usuń B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Połącz z A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Połącz z B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Połącz z A i B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Usuń (jeśli istnieje)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Połącz (ręcznie)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Błąd: Konflikt typów plików" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Błąd: Data identyczna ale pliki nie." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Ta operacja jest w tej chwili niemożliwa." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Niemożliwa operacja" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2300,48 +2323,48 @@ "\n" "Jeśli wiesz jak to powtórzyć, proszę skontaktować się z autorem programu." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Błąd programu" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Wystąpił błąd w trakcie kopiowania.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Błąd." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Błąd połączenia" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Błąd." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Zrobione." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Niezapisane." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nieznana operacja połączenia. (To się nigdy nie powinno wydarzyć!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Nieznana operacja łączenia." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2360,33 +2383,33 @@ "Miej na uwadze że program nadal jest wersji beta i BRAK GWARANCJI co do " "wyników działania! Wykonaj kopie zapasowe swoich istotnych danych!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Rozpoczęcie połączenia" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Wykonaj" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Symuluj" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Podświetlona pozycja jest innego typu w innym katalogu. Wybierz co zrobić." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Data modyfikacji plików jest taka sama ale pliki nie. Wybierz co zrobić." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2394,7 +2417,7 @@ "Ta operacja jest nie możliwa do wykonania w tej chwili gdyż obecnie " "wykonywana jest operacja połączenia katalogów." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2403,215 +2426,215 @@ "W ostatnim kroku wystąpił błąd.\n" "Chcesz kontynuować z pozycja która powoduje błąd czy tez pominąć tą pozycję?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Kontynuuj połączenie po błędzie" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Kontynuuj z ostatnią pozycją" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Pomiń pozycję" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Pominięto." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "W trakcie..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Operacja połączenia zakończona." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Połączenie zakończone" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Symulacja połączenia zakończona. Sprawdź czy zgadzasz się na zaproponowane " "operacje." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Wystąpił błąd. Wciśnij OK aby zobaczyć szczegółowe informacje.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Błąd: W trakcie usuwania %1: Błąd tworzenia kopii zapasowej." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "usuwaj katalogi rekursywnie( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "usuń( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Błąd: Nieudane usuwanie katalogu w momencie próby czytania katalogu." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Błąd: rmdir( %1 ) operacja nieudana." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Błąd: Nieudana operacja usuwania." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ręczne połączenie( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Uwaga: Po ręcznym połączeniu użytkownik powinien kontynuować wciskając " "F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Błąd: Nieudane kopiowanie( %1 -> %2 ) .Nieudane kasowanie katalogu " "docelowego." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Błąd: Nie udane copyLink: Odległe dowiązania nie są jeszcze obsługiwane." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Błąd: Nieudane copyLink." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiowanie( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Błąd w czasie zmiany nazwy( %1 -> %2 ): Nie można usunąć istniejącego " "miejsca docelowego." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "zmiana nazwy( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Błąd: Nieudana zmiana nazwy." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Błąd w czasie makeDir %1. Nie można usunąć istniejącego pliku." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Błąd w trakcie tworzenia katalogu." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Cel" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Rozmiar" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atrybut" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Ostatnia modyfikacja" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Dowiązanie do pliku" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "niedostępne" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Cel): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Podstawa): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Cel): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Cel): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Cel: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Połączenia katalogów" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Start/Kontynuuj Połączenie Katalogów " -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "wykonaj operację na bieżącej pozycji" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Połącz bieżący plik" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2619,110 +2642,110 @@ "File" msgstr "Połącz" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Uwzględnij podkatalogi" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Nie uwzględniaj podkatalogów" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Wybierz A dla wszystkich pozycji" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Wybierz B dla wszystkich pozycji" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Wybierz C dla wszystkich pozycji" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Automatyczny wybór dla wszystkich pozycji" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Brak operacji dla wszystkich pozycji" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nic nie rób" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Połącz z A i B" @@ -2734,13 +2757,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "K&ontynuuj" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -3005,11 +3028,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Konflikt łączenia (tylko znaki odstępu)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Konflikt połączenia>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3017,12 +3040,19 @@ "Nie wszystkie konflikty zostały rozwiązane.\n" "Plik nie został zapisany.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Pozostałe konflikty" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3031,29 +3061,43 @@ "\n" "Tworzenie pliku zapasowego nie powiodło się. Plik nezapisany." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Błąd zapisu pliku" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Błąd w czasie zapisu." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Wyjście" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[zmodyfikowane]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "Kodowanie pliku C:" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Konflikty" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3091,6 +3135,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "Połączenia katalogów" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -3104,10 +3151,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Włącza/wyłącza pasek narzędzi" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Operacja połączenia zakończona." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Pliki A i B są binarnie identyczne.\n"
--- a/kdiff3/po/pt/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/pt/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-27 19:28+0000\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-18 18:52+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" "Language-Team: pt <kde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" @@ -25,98 +25,98 @@ "X-POFile-SpellExtra: Rusu Help Koehler Denio Andre Eggert Partheymueller\n" "X-POFile-SpellExtra: Haertel Astals\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configuração Actual:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Erro da Opção de Configuração:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "" "A opção --auto foi indicada, mas não foi especificado nenhum ficheiro de " "saída." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "A opção --auto é ignorada para a comparação de pastas." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "A gravação falhou." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "O acesso a estes ficheiros falhou:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Erro de Acesso ao Ficheiro" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Abre os documentos para os comparar..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Actualizar" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Grava o resultado da gravação. Todos os conflitos devem ficar resolvidos!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Grava o documento actual como..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Sai da aplicação" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a secção seleccionada e coloca-a na área de transferência" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copia a secção seleccionada para a área de transferência" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Cola o conteúdo da área de transferência na posição actual" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Selecciona tudo na janela actual" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Procura por um texto" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Procura de novo pelo texto" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Activa/desactiva a barra de estado" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configurar o KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Ir para o Delta Actual" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -124,11 +124,11 @@ "Delta\n" "Actual" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Ir para o Primeiro Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -136,11 +136,11 @@ "Primeiro\n" "Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Ir para o Último Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -148,13 +148,13 @@ "Último\n" "Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenças de espaço em branco quando \"Mostrar os Espaços em " "Branco\" está desactivado.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -162,11 +162,11 @@ "(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os " "Espaços em Branco\" está desactivado.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Ir para o Delta Anterior" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -174,11 +174,11 @@ "Delta\n" "Anterior" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Ir para o Próximo Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -186,11 +186,11 @@ "Delta\n" "Seguinte" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Ir para o Conflito Anterior" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -198,11 +198,11 @@ "Conflito\n" "Anterior" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Ir para o Próximo Conflito" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -210,11 +210,11 @@ "Conflito\n" "Seguinte" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Anterior" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -222,11 +222,11 @@ "Não Resolvido\n" "Anterior" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Seguinte" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -234,11 +234,11 @@ "Não Resolvido\n" "Seguinte" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Seleccionar as Linhas do A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -246,11 +246,11 @@ "Escolher\n" "o A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Seleccionar as Linhas do B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -258,11 +258,11 @@ "Escolher\n" "o B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Seleccionar as Linhas do C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -270,13 +270,13 @@ "Escolher\n" "o C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir Automaticamente para o Próximo Conflito por Resolver Após a Selecção do " "Código" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -284,11 +284,11 @@ "Seguinte\n" "Automático" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar as Diferenças de Espaços e Tabulações" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -296,11 +296,11 @@ "Espaços\n" "em Branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Mostrar os Espaços em Branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -308,11 +308,11 @@ "Diferenças\n" "em Branco" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Mostrar os Números de Linha" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -320,181 +320,201 @@ "Números\n" "de Linha" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Escolher o A em Todo o Lado" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Escolher o B em Todo o Lado" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Escolher o C em Todo o Lado" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Escolher A em Todos os Conflitos por Resolver" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Escolher B em Todos os Conflitos por Resolver" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Escolher C em Todos os Conflitos por Resolver" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolher A em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolher B em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolher C em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Resolver Automaticamente os Conflitos Simples" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Passar os Deltas para Conflitos" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Executar a Junção Automática de Expressões Regulares" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Resolver Automaticamente os Conflitos do Histórico" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Dividir a Diferença na Selecção" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Juntar as Diferenças Seleccionadas" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Mostrar a Janela A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Mostrar a Janela B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Mostrar a Janela C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Foco na Próxima Janela" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Vista Normal" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Quebrar Linha nas Janelas de Diferenças" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Adicionar o Alinhamento Manual das Diferenças" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Limpar Todos os Alinhamentos de Diferenças Manuais" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Foco na Janela Anterior" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Comutar a Orientação da Repartição" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Janela Repartida de Pastas e Texto" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Mudar Entre a Janela de Pastas e de Texto" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Pronto." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "O resultado da junção não foi ainda gravado." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Aviso" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Gravar e Sair" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Sair sem Gravar" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "A gravação do resultado da junção falhou." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Você está a fazer uma junção de pastas de momento. Tem a certeza que quer " "interromper?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "A gravar o ficheiro..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "A gravar o ficheiro com um novo nome..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Gravar Como..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "A imprimir..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Linha de topo" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Selecção" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "A impressão terminou." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "A impressão foi interrompida." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "A sair..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "A comutar a barra de ferramentas..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Comutar a barra de estado..." @@ -594,30 +614,30 @@ msgstr "" "Erro durante a operação de cópia do ficheiro: A escrita falhou. Ficheiro: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "A ler a pasta: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "A analisar a pasta: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Cancelar" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" "A escrita de dados da área de transferência para o ficheiro temporário " "falhou." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Da Área de Transferência" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -630,7 +650,7 @@ " %1\n" "O comando de pré-processamento vai ser desactivado." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -644,7 +664,7 @@ " %1\n" "O comando de pré-processamento com procura de linhas vai ser desactivado." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -652,7 +672,7 @@ "Erro de perda de dados:\n" "Se for reprodutível, contacte por favor o autor.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Erro Interno Grave" @@ -674,8 +694,8 @@ msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Reunir" @@ -805,7 +825,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Cancelar" @@ -987,7 +1007,7 @@ "Ligado: Qualquer selecção é posta automaticamente na área de transferência.\n" "Desligado: Você tem de copiar explicitamente, p.ex., com o Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Estilo de fim de linha:" @@ -1282,8 +1302,8 @@ "(Semelhante à opção da linha de comandos \"--auto\"." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Junção de Pastas" +msgid "Directory" +msgstr "Pasta" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1929,7 +1949,7 @@ msgid "file3 to open" msgstr "o ficheiro 3 a abrir" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Ficheiro" @@ -1941,10 +1961,6 @@ msgid "Line not available" msgstr "Linha não disponível" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Linha de topo" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Fim" @@ -2016,29 +2032,29 @@ msgid "Linediff: A <-> C" msgstr "Dif. Linhas: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada são iguais a nível binário." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Todos os ficheiros de entrada contêm o mesmo texto, mas não são iguais a " "nível binário." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Os ficheiros %1 e %2 são iguais a nível binário.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os ficheiros %1 e %2 têm texto igual, mas não são iguais a nível binário.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2048,56 +2064,56 @@ "Lembre-se que a junção do KDiff3 não foi pensada para os dados binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continuar a Junção" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "A aceder aos ficheiros..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Erro ao abrir o ficheiro" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "A cortar a selecção..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "A copiar a selecção para a área de transferência..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "A inserir o conteúdo da área de transferência..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Gravar e Continuar" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continuar sem Gravar" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Procura Terminada" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" "Não está nada seleccionado em nenhuma janela de entrada das diferenças." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" @@ -2111,70 +2127,70 @@ "Isto acontece normalmente devido a um problema de instalação. Leia por favor " "o ficheiro README no pacote de código para mais detalhes." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mistura de ligações e ficheiros normais." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Ligação: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Data e Tamanho: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "A criação da cópia temporária do %1 falhou." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "O acesso ao %1 foi mal-sucedido." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "A comparar o ficheiro..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2182,34 +2198,34 @@ "Você está neste momento a fazer uma junção de pastas. Tem a certeza que " "deseja interromper a junção e analisar a pasta de novo?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Pesquisar de Novo" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "O acesso às pastas foi mal-sucedido:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A pasta A \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "A pasta B \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "A pasta C \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Erro de Acesso à Pasta" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2219,129 +2235,129 @@ "três pastas.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Aviso do Parâmetro" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "A pesquisar as pastas..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "A Ler a Pasta A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "A Ler a Pasta B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "A Ler a Pasta C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Algumas das sub-pastas não eram legíveis" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões das sub-pastas." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Estado da Comparação da Pasta" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Número de sub-pastas:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Número de ficheiros iguais:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Número de ficheiros diferentes:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Número de junções manuais:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Isto afecta todas as operações de junção." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "A Mudar Todas as Operações de Junção" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "A processar " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Juntar a A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Juntar a B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Juntar a A e B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Juntar (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Ficheiros em Conflito" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os ficheiros não." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Esta operação não é possível de momento." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2355,46 +2371,46 @@ "\n" "Se souber como reproduzir isto, contacte por favor o autor do programa." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Erro na Junção" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Não gravado." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de junção desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Operação de junção desconhecida." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2413,19 +2429,19 @@ "Tenha em atenção que este programa está ainda em estado Beta e NÃO EXISTE " "NENHUMA GARANTIA! Faça cópias de segurança dos seus dados vitais!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "A Iniciar a Junção" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Fazê-lo" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulá-lo" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2433,7 +2449,7 @@ "O item realçado tem um tipo diferente nas várias pastas. Seleccione o que " "fazer." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2441,7 +2457,7 @@ "As datas de modificação dos ficheiros são iguais mas estes não o são. " "Seleccione o que fazer." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2449,7 +2465,7 @@ "Esta operação não é possível de momento que a junção da pasta está a " "decorrer." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2458,212 +2474,212 @@ "Ocorreu um erro no último passo.\n" "Deseja continuar com o item que causou o erro ou deseja saltar este item?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continuar a junção após um erro" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Saltar o Item" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "A operação de junção terminou." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Junção Completa" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação da junção terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocorreu um erro. Carregue em OK para ver a informação detalhada.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar o %1: a criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "apagar recursivamente as pastas( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Erro: a operação de remoção da pasta falhou ao tentar ler a pasta." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operação rmdir( %1 ) falhou." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "junção manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Após uma junção manual o utilizador deve continuar com o F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erro: a cópia( %1 -> %2 ) falhou. A remoção do destino existente falhou." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: o copyLink falhou: As ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Erro: o copyLink falhou." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante o rename( %1 -> %2 ): Não é possível remover o destino " "existente." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Erro: A mudança de nome falhou." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante o makeDir do %1. Não é possível remover o ficheiro existente." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Erro ao criar a pasta." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Última Modificação" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Gravar o Estado da Junção de Pastas Como..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a Junção da Pasta" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Executar a Operação no Item Actual" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Comparar o Ficheiro Seleccionado" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Juntar o Ficheiro Actual" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2671,39 +2687,39 @@ "Reunir o\n" "Ficheiro" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Fechar Todas as Sub-Pasta" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Expandir Todas as Sub-Pastas" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Seleccionar Todos os Itens do A" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Seleccionar Todos os Itens do B" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Seleccionar Todos os Itens do C" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Mostrar os Ficheiros Idênticos" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2711,15 +2727,15 @@ "Ficheiros\n" "Idênticos" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Mostrar os Ficheiros Diferentes" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Mostrar os Ficheiros Apenas no A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2727,11 +2743,11 @@ "Ficheiros \n" "Apenas no A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Mostrar os Ficheiros Apenas no B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2739,11 +2755,11 @@ "Ficheiros\n" "Apenas no B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Mostrar os Ficheiros Apenas no C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2751,35 +2767,35 @@ "Ficheiros\n" "Apenas no C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Comparar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Juntar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Não Fazer Nada" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Juntar a A e B" @@ -2791,11 +2807,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Continuar" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Sair" @@ -3029,11 +3045,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Conflito na Junção (Apenas espaço em branco)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Conflito na Junção>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3041,12 +3057,22 @@ "Nem todos os conflitos estão ainda resolvidos.\n" "O ficheiro não foi gravado.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Conflitos Restantes" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Existe um conflito de fins de linha. Escolha por favor o estilo " +"manualmente.\n" +"O ficheiro não foi gravado.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3055,28 +3081,40 @@ "\n" "A criação de salvaguarda falhou. Ficheiro não gravado." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Erro na Gravação do Ficheiro" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Erro ao gravar." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Resultado" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codificação da gravação" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Conflito" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Codificador de"
--- a/kdiff3/po/pt_BR/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/pt_BR/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,116 +1,116 @@ # tradução do kdiff3.po para Brazilian Portuguese -# Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # Paulo Henrique Alkmin da Costa <phalkmin@yahoo.com.br>, 2003. # Lisiane Sztoltz <lisiane@conectiva.com.br>, 2003. # Lisiane Sztoltz Teixeira <lisiane@conectiva.com.br>, 2004. # Diniz Fernando Bortolotto Ferreira <diniz.bortolotto@gmail.com>, 2006. # Diniz Bortolotto <diniz.bortolotto@gmail.com>, 2006, 2007, 2008. -# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2008. +# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-11-27 23:03-0200\n" -"Last-Translator: André Marcelo Alvarenga <andrealvarenga@gmx.net>\n" -"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@mail.kde.org>\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-18 15:23-0300\n" +"Last-Translator: Luiz Fernando Ranghetti <elchevive@opensuse.org>\n" +"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\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" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" -msgstr "Configuração Atual:" - -#: kdiff3.cpp:172 +msgstr "Configuração atual:" + +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Erro da Opção de Configuração:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Opção --auto usada, mas nenhum arquivo de saída especificado." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Opção --auto ignorada para comparação de diretórios." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Falha ao salvar." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Abertura desses arquivos falhou: " -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Erro na abertura do arquivo" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Abre documentos para comparação..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Atualizar" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salva o resultado da mesclagem. Todos os conflitos precisam ser resolvidos!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Salva o documento atual como..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Fecha o aplicativo" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Recorta a seção selecionada e a coloca na Área de Transferência" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copia a seção selecionada para a área de transferência" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Cola o conteúdo da área de transferência na posição atual" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Seleciona tudo na janela atual" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Procura por um texto" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Procura de novo pelo texto" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Habilita / Desabilita a barra de status" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Vá para o Delta Atual" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -118,11 +118,11 @@ "Delta\n" "Atual" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Vá para o Primeiro Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -130,11 +130,11 @@ "Primeiro\n" "Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Vá para o Último Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -142,13 +142,13 @@ "Último\n" "Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenças de espaço em branco quando \"Mostrar os Espaços em " "Branco\" está desativado.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -156,11 +156,11 @@ "(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os " "Espaços em Branco\" está desativado.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Vá para o Delta Anterior" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -168,11 +168,11 @@ "Delta\n" "Anterior" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Vá para o Próximo Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -180,11 +180,11 @@ "Delta\n" "Seguinte" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Vá para o Conflito Anterior" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -192,11 +192,11 @@ "Conflito\n" "Anterior" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Vá para o Próximo Conflito" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -204,11 +204,11 @@ "Conflito\n" "Seguinte" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Vá para o Conflito Não-Resolvido Anterior." -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -216,11 +216,11 @@ "Não Resolvido\n" "Anterior" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Vá para o Próximo Conflito Não-Resolvido" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -228,11 +228,11 @@ "Não Resolvido\n" "Seguinte" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Seleciona Linha(s) De A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -240,11 +240,11 @@ "Escolher\n" "o A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Seleciona Linha(s) De B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -252,11 +252,11 @@ "Escolher\n" "o B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Selecione Linha(s) De C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -264,13 +264,13 @@ "Escolher\n" "o C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir Automaticamente para o Próximo Conflito Não-Resolvido Após a Seleção da " "Fonte." -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -278,11 +278,11 @@ "Seguinte\n" "Automático" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar as Diferenças de Espaços e Tabulações" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -290,11 +290,11 @@ "Espaços\n" "em Branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Mostrar Espaços em Branco" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -302,11 +302,11 @@ "Diferenças\n" "em Branco" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Mostrar Números de Linha" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -314,181 +314,201 @@ "Números\n" "de Linha" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Escolher A em qualquer lugar" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Escolher B em qualquer lugar" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Escolher C em qualquer lugar" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Escolha A em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Escolha B em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Escolha C em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolha A em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolha B em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolha C em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Resolva Conflitos Simples Automaticamente" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Defina Delta para Conflitos" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Executar Mesclagem Automática de Expressões Regulares" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Resolva Conflitos de Histórico Automaticamente" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Dividir Diferenças ao Selecionar" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Juntar Diferenças Selecionadas" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Mostrar Janela A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Mostrar Janela B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Mostrar Janela C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Foco na Próxima Janela" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Visão Normal" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Visão A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Visão A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Visão B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Quebrar Linha nas Janelas de Diferenças" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Adicionar Alinhamento Manual das Diferenças" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Limpar Todos Alinhamentos de Diferenças Manuais" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Foco na Janela Anterior" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Alterar Orientação da Divisão" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Janela Dividida de Diretórios e Texto" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Alternar entre visualização de Diretório e Texto" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Pronto." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "O resultado da Mesclagem não foi salvo." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Aviso" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Salvar e Sair" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Sair sem Salvar" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Falha ao salvar o resultado da mesclagem" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Você está fazendo uma mesclagem de diretórios. Tem certeza de que deseja " "cancelar?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Salvando arquivo...." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Salvando arquivo com um novo nome..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Salvar Como..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Imprimindo..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Linha de topo" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Seleção" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Impressão concluída." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Impressão cancelada." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Saindo..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Mudando Barra de Ferramentas..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Mudar a Barra de Status..." @@ -590,30 +610,30 @@ "Erro durante operação de cópia de arquivo: Escrita falhou. Nome do Arquivo: %" "1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Lendo diretório: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listando diretório: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Cancelar" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" "A gravação de dados da área de transferência para o arquivo temporário " "falhou." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Da Área de Transferência" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -628,7 +648,7 @@ "\n" "O comando de pré-processamento vai ser desativado." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -644,7 +664,7 @@ "\n" "O comando de pré-processamento com procura de linhas vai ser desativado." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -652,7 +672,7 @@ "Erro de perda de dados:\n" "Se for reproduzível por favor contate o autor.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Erro Interno Grave" @@ -674,8 +694,8 @@ msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Mesclar" @@ -806,7 +826,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Cancelar" @@ -990,7 +1010,7 @@ "Transferência.\n" "Desligado: Você deve explicitamente copiar, p.ex. via Ctrl+C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Estilo de fim de linha:" @@ -1244,7 +1264,8 @@ #: optiondialog.cpp:1032 msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -"Cortar após o número indicado. Usar -1 para um número infinito de elementos." +"Recortar após o número indicado. Usar -1 para um número infinito de " +"elementos." #: optiondialog.cpp:1036 msgid "Test your regular expressions" @@ -1282,8 +1303,8 @@ "(Semelhante à opção de linha de comando \"--auto\"." #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Mesclagem de Diretório" +msgid "Directory" +msgstr "Diretório" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1928,7 +1949,7 @@ msgid "file3 to open" msgstr "arquivo 3 abrindo" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Arquivo" @@ -1940,10 +1961,6 @@ msgid "Line not available" msgstr "Linha não disponível" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Linha de topo" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Fim" @@ -2015,29 +2032,29 @@ msgid "Linediff: A <-> C" msgstr "Dif. Linhas: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Todos os arquivos de entrada são iguais em nível binário." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Todos os arquivos de entrada contêm o mesmo texto, mas não são iguais em " "nível binário." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Os arquivos %1 e %2 são iguais em nível binário.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os arquivos %1 e %2 têm texto igual, mas não são iguais em nível binário.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2047,55 +2064,55 @@ "Lembre-se que a mesclagem do KDiff3 não foi pensada para dados binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Continuar Mesclando" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Abrindo arquivos..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Erro ao abrir o arquivo" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Recortando seleção..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Copiando seleção para a área de transferência..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Inserindo conteúdo da Área de Transferência..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Salvar e Continuar" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Continuar sem Salvar" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Procura Terminada" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Nada foi selecionado em nenhuma janela de entrada de diferenças." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" @@ -2109,70 +2126,70 @@ "Isso normalmente acontece devido a um problema na instalação. Por favor, " "leia o arquivo README no pacote de fontes para detalhes." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Mistura de links e arquivos normais." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Data e Tamanho: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "A criação da cópia temporária de %1 falhou." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "O acesso a %1 falhou." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Comparando arquivo..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2180,34 +2197,34 @@ "Você está neste momento fazendo uma mesclagem de diretórios. Tem certeza que " "deseja interromper a mesclagem e analisar o diretório de novo?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Pesquisar de Novo" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Abertura de diretórios falhou:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Erro na abertura do Diretório" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2217,129 +2234,129 @@ "três diretórios.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Aviso de Parâmetro" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Pesquisando diretórios..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Lendo Diretório A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Lendo Diretório B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Lendo Diretório C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Alguns sub-diretórios não eram legíveis" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões dos sub-diretórios." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status da Comparação de Diretório" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Número de sub-diretórios:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Número de arquivos iguais:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Número de arquivos diferentes:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Número de mesclagens manuais:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Isto afeta todas as operações de mesclagem." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Mudando Todas as Operações de Mesclagem" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Processando " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Fazer." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Mesclar com A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Mesclar com B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Mesclar com A e B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Mesclar (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Arquivos em Conflito" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os arquivos não." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Esta operação não é possível no momento." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2353,46 +2370,46 @@ "\n" "Se souber como reproduzir isto, contate por favor o autor do programa." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Erro na Mesclagem" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Não salvo." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de mesclagem desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Operação de mesclagem desconhecida." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2411,19 +2428,19 @@ " Saiba que esse programa ainda está em fase beta, e NÃO HÁ GARANTIA alguma! " "Faça backups dos seus dados!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Iniciando Mesclagem" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Faça" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simular" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2431,7 +2448,7 @@ "O item selecionado tem um tipo diferente nos diferentes diretórios. " "Selecione o que fazer." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2439,7 +2456,7 @@ "As datas de modificação do arquivo são iguais mas os arquivos não são. " "Selecione o que fazer." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2447,7 +2464,7 @@ "Esta operação não é possível no momento porque uma mesclagem de diretório " "está em execução." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2456,214 +2473,214 @@ "Houve um erro no último passo.\n" "Você quer continuar com o item que causou o erro ou prefere pular esse item?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Continuar mesclagem após um erro" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Pular Item" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Operação de mesclagem completa." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Mesclagem completa." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação de mesclagem terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocorreu um erro. Pressione OK para ver informações detalhadas.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar %1: Criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "apagar diretório recursivamente( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "apagar( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operação de remoção de diretório falhou quando tentava ler o " "diretório." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: rmdir( %1 ) operação falhou." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "mesclagem manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Após uma mesclagem manual o usuário deve continuar pressionando " "F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: cópia( %1 -> %2 ) falhou. Remoção do destino existente falhou." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: copyLink falhou: Ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Erro: copyLink falhou." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante renomear( %1 -> %2 ): Não é possível remover o destino " "existente." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renomear( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Erro: Renomear falhou." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante makeDir de %1. Não foi possível remover o arquivo existente." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Erro ao criar diretório." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Destino" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atributos" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Última modificação" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Destino):" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Destino): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Destino: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Salvar o Estado da Mesclagem de Diretório Como..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar Mesclagem de Diretório" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Executar Operação para o Item Atual" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Comparar Arquivo Selecionado" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Mesclar Arquivo Atual" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2671,39 +2688,39 @@ "Mesclar\n" "Arquivo" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Fechar Todos Sub-diretórios" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Expandir Todos Sub-diretórios" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Selecionar Todos os Itens de A" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Selecionar Todos os Itens de B" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Selecionar Todos os Itens de C" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Mostrar Arquivos Idênticos" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2711,15 +2728,15 @@ "Arquivos\n" "Idênticos" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Mostrar os Arquivos Diferentes" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Mostrar Arquivos apenas em A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2727,11 +2744,11 @@ "Arquivos\n" "apenas em A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Mostrar Arquivos apenas em B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2739,11 +2756,11 @@ "Arquivos\n" "apenas em B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Mostrar Arquivos apenas em C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2751,35 +2768,35 @@ "Arquivos\n" "apenas em C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Comparar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Mesclar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Não Faça Nada" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Mesclar para A e B" @@ -2791,11 +2808,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Continuar" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Sair" @@ -2899,7 +2916,7 @@ #: kreplacements/kreplacements.cpp:645 msgid "Cut" -msgstr "Cortar" +msgstr "Recortar" #: kreplacements/kreplacements.cpp:653 msgid "Copy" @@ -3028,11 +3045,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Conflito de Mesclagem (Apenas espaços em branco)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Conflito de Mesclagem>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3040,12 +3057,21 @@ "Nem todos os conflitos foram resolvidos.\n" "Arquivo não foi salvo.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Conflitos Restantes" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Existe um conflito de fins de linha. Escolha o estilo manualmente.\n" +"O arquivo não foi salvo.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3054,28 +3080,40 @@ "\n" "Criação do backup falhou. Arquivo não salvo." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Erro ao salvar arquivo" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Erro ao gravar." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Saída" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Codificação da gravação" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Conflito" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Codificador de" @@ -3112,3 +3150,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "diniz.bortolotto@gmail.com" + +#~ msgid "Directory Merge" +#~ msgstr "Mesclagem de Diretório"
--- a/kdiff3/po/pt_BR/kdiff3plugin.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/pt_BR/kdiff3plugin.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,16 +1,15 @@ # tradução do kdiff3plugin.po para Brazilian Portuguese -# translation of kdiff3plugin.po to Brazilian Portuguese # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # # Luiz Fernando Ranghetti <elchevive@opensuse.org>, 2008. -# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2008. +# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-08-05 08:32+0200\n" -"PO-Revision-Date: 2008-11-26 00:22-0200\n" +"PO-Revision-Date: 2009-01-10 01:35-0200\n" "Last-Translator: André Marcelo Alvarenga <andrealvarenga@gmx.net>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n" "MIME-Version: 1.0\n" @@ -36,11 +35,11 @@ #: kdiff3plugin.cpp:126 #, kde-format msgid "Save '%1' for later" -msgstr "" +msgstr "Salvar '%1' para mais tarde" #: kdiff3plugin.cpp:132 msgid "3-way merge with base" -msgstr "" +msgstr "Mescar 3 níveis com a base" #: kdiff3plugin.cpp:139 msgid "Compare with ..." @@ -56,7 +55,7 @@ #: kdiff3plugin.cpp:163 msgid "3 way comparison" -msgstr "" +msgstr "Comparação em 3 níveis" #: kdiff3plugin.cpp:167 msgid "About KDiff3 menu plugin ..." @@ -84,3 +83,13 @@ "destination.\n" "Same also applies to directory comparison and merge." msgstr "" +"Utilização da extensão do menu de contexto:\n" +"Para uma comparação simples de dois arquivos selecionados, escolha a opção " +"\"Comparar\".\n" +"Se o outro arquivo não estiver no mesmo local, você pode \"Salvar\" o " +"primeiro arquivo mais tarde. Aparecerá então no submenu \"Comparar com...\". " +"Então poderá usar a opção \"Comparar com\" no segundo arquivo.\n" +"Para uma mesclagem em 3 níveis, primeiro pode \"Salvar\" o arquivo de base, " +"depois a ramificação a reunir e depois escolha a opção \"mesclar a 3 níveis " +"com a base\" sobre a ramificação que servirá de destino.\n" +"O mesmo se aplica à comparação e reunião de pastas."
--- a/kdiff3/po/ro/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ro/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: @PACKAGE\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2008-12-30 14:55+0200\n" "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n" "Language-Team: Romanian <kde-i18n-ro@lists.kde.org>\n" @@ -18,434 +18,457 @@ "Plural-Forms: Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > " "0 && n%100 < 20)) ? 1 : 2;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Configurație actuală:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Eroare opțiune de configurare:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Opțiunea --auto utilizată, dar niciun fișier de ieșire specificat." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Opțiunea --auto ignorată pentru compararea directoarelor." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Salvarea a eșuat." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Deschiderea acestor fișiere a eșuat:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Eroare la deschiderea fișierului" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Deschide documente pentru comparare..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Reîncarcă" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Salvează rezultatul combinării. Toate conflictele trebuiesc rezolvate!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Salvează documentul actual ca..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Tipărește diferențele" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Iese din aplicație" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Taie secțiunea selectată și o pune în clipboard" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Copiază secțiunea selectată în clipboard" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Lipește conținutul clipboard-ului la poziția curentă" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Activează/dezactivează bara de stare" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy msgid "Show Line Numbers" msgstr "Afișează &numerele de linie" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Arată fereastra A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Arată fereastra B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Arată fereastra C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Focalizează fereastra următoare" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Sumar normal" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Sumar A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Sumar A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Sumar B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Focalizează fereastra precedentă" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Gata." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Avertisment" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Salvează și ieși" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Ieși fără a salva" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Salvare fișier..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Salvare ca..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Tipărește..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Font" +msgid "Selection" +msgstr "Selectare font" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "" + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Termin..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Comut afișarea barei de unelte..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Comut afișarea barei de stare..." @@ -534,28 +557,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Renunță" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Din clipboard" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -565,7 +588,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -575,13 +598,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "" @@ -603,8 +626,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Combinație" @@ -727,7 +750,7 @@ msgid "OK" msgstr "OK" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Renunță" @@ -901,7 +924,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1139,8 +1162,9 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "" +#, fuzzy +msgid "Directory" +msgstr "Director" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1700,7 +1724,7 @@ msgid "file3 to open" msgstr "fișier3 de deschis" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy msgid "File" msgstr "Fișier:" @@ -1713,10 +1737,6 @@ msgid "Line not available" msgstr "" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Sfîrșit" @@ -1784,82 +1804,82 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Abandonează" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 #, fuzzy msgid "File open error" msgstr "Eroare la deschiderea fișierului" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Tai selecția..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Copiez selecția în clipboard..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Inserez conținutul clipboard-ului..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1870,234 +1890,234 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 #, fuzzy msgid "Link: " msgstr "Legătură" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 #, fuzzy msgid "Size. " msgstr "Mărime " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Eroare la citirea din %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Denumire" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Operație" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Stare" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Nesoluționat" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Soluționat" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Alb" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Recitire" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Deschiderea directoarelor a eșuat:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Directorul A „%1” nu există sau nu este un director.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Directorul B „%1” nu există sau nu este un director.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Directorul C „%1” nu există sau nu este un director.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Eroare la deschiderea directorului" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Avertizare parametru" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Scanare directoare..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Citire director A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Citire director B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Citire director C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Verificați permisiunile subdirectoarelor." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Starea comparării directoarelor" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Numărul de subdirectoare:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Numărul de fișiere egale:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Numărul de fișiere diferite:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Numărul de combinări manuale:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Aceasta afectează toate operațiile de combinare." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Procesare " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "De făcut." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Copiază A în B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Copiază B în A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Șterge A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Șterge B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Șterge A și B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Șterge (dacă există)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Combină (manual)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Această operație nu este posibilă momentan." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Operație imposibilă" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2106,46 +2126,46 @@ "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Eroare program" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "A intervenit o eroare în timpul copierii.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Eroare" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Eroare de combinare" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Eroare." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Gata." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Nesalvat." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2157,280 +2177,280 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Execută" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulează" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "În curs..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, fuzzy, kde-format msgid "delete( %1 )" msgstr "Ș&terge" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, fuzzy, kde-format msgid "copy( %1 -> %2 )" msgstr "C&opiază" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, fuzzy, kde-format msgid "rename( %1 -> %2 )" msgstr "&Redenumire" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Eroare la crearea directorului." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Dimensiune" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Ultima modificare" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Destinație-legătură" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "indisponibil" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Bază): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Compară fișierul ales" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Arată fișiere identice" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2438,69 +2458,69 @@ "Fișiere\n" "identice" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Arată fișiere diferite" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Nu fă nimic" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "" @@ -2512,12 +2532,12 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy msgid "Continue" msgstr "Continuare" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 #, fuzzy msgid "Quit" msgstr "Termină" @@ -2762,51 +2782,71 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 #, fuzzy msgid "Output" msgstr "Rezultat" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 #, fuzzy msgid "[Modified]" msgstr "Modificat" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +msgid "Conflict" +msgstr "conflicte" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr ""
--- a/kdiff3/po/ru/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ru/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-02-01 10:56+0200\n" "Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n" "Language-Team: <kde-russian@lists.kde.ru>\n" @@ -17,98 +17,98 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Ошибка открытия файлов" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Ключ --auto использован, но не указаны выходные файлы." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Ключ --auto игнорируется для каталогов" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Не удалось произвести сохранение." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Не удалось открыть файлы:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Ошибка открытия файлов" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Открыть файлы для сравнения..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Готово." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Сохранить с другим именем..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Выйти" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вырезать в буфер обмена" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Скопировать в буфер обмена" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Вставить из буфера обмена" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Искать текст" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Продолжить поиск текста" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Отобразить/скрыть панель состояния" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Настроить KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Перейти к текущему различию" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -116,11 +116,11 @@ "Delta" msgstr "Перейти к текущему различию" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Перейти к первому различию" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -128,11 +128,11 @@ "Delta" msgstr "Перейти к первому различию" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Перейти к последнему различию" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -140,21 +140,21 @@ "Delta" msgstr "Перейти к последнему различию" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Перейти к предыдущему различию" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -162,11 +162,11 @@ "Delta" msgstr "Перейти к предыдущему различию" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Перейти к следующему различию" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -174,11 +174,11 @@ "Delta" msgstr "Перейти к следующему различию" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Перейти к предыдущему конфликту" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -186,11 +186,11 @@ "Conflict" msgstr "Конфликты" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Перейти к следующему конфликту" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -198,11 +198,11 @@ "Conflict" msgstr "Перейти к следующему конфликту" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Перейти к предыдущему неразрешённому конфликту" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -210,11 +210,11 @@ "Unsolved" msgstr "Неразрешённый" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Перейти к следующему неразрешённому конфликту" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -222,73 +222,73 @@ "Unsolved" msgstr "Неразрешённый" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Выбрать строки из A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Выбрать строки из B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Выбрать строки из C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Перейти к следующему неразрешённому конфликту после выделения исходника" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "Копировать выделение в буфер обмена автоматически" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Отображать пробелы и табуляции в различиях" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Отображать пустые промежутки" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Отображать номера строк" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -296,181 +296,207 @@ "Numbers" msgstr "Отображать номера строк" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Выбрать A везде" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Выбрать B везде" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Выбрать C везде" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Разрешать простые конфликты автоматически" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Определить различия как конфликты" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Разрешать простые конфликты автоматически" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "Сравнить выделенный файл" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Отобразить окно A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Отобразить окно B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Отобразить окно C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Активировать следующее окно" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Обычнный обзор " -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Обзор A vs. B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Обзор A vs. C " -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Обзор B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Активировать предыдущее окно" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Поменять ориентация разделения" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Каталоги/текст" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Готово." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Результат объединения не сохранён" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Сохранить и выйти" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Выйти без сохранения" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Не удалось сохранить результат объединения" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Остановить объединение каталогов?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Сохранение файла..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Сохранение файла с новым именем..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Выход..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Первая строка %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "Выбрать другой шрифт" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Объединение завершено." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Объединение завершено." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Выход..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Отображение/скрытие панели инструментов..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Отображение/скрытие панели состояния..." @@ -563,28 +589,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Не удалось записать в файл %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Чтение каталога: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Вывод содержимого каталога: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Из буфера обмена" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -594,7 +620,7 @@ "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -604,13 +630,13 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "Потеря данных.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Внутренняя ошибка" @@ -632,8 +658,8 @@ msgid "C (Optional):" msgstr "С (необязательно):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Объединить" @@ -756,7 +782,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -934,7 +960,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Конец строки:" @@ -1183,8 +1209,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Объединение каталогов" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "&Каталог" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1766,7 +1794,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1784,11 +1812,6 @@ msgid "Line not available" msgstr "не доступно" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Первая строка %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Конец" @@ -1856,82 +1879,82 @@ msgid "Linediff: A <-> C" msgstr "Построчное сравнение: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Все входные файлы одинаковы бинарно" -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "Все входные файлы содержт одинаковый текст" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файлы B и C бинарно одинаковы.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Файлы A и B бинарно одинаковы.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Стоп" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Продолжить" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Открытие файлов..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Ошибка открытия файла" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Вырезание в буфер обмена..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Копирование в буфер обмена..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Вставка из буфера обмена..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Сохранить и продолжить" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Продолжить без сохранения" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Поиск завершён." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Поиск завершён" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Не удалось создать каталог" @@ -1943,70 +1966,70 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Совмещение ссылок и обычных файлов" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Ссылка: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Не удалось создать временную копию %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Не удалось открыть %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Сравнивание файла..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Ошибка чтения из %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Имя" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Состояние" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Неразрешённый" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Разрешённый" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Чёрный" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Белый" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2014,163 +2037,163 @@ "Сейчас программа работает в режиме объединения каталогов. Вы действительно " "хотите отменить все изменения и обновить содержание каталогов?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Обновить" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Не удалось открыть каталоги:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталог A \"%1\" не существует.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталог B \"%1\" не существует.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталог C \"%1\" не существует.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Ошибка чтения каталога" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "Путь к конечному каталогу не должен совпадать с A или B." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Неправильный параметр" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Сканирование каталогов..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Чтение каталога A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Чтение каталога B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Чтение каталога C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Не удалось почитать некоторые подкаталоги в" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Проверьте права этих каталогов." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Состояние сравнения каталогов" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Количество подкаталогов:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Количество одинаковых файлов:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Количество объединений вручную:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Это влияет на все объединения" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Изменение всех объединений" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Осталось сделать." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Копировать A в B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Копировать B в A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Удалить A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Удалить B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Объединить в A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Объединить в B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Объединить в A & B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Удалить (если существует)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Объединить (вручную)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Ошибка: Несовместимые типы файлов" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Ошибка: Время совпадает, а содержимое файлов - нет." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Пока невозможно" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Пока невозможно" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2182,48 +2205,48 @@ "\n" "Если вы знаете в чём причина, сообщите автору." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Ошибка программы" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ошибка копирования.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Ошибка." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Ошибка объединения" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Ошибка." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Готово." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Не сохранено." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2241,26 +2264,26 @@ "\n" "Мы советуем всегда делать резервные копии данных перед объединением!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Начало объединения" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Выполнить" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Эмулировать" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Выделенный файл имеет разный тип в каждом каталоге. Выберите что делать." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2268,13 +2291,13 @@ "Даты последнего изменения файлов одинаковы, о содержимое - нет. Выберите что " "делать." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Сейчас выполняется объединение каталогов" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2283,208 +2306,208 @@ "На текущем этапе произошла ошибка.\n" "Продолжить или пропустить?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Продолжить после ошибки" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Продолжить" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Пропустить" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Идёт работа..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Объединение завершено." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Объединение завершено" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Объединение завершено. Вы согласны с предлагаемыми изменениями?" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Произошла ошибка. Нажмите OK для подробностей.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Не удалось создать резервную копию %1." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "удалить каталог рекурсивно(%1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "удалить( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Не удалось удалить каталог" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Ошибка rmdir( %1 )." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Не удалось удалить." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "объединение вручную( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " После завершения объединения вручную нажмите F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Не удалось скопировать %1 в %2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "символическая ссылка( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ошибка: Удалённые ссылки не поддерживаются." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Не удалось создать ссылку." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "копировать( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Не удалось переименовать %1 в%2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "переименовать( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Не удалось переименовать" -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Не удалось создать каталог %1. Не удалось удалить существующий файл." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "создать каталог( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Не удалось создать каталог" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Назначение" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Атрибуты" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Последнее изменение" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Объект ссылки" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "не доступно" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (назначение): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (исходное): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (назначение): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (назначение): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Назначение: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Объединение каталогов" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Начать/продолжить объединение каталогов" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Выполнить для текущего пункта" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Объединить текущий файл" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2492,110 +2515,110 @@ "File" msgstr "Объединить" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Включая все подкаталоги" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Исключая все подкаталоги" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Выбрать A для всех" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Выбрать B для всех" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Выбрать C для всех" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Автоматически выбирать тип действия для всех" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Убрать действия для всех" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ничего" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Объединить в A & B" @@ -2607,13 +2630,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Продолжить" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2878,11 +2901,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Конфликт объединения (пустые промежутки)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Конфликт объединения>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2890,40 +2913,61 @@ "Не все конфликты разрешены.\n" "Файл не сохранён.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Осталось конфликтов" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Ошибка сохранения файла" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Ошибка записи" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Вывод" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Изменён]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "Кодировка файла C:" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "Конфликты" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -2961,6 +3005,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "Объединение каталогов" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -2974,10 +3021,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Отобразить/скрыть панель инструментов" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Объединение завершено." - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Файлы A и B бинарно одинаковы.\n"
--- a/kdiff3/po/rw/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/rw/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: kdiff3 3.4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -24,152 +24,152 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "Iki cyiciro" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 #, fuzzy msgid "Option --auto used, but no output file specified." msgstr "- - Ikiyega Byakoreshejwe , Oya Ibisohoka Idosiye . " -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 #, fuzzy msgid "Option --auto ignored for directory comparison." msgstr "- - Ikiyega ya: Ububiko . " -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 #, fuzzy msgid "Saving failed." msgstr "Byanze . " -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 #, fuzzy msgid "Opening of these files failed:" msgstr "Bya Idosiye Byanze : " -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 #, fuzzy msgid "File Open Error" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 #, fuzzy msgid "Opens documents for comparison..." msgstr "Inyandiko ya: ... " -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Cyiteguye." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 #, fuzzy msgid "Saves the merge result. All conflicts must be solved!" msgstr "i Gukomatanya Igisubizo . ! " -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 #, fuzzy msgid "Saves the current document as..." msgstr "i KIGEZWEHO Inyandiko Nka ... " -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 #, fuzzy msgid "Quits the application" msgstr "i Porogaramu " -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 #, fuzzy msgid "Cuts the selected section and puts it to the clipboard" msgstr "i Byahiswemo Icyiciro na Kuri i Ububikokoporora " -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 #, fuzzy msgid "Copies the selected section to the clipboard" msgstr "i Byahiswemo Icyiciro Kuri i Ububikokoporora " -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 #, fuzzy msgid "Pastes the clipboard contents to actual position" msgstr "i Ububikokoporora Ibigize Kuri Ibirindiro: " -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 #, fuzzy msgid "Search for a string" msgstr "ya: A Ikurikiranyanyuguti " -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 #, fuzzy msgid "Search again for the string" msgstr "Nanone ya: i Ikurikiranyanyuguti " -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 #, fuzzy msgid "Enables/disables the statusbar" msgstr "/i Umurongomiterere " -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 #, fuzzy msgid "Configure KDiff3..." msgstr "Kugena imiterere..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy msgid "Go to Current Delta" msgstr "Kuri " -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy msgid "" "Current\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy msgid "Go to First Delta" msgstr "Kuri " -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy msgid "" "First\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy msgid "Go to Last Delta" msgstr "Kuri " -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy msgid "" "Last\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 #, fuzzy msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "( Umweru Umwanya Ibinyuranyo Ryari: \" \" ni Yahagaritswe . ) " -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 #, fuzzy msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -178,362 +178,387 @@ "( OYA Gusimbuka Umweru Umwanya Ibinyuranyo ATARIIGIHARWE Ryari: \" \" ni " "Yahagaritswe . ) " -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy msgid "Go to Previous Delta" msgstr "Kuri " -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy msgid "" "Prev\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy msgid "Go to Next Delta" msgstr "Kuri " -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy msgid "" "Next\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy msgid "Go to Previous Conflict" msgstr "Kuri " -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy msgid "" "Prev\n" "Conflict" msgstr "Ishyamirana ry'ingenzi" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy msgid "Go to Next Conflict" msgstr "Kuri " -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy msgid "" "Next\n" "Conflict" msgstr "Kuri " -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy msgid "Go to Previous Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy msgid "" "Prev\n" "Unsolved" msgstr "Kidakoreshwa" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy msgid "Go to Next Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy msgid "" "Next\n" "Unsolved" msgstr "Kidakoreshwa" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 #, fuzzy msgid "Select Line(s) From A" msgstr "( S ) A " -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 #, fuzzy msgid "Select Line(s) From B" msgstr "( S ) " -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 #, fuzzy msgid "Select Line(s) From C" msgstr "( S ) " -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Kuri " -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "Gukoporora Ihitamo " -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 #, fuzzy msgid "Show Space && Tabulator Characters for Differences" msgstr "& & ya: " -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 #, fuzzy msgid "Show White Space" msgstr "Umwanya w'Umweru" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy msgid "Show Line Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy msgid "" "Line\n" "Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 #, fuzzy msgid "Choose A Everywhere" msgstr "A " -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 #, fuzzy msgid "Choose B Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 #, fuzzy msgid "Choose C Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A ya: " -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A ya: " -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 #, fuzzy msgid "Automatically Solve Simple Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 #, fuzzy msgid "Set Deltas to Conflicts" msgstr "Kuri " -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "Idosiye " -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 #, fuzzy msgid "Show Window A" msgstr "A " -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 #, fuzzy msgid "Show Window B" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 #, fuzzy msgid "Show Window C" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 #, fuzzy msgid "Focus Next Window" msgstr "idirishya rikurikira" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 #, fuzzy msgid "Normal Overview" msgstr "Gahunda-Nyamwaka" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 #, fuzzy msgid "A vs. B Overview" msgstr "A . " -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 #, fuzzy msgid "A vs. C Overview" msgstr "A . " -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 #, fuzzy msgid "B vs. C Overview" msgstr "Incamake" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 #, fuzzy msgid "Focus Prev Window" msgstr "Kwerekeza ku idirishya: " -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 #, fuzzy msgid "Toggle Split Orientation" msgstr "Icyerekezo mwandiko" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Cyiteguye." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 #, fuzzy msgid "The merge result hasn't been saved." msgstr "Gukomatanya Igisubizo . " -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 #, fuzzy msgid "Save && Quit" msgstr "Kubika & & " -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 #, fuzzy msgid "Quit Without Saving" msgstr "Komeka utahinduye imiterere" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 #, fuzzy msgid "Saving the merge result failed." msgstr "i Gukomatanya Igisubizo Byanze . " -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka ? " -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 #, fuzzy msgid "Saving file..." msgstr "Idosiye ... " -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 #, fuzzy msgid "Saving file with a new filename..." msgstr "Idosiye Na: A Gishya Izina ry'idosiye: ... " -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Tegereza..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Umurongo: %1 " + +#: kdiff3.cpp:951 +#, fuzzy +msgid "Selection" +msgstr "Gutoranya imyandikire" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Igikorwa Byuzuye . " + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Igikorwa Byuzuye . " + +#: kdiff3.cpp:987 #, fuzzy msgid "Exiting..." msgstr "Tegereza..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 #, fuzzy msgid "Toggling toolbar..." msgstr "Umwanyabikoresho ... " -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 #, fuzzy msgid "Toggle the statusbar..." msgstr "i Umurongomiterere ... " @@ -629,31 +654,31 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Byanze . : %1 " -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 #, fuzzy msgid "Reading directory: " msgstr "Ububiko : " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, fuzzy, kde-format msgid "Listing directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 #, fuzzy msgid "Writing clipboard data to temp file failed." msgstr "Ububikokoporora Ibyatanzwe Kuri Idosiye Byanze . " -#: diff.cpp:254 +#: diff.cpp:255 #, fuzzy msgid "From Clipboard" msgstr "Ububikokoporora" -#: diff.cpp:502 +#: diff.cpp:504 #, fuzzy, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -668,7 +693,7 @@ "\n" "command Yahagaritswe NONEAHA . " -#: diff.cpp:542 +#: diff.cpp:544 #, fuzzy, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -683,7 +708,7 @@ "\n" "Umurongo: - - command Yahagaritswe NONEAHA . " -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 #, fuzzy msgid "" "Data loss error:\n" @@ -692,7 +717,7 @@ "Ikosa : \n" "ni Umuntu i Umwanditsi: . \n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 #, fuzzy msgid "Severe Internal Error" msgstr "Ikosa " @@ -719,8 +744,8 @@ msgid "C (Optional):" msgstr "(bitari ngombwa)" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Gukomatanya" @@ -849,7 +874,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -1053,7 +1078,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "G." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 #, fuzzy msgid "Line end style:" msgstr "Impera Imisusire : " @@ -1330,8 +1355,8 @@ #: optiondialog.cpp:1065 optiondialog.cpp:1066 #, fuzzy -msgid "Directory Merge" -msgstr "Seriveri y'ububiko:" +msgid "Directory" +msgstr "Ububiko" #: optiondialog.cpp:1079 #, fuzzy @@ -2009,7 +2034,7 @@ msgid "file3 to open" msgstr "Kuri Gufungura " -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy msgid "File" msgstr "Idosiye..." @@ -2024,11 +2049,6 @@ msgid "Line not available" msgstr "Ntibonetse" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Umurongo: %1 " - #: difftextwindow.cpp:1731 msgid "End" msgstr "Impera" @@ -2111,28 +2131,28 @@ msgid "Linediff: A <-> C" msgstr ": A < - > " -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 #, fuzzy msgid "All input files are binary equal." msgstr "Iyinjiza Idosiye Nyabibiri bingana . " -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "na Nyabibiri bingana . \n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "A na Nyabibiri bingana . \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 #, fuzzy msgid "" "Some inputfiles don't seem to be pure textfiles.\n" @@ -2143,64 +2163,64 @@ "icyitonderwa i - Gukomatanya OYA ya: Nyabibiri Ibyatanzwe . \n" "Gukomeza Ku . " -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Ntibyakunze" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 #, fuzzy msgid "Continue Merging" msgstr "Gukomeza " -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 #, fuzzy msgid "Opening files..." msgstr "Mu Gufungura dosiye" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Ikosa gufungura idosiye" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 #, fuzzy msgid "Cutting selection..." msgstr "Ihitamo ... " -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 #, fuzzy msgid "Copying selection to clipboard..." msgstr "Ihitamo Kuri Ububikokoporora ... " -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 #, fuzzy msgid "Inserting clipboard contents..." msgstr "Ububikokoporora Ibigize ... " -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 #, fuzzy msgid "Save && Continue" msgstr "Kubika & & Gukomeza " -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 #, fuzzy msgid "Continue Without Saving" msgstr "Gukomeza " -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 #, fuzzy msgid "Search complete." msgstr "Byuzuye . " -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 #, fuzzy msgid "Search Complete" msgstr "Igishushanyombonera cy'Ishakisha" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Ikosa Kurema Ububiko . " @@ -2216,115 +2236,115 @@ "Kuri iyinjizaporogaramu . Soma i - Idosiye in i Inkomoko Porogaramu ya: " "Birambuye . " -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 #, fuzzy msgid "Mix of links and normal files." msgstr "Bya amahuza na Bisanzwe Idosiye . " -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 #, fuzzy msgid "Link: " msgstr "Ihuza..." -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 #, fuzzy msgid "Size. " msgstr "Ingano:" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 #, fuzzy msgid "Date & Size: " msgstr "Itariki & Igihe" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, fuzzy, kde-format msgid "Creating temp copy of %1 failed." msgstr "Gukoporora Bya %1 Byanze . " -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, fuzzy, kde-format msgid "Opening %1 failed." msgstr "%1 Byanze . " -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 #, fuzzy msgid "Comparing file..." msgstr "Idosiye ... " -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, fuzzy, kde-format msgid "Error reading from %1" msgstr "Ikosa Kuva: %1 " -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Izina" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Igikorwa" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Imimerere" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 #, fuzzy msgid "Unsolved" msgstr "Kidakoreshwa" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 #, fuzzy msgid "Solved" msgstr "Gikomeye" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 #, fuzzy msgid "Nonwhite" msgstr "Nta na kimwe" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Umweru" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka i Gukomatanya na i Ububiko ? " -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 #, fuzzy msgid "Rescan" msgstr "Urukiramende" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 #, fuzzy msgid "Opening of directories failed:" msgstr "Bya ububiko bw'amaderese Byanze : " -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, fuzzy, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, fuzzy, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, fuzzy, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 #, fuzzy msgid "Directory Open Error" msgstr "Gufungura Ikosa " -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 #, fuzzy msgid "" "The destination directory must not be the same as A or B when three " @@ -2334,159 +2354,159 @@ "Ishyika: Ububiko OYA i Nka A Cyangwa Ryari: ububiko bw'amaderese . \n" "Nanone Mbere . " -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 #, fuzzy msgid "Parameter Warning" msgstr "Kuburira bijyanye na mucapyi" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 #, fuzzy msgid "Scanning directories..." msgstr "ububiko bw'amaderese ... " -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 #, fuzzy msgid "Reading Directory A" msgstr "A " -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 #, fuzzy msgid "Reading Directory B" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 #, fuzzy msgid "Reading Directory C" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 #, fuzzy msgid "Some subdirectories were not readable in" msgstr "Ububiko bwungirije OYA in " -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 #, fuzzy msgid "Check the permissions of the subdirectories." msgstr "i Uruhushya Bya i Ububiko bwungirije . " -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 #, fuzzy msgid "Directory Comparison Status" msgstr "Inzira y'ububiko" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 #, fuzzy msgid "Number of subdirectories:" msgstr "Bya Ububiko bwungirije : " -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 #, fuzzy msgid "Number of equal files:" msgstr "Bya bingana Idosiye : " -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 #, fuzzy msgid "Number of different files:" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 #, fuzzy msgid "Number of manual merges:" msgstr "Bya Bikorwa : " -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 #, fuzzy msgid "This affects all merge operations." msgstr "Byose Gukomatanya Ibikorwa: . " -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 #, fuzzy msgid "Changing All Merge Operations" msgstr "Ibikorerwa Ishusho" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 #, fuzzy msgid "Processing " msgstr "Inonosora" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 #, fuzzy msgid "To do." msgstr "Gukora" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 #, fuzzy msgid "Copy A to B" msgstr "A Kuri " -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 #, fuzzy msgid "Copy B to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 #, fuzzy msgid "Delete A" msgstr "A " -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 #, fuzzy msgid "Delete B" msgstr "Gusiba #" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 #, fuzzy msgid "Delete A & B" msgstr "A & " -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 #, fuzzy msgid "Merge to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 #, fuzzy msgid "Merge to B" msgstr "Kuri " -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 #, fuzzy msgid "Merge to A & B" msgstr "Kuri A & " -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 #, fuzzy msgid "Delete (if exists)" msgstr "( NIBA ) " -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 #, fuzzy msgid "Merge (manual)" msgstr "( Bikorwa ) " -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 #, fuzzy msgid "Error: Conflicting File Types" msgstr "Ikosa : Idosiye " -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 #, fuzzy msgid "Error: Dates are equal but files are not." msgstr "Ikosa : bingana Idosiye OYA . " -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 #, fuzzy msgid "This operation is currently not possible." msgstr "Igikorwa ni OYA . " -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 #, fuzzy msgid "Operation Not Possible" msgstr "Igikorwa nticyashobotse" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 #, fuzzy msgid "" "This should never happen: \n" @@ -2499,54 +2519,54 @@ "\n" ": = Kuri iyi , Umuntu i Porogaramu Umwanditsi: . " -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 #, fuzzy msgid "Program Error" msgstr "Ikosa " -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 #, fuzzy msgid "An error occurred while copying.\n" msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Ikosa." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 #, fuzzy msgid "Merge Error" msgstr "Ikosa " -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Ikosa." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Byakozwe." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 #, fuzzy msgid "Not saved." msgstr "Bidasangiwe" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 #, fuzzy msgid "Unknown merge operation. (This must never happen!)" msgstr "Gukomatanya Igikorwa . ( Nta na rimwe ! ) " -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 #, fuzzy msgid "Unknown merge operation." msgstr "Gukomatanya Igikorwa . " -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 #, fuzzy msgid "" "The merge is about to begin.\n" @@ -2565,43 +2585,43 @@ "\n" "iyi Porogaramu beta Imimerere na ni ! Ibyashyinguwe Bya Ibyatanzwe ! " -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 #, fuzzy msgid "Starting Merge" msgstr "Gutangiza serivise" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 #, fuzzy msgid "Do It" msgstr "Akadomo" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 #, fuzzy msgid "Simulate It" msgstr "Kwigana Igaragaza" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 #, fuzzy msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "Ikintu A Ubwoko: in i ububiko bw'amaderese . Kuri . " -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 #, fuzzy msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Amatariki Bya i Idosiye bingana i Idosiye OYA . Kuri . " -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 #, fuzzy msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Igikorwa ni OYA Ububiko Gukomatanya ni . " -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 #, fuzzy msgid "" "There was an error in the last step.\n" @@ -2611,235 +2631,235 @@ "Ikosa in i Iheruka Intera . \n" "Kuri Gukomeza Na: i Ikintu i Ikosa Cyangwa Kuri Gusimbuka iyi Ikintu ? " -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 #, fuzzy msgid "Continue merge after an error" msgstr "Gukomeza Gukomatanya Nyuma Ikosa " -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 #, fuzzy msgid "Continue With Last Item" msgstr "Gukomeza " -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 #, fuzzy msgid "Skip Item" msgstr "Ibigize by'ilisiti" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 #, fuzzy msgid "Skipped." msgstr "Byoherejwe ku" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 #, fuzzy msgid "In progress..." msgstr "Aho bigeze: ... " -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 #, fuzzy msgid "Merge operation complete." msgstr "Igikorwa Byuzuye . " -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 #, fuzzy msgid "Merge Complete" msgstr "Gushyira ku gihe byarangiye" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 #, fuzzy msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Gukomatanya Byuzuye : NIBA Na: i Ibikorwa: . " -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 #, fuzzy msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Habayemoikosa." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, fuzzy, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Ikosa : Gusiba %1 : Inyibutsa Byanze . " -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, fuzzy, kde-format msgid "delete directory recursively( %1 )" msgstr "Gusiba Ububiko ( %1 ) " -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, fuzzy, kde-format msgid "delete( %1 )" msgstr "Gusiba" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 #, fuzzy msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ikosa : Gusiba Igikorwa Byanze Kuri Soma i Ububiko . " -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, fuzzy, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Ikosa : ( %1 ) Igikorwa Byanze . " -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 #, fuzzy msgid "Error: delete operation failed." msgstr "Ikosa : Gusiba Igikorwa Byanze . " -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, fuzzy, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Bikorwa Gukomatanya ( %1 , %2 , %3 - > %4 ) " -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "icyitonderwa : A Bikorwa Gukomatanya i Umukoresha Gukomeza ku . " -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, fuzzy, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Ikosa : Gukoporora ( %1 - > %2 ) Byanze . Ishyika: Byanze . " -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, fuzzy, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Ihuza ku %1 (%2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 #, fuzzy msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ikosa : Byanze : amahuza OYA . " -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 #, fuzzy msgid "Error: copyLink failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, fuzzy, kde-format msgid "copy( %1 -> %2 )" msgstr "Gukoporora" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, fuzzy, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Ikosa Guhindura izina ( %1 - > %2 ) : Gusiba Ishyika: . " -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, fuzzy, kde-format msgid "rename( %1 -> %2 )" msgstr "Guhindura izina" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 #, fuzzy msgid "Error: Rename failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, fuzzy, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Ikosa Bya %1 . Gusiba Idosiye . " -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 #, fuzzy msgid "Error while creating directory." msgstr "Ikosa Kurema Ububiko . " -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 #, fuzzy msgid "Dest" msgstr "Kugogora" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 #, fuzzy msgid "Dir" msgstr "Muhamagazatelefoni" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Ubwoko" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Ingano" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 #, fuzzy msgid "Attr" msgstr "Nyuma" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 #, fuzzy msgid "Last Modification" msgstr "Iherutse guhindurwa" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 #, fuzzy msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 #, fuzzy msgid "not available" msgstr "Ntibonetse" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 #, fuzzy msgid "A (Dest): " msgstr "A ( ) : " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 #, fuzzy msgid "A (Base): " msgstr "A ( Base ) : " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 #, fuzzy msgid "Dest: " msgstr "Ibiro: %1" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Seriveri y'ububiko:" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Start/Continue Directory Merge" msgstr "Gutangira /Gukomeza " -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 #, fuzzy msgid "Run Operation for Current Item" msgstr "ya: " -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 #, fuzzy msgid "Compare Selected File" msgstr "Idosiye " -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy msgid "Merge Current File" msgstr "Idosiye " -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2847,117 +2867,117 @@ "File" msgstr "Gukomatanya" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Fold All Subdirs" msgstr "Amajwi Yose" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 #, fuzzy msgid "Choose A for All Items" msgstr "A ya: " -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 #, fuzzy msgid "Choose B for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Choose C for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Auto-Choose Operation for All Items" msgstr "- ya: " -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 #, fuzzy msgid "No Operation for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ntugire icyo Ukora" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 #, fuzzy msgid "Delete A && B" msgstr "A & & " -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 #, fuzzy msgid "Merge to A && B" msgstr "Kuri A & & " @@ -2971,13 +2991,13 @@ msgid "KDiff3Part" msgstr "" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "Komeza" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -3243,12 +3263,12 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 #, fuzzy msgid "<Merge Conflict>" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 #, fuzzy msgid "" "Not all conflicts are solved yet.\n" @@ -3257,12 +3277,19 @@ "Byose . \n" "Idosiye OYA . \n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 #, fuzzy msgid "Conflicts Left" msgstr "Guhitamo Ibumoso" #: mergeresultwindow.cpp:2720 +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 #, fuzzy msgid "" "\n" @@ -3273,32 +3300,45 @@ "\n" "Inyibutsa Byanze . Idosiye OYA . " -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 #, fuzzy msgid "File Save Error" msgstr "Idosiye Kubika Ikosa " -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 #, fuzzy msgid "Error while writing." msgstr "Ikosa . " -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Ibisohoka" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 #, fuzzy msgid "[Modified]" msgstr "Byahinduwe" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "Idosiye ya: : " -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +msgid "Conflict" +msgstr "Ishyamirana ry'ingenzi" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3337,6 +3377,10 @@ msgid "Your emails" msgstr "" +#, fuzzy +#~ msgid "Directory Merge" +#~ msgstr "Seriveri y'ububiko:" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -3356,10 +3400,6 @@ #~ msgstr "/i Umwanyabikoresho " #, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Igikorwa Byuzuye . " - -#, fuzzy #~ msgid "Files A and B are binary equal.\n" #~ msgstr "A na Nyabibiri bingana . \n"
--- a/kdiff3/po/sv/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/sv/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,13 +1,13 @@ # translation of kdiff3.po to Swedish -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # -# Stefan Asserhäll <stefan.asserhall@comhem.se>, 2004, 2005, 2006, 2007, 2008. +# Stefan Asserhäll <stefan.asserhall@comhem.se>, 2004, 2005, 2006, 2007, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-27 22:47+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-19 18:39+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" @@ -16,95 +16,95 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Aktuell inställning:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Fel i inställningsalternativ:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Väljaren --auto användes, men ingen utdatafil angavs." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Väljaren --auto ignoreras för katalogjämförelse." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Misslyckades spara." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Misslyckades öppna följande filer:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Fel vid öppna fil" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Öppnar dokument för jämförelse..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Uppdatera" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Sparar sammanfogningsresultat. Alla konflikter måste vara lösta." -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Sparar aktuellt dokument som..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Skriv ut skillnaderna" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Avslutar programmet" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut markerad del och flyttar den till klippbordet" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Kopierar markerad del till klippbordet" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Klistrar in klippbordets innehåll på aktuell position" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Markera allting i nuvarande fönster" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Sök efter en sträng" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Sök efter strängen igen" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Aktiverar/inaktiverar statusraden" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Anpassa Kdiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Gå till aktuell skillnad" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -112,11 +112,11 @@ "Aktuell\n" "skillnad" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Gå till första skillnad" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -124,11 +124,11 @@ "Första\n" "skillnad" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Gå till sista skillnad" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -136,13 +136,13 @@ "Sista\n" "skillnad" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Hoppar över skillnader i blanktecken när \"Visa blanktecken\" är " "inaktiverat.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -150,11 +150,11 @@ "(Hoppar inte över skillnader i blanktecken även när \"Visa blanktecken\" är " "inaktiverat.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Gå till föregående skillnad" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -162,11 +162,11 @@ "Föregående\n" "skillnad" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Gå till nästa skillnad" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -174,11 +174,11 @@ "Nästa\n" "skillnad" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Gå till föregående konflikt" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -186,11 +186,11 @@ "Föregående\n" "konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Gå till nästa konflikt" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -198,11 +198,11 @@ "Nästa\n" "konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Gå till föregående olösta konflikt" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -210,11 +210,11 @@ "Föregående\n" "olösta" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Gå till nästa olösta konflikt" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -222,11 +222,11 @@ "Nästa\n" "olösta" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Välj rad(er) från A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -234,11 +234,11 @@ "Välj\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Välj rad(er) från B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -246,11 +246,11 @@ "Välj\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Välj rad(er) från C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -258,11 +258,11 @@ "Välj\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatiskt till nästa olösta konflikt efter val av källa" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -270,11 +270,11 @@ "Automatiskt\n" "nästa" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Visa mellanslag och tabulatortecken i jämförelse" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -282,11 +282,11 @@ "Blank\n" "tecken" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Visa blanktecken" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -294,11 +294,11 @@ "Blanktecken\n" "skillnader" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Visa radnummer" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -306,181 +306,201 @@ "Rad\n" "nummer" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Välj A överallt" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Välj B överallt" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Välj C överallt" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Välj A för alla olösta konflikter" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Välj B för alla olösta konflikter" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Välj C för alla olösta konflikter" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Välj A för olösta konflikter med blanktecken" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Välj B för olösta konflikter med blanktecken" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Välj C för olösta konflikter med blanktecken" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Lös automatiskt enkla konflikter" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Ändra skillnader till konflikter" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Kör automatisk sammanfogning med reguljärt uttryck" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Lös automatiskt historikkonflikter" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Dela jämförelse vid markering" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Foga ihop markerade jämförelser" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Visa fönster A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Visa fönster B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Visa fönster C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Fokus till nästa fönster" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normal översikt" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A mot B-översikt" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A mot C-översikt" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B mot C-översikt" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Radbryt skillnadsfönster" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Lägg till manuell justering av jämförelse" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Rensa alla manuella justeringar av jämförelse" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Fokus till föregående fönster" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Byt delningsorientering" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Delad skärmvy för kataloger och text" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Byt mellan katalog och textvy" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Klar." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Sammanfogningsresultatet har inte sparats." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Varning" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Spara och avsluta" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Avsluta utan att spara" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Misslyckades spara sammanfogningsresultatet." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Du håller för närvarande på med en katalogsammanfogning. Är du säker på att " "du vill avbryta?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Sparar fil..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Sparar fil med ett nytt namn..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Spara som..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Skriver ut..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Övre rad" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Markering" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Utskrift färdig." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Utskrift avbruten." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Avslutar..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Växlar verktygsrad..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Växla statusraden..." @@ -578,28 +598,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fel under filkopieringsåtgärd: Skrivning misslyckades. Filnamn: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Läser katalog: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listar katalog: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Avbryt" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning av klippbordsdata till tillfällig fil misslyckades." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Från klippbord" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -614,7 +634,7 @@ "\n" "Preprocessingkommandot inaktiveras nu." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -630,7 +650,7 @@ "\n" "Preprocessingen för radmatchning inaktiveras nu." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -638,7 +658,7 @@ "Dataförlustfel:\n" "Om det går att upprepa, kontakta upphovsmannen.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Allvarligt internt fel" @@ -660,8 +680,8 @@ msgid "C (Optional):" msgstr "C (valfri):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Sammanfoga" @@ -790,7 +810,7 @@ msgid "OK" msgstr "Ok" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Avbryt" @@ -969,9 +989,9 @@ "På: Alla markeringar skrivs omedelbart till klippbordet.\n" "Av: Du måste kopiera explicit, t.ex. via Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" -msgstr "Radslutstil:" +msgstr "Typ av radslut:" #: optiondialog.cpp:776 msgid "" @@ -1259,8 +1279,8 @@ "(Liknar kommandoradsväljaren \"--auto\".)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Katalogsammanfogning" +msgid "Directory" +msgstr "Katalog" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1897,7 +1917,7 @@ msgid "file3 to open" msgstr "Fil 3 att öppna" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Arkiv" @@ -1909,10 +1929,6 @@ msgid "Line not available" msgstr "Rad inte tillgänglig" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Övre rad" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Slut" @@ -1984,26 +2000,26 @@ msgid "Linediff: A <-> C" msgstr "Radjämförelse: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Alla indatafiler är binärt lika." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "Alla indatafiler innehåller samma text, men är inte binärt likadana." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filerna %1 och %2 är binärt likadana.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Filerna %1 och %2 har samma text, men är inte binärt likadana.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2013,55 +2029,55 @@ "Observera att Kdiff3:s sammanfogning inte är avsedd för binärdata.\n" "Fortsätt på egen risk." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Fortsätt sammanfoga" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Öppnar filer..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Fel när filen öppnades" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Klipper ut markering..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Kopierar markering till klippbord..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Infogar klippbordets innehåll..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Spara och fortsätt" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Fortsätt utan att spara" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Sökning färdig." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Sökning färdig" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Ingenting är markerad i något indatafönster med jämförelse." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Fel vid tillägg av manuellt jämförelseintervall" @@ -2075,70 +2091,70 @@ "Detta hänter oftast beroende på ett installationsproblem. Läs filen README i " "källkodspaketet för detaljinformation." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Blandning av länkar och normala filer." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Länk: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Storlek: " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Datum och storlek: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Att skapa tillfällig kopia av %1 misslyckades." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Öppna %1 misslyckades." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Jämför fil..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Fel vid läsning från %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Namn" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Åtgärd" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Olöst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Löst" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Inte blank" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Blank" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2146,34 +2162,34 @@ "Du håller för närvarande på med att sammanfoga kataloger. Är du säker på att " "du vill avbryta den och avsöka katalogen igen?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Avsök igen" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Öppna katalogerna misslyckades:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Katalog A \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Katalog B \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Katalog C \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Fel vid öppna katalog" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2183,129 +2199,129 @@ "sammanfogas.\n" "Kontrollera igen innan du fortsätter." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parametervarning" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Söker i kataloger..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Läser katalog A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Läser katalog B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Läser katalog C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Vissa underkataloger kunde inte läsas i" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Kontrollera rättigheter för underkatalogerna." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Status för katalogjämförelse" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Antal underkataloger:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Antal likadana filer:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Antal olika filer:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Antal manuella sammanfogningar:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Det här påverkar alla sammanfogningsåtgärder." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Ändra alla sammanfogningsåtgärder" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Behandlar " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Att göra." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Kopiera A till B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Kopiera B till A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Ta bort A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Ta bort B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Sammanfoga till A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Sammanfoga till B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Sammanfoga till A och B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Ta bort (om den finns)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Sammanfoga (manuellt)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Fel: Konflikt i filtyper" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Fel: Datum är lika men filerna är det inte." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Den här åtgärden är för närvarande inte möjlig att utföra." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Åtgärd inte möjlig" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2319,46 +2335,46 @@ "\n" "Om du vet hur du kan upprepa detta, kontakta programmets upphovsman." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Programfel" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Ett fel uppstod vid kopiering.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Fel" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Sammanfogningsfel" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Fel." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Klar." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Inte sparad." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Okänd sammanfogningsåtgärd. (Det här får aldrig inträffa!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Okänd sammanfogningsåtgärd." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2378,19 +2394,19 @@ "finns INGA GARANTIER överhuvudtaget! Gör säkerhetskopior av viktig " "information!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Startar sammanfogning" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Gör det" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Simulera det" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2398,7 +2414,7 @@ "Det markerade objektet har olika typ i de olika katalogerna. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2406,7 +2422,7 @@ "Ändringsdatum för filerna är samma, men filerna är det inte. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2414,7 +2430,7 @@ "Den här åtgärden är för närvarande inte möjlig eftersom katalogsammanfogning " "för närvarande kör." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2424,212 +2440,212 @@ "Vill du fortsätta med objektet som orsakade felet, eller vill du hoppa över " "objektet?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Fortsätt sammanfoga efter ett fel" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Fortsätt med sista objekt" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Hoppa över objekt" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Överhoppad." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Pågår..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Sammanfogningsåtgärd färdig." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Sammanfogning färdig" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulerad sammanfogning färdig. Kontrollera om du håller med om de " "föreslagna åtgärderna." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ett fel uppstod. Tryck på Ok för att se detaljerad information.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fel: Vid borttagning av %1: Misslyckades skapa säkerhetskopia." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Ta bort katalog rekursivt (%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "Ta bort (%1)" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fel: Borttagningsåtgärd för katalog misslyckades när katalogen skulle läsas." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fel: Åtgärden rmdir (%1) misslyckades." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Fel: Borttagningsåtgärden misslyckades." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuell sammanfogning (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Observera: Efter en manuell sammanfogning bör användaren fortsätta " "genom att trycka på F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fel: Kopiering (%1 -> %2) misslyckades. Borttagning av befintlig fil " "misslyckades." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Kopiera länk (%1 -> %2)" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fel: Kopiera länk misslyckades: Fjärrlänkar stöds inte ännu." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Fel: Kopiera länk misslyckades." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "Kopiera (%1 -> %2)" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fel vid namnbyte (%1 -> %2): Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Byt namn (%1 -> %2)" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Fel: Namnbyte misslyckades." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fel när katalogen %1 skulle skapas: Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "Skapa katalog (%1)" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Fel vid skapa katalog." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Storlek" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Egenskap" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Senast ändrad" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Länkmål" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "Ej tillgänglig" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (bas): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (mål): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Spara tillstånd för katalogsammanfogning som..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Starta eller fortsätt katalogsammanfogning" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Utför åtgärd för aktuellt objekt" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Jämför markerade filer" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Sammanfoga markerade filer" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2637,39 +2653,39 @@ "Sammanfoga\n" "fil" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Dra ihop alla underkataloger" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Expandera alla underkataloger" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Välj A för alla objekt" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Välj B för alla objekt" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Välj C för alla objekt" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Välj automatiskt åtgärd för alla objekt" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Ingen åtgärd för något objekt" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Visa identiska filer" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2677,15 +2693,15 @@ "Identiska\n" "filer" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Visa olika filer" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Visa bara filer i A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2693,11 +2709,11 @@ "Bara\n" "filer i A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Visa bara filer i B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2705,11 +2721,11 @@ "Bara\n" "filer i B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Visa bara filer i C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2717,35 +2733,35 @@ "Bara\n" "filer i C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Jämför explicit markerade filer" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Sammanfoga explicit markerade filer" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Gör ingenting" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Sammanfoga till A och B" @@ -2757,11 +2773,11 @@ msgid "KDiff3Part" msgstr "Kdiff3-del" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Fortsätt" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Avsluta" @@ -2993,11 +3009,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Konflikt vid sammanfogning (bara blanktecken)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Konflikter vid sammanfogning>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3005,12 +3021,21 @@ "Alla konflikter har inte lösts ännu.\n" "Filen sparas inte.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Konflikter kvar" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Det finns konflikter i typ av radslut. Välj typ av radslut manuellt.\n" +"Filen har inte sparats.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3019,28 +3044,40 @@ "\n" "Misslyckades skapa säkerhetskopia. Filen sparades inte." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Fel vid spara fil" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Fel vid skrivning." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Utmatning" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Ändrad]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Kodning för att spara" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Konflikt" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Kodare från"
--- a/kdiff3/po/ta/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/ta/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2004-08-24 04:28+0530\n" "Last-Translator: I. Felix <ifelix25@yahoo.co.in>\n" "Language-Team: <ta@li.org>\n" @@ -34,99 +34,99 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "நடப்பு உருப்படி இசைவு செயற்பாடு" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "கோப்பு திறப்பில் பிழை" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "தேர்வு தானே உபயோகிக்கப்பட்டுள்ளது ஆனால் வெளியீட்டுக் கோப்பு குறிப்பிடப்படவில்லை" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "அடைவு ஒப்பீட்டுக்காக தேர்வு தானே மறுக்கப்பட்டுள்ளது" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "சேகரிப்பு தோல்வியடைந்தது." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "இந்த கோப்புகளின் திறப்பு தோல்வியடைந்தது:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "கோப்பு திறப்பில் பிழை" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "ஒப்பிடுதலுக்கு ஆவணங்களைத் திறக்க..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "தயார்." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ஒன்றுசேர் முடிவை சேகரி. அனைத்து குழப்பங்களும் தீர வேண்டும்." -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "தற்போதைய ஆவணத்தை ....வாக சேமி " -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "பயன்பாட்டை முறிக்க" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "தேர்வு செய்த பகுதியை எடுத்து கிளிப்போர்டில் செலுத்துகிறது" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "தேர்வு செய்த பகுதியை கிளிப் போர்டை படி செய்கிறது." -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "கிளிப்போர்டின் உள்ளடக்கங்களை உரிய இடத்தில் சேர்க்கிறது" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "தொடர்ச்சிகளை தேடு" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "சரத்தை மீண்டும் தேடு" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "நிலைப்பட்டியை செயல்படுத்து/நீக்கு " -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3யை அமை" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "தற்போதைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -134,11 +134,11 @@ "Delta" msgstr "தற்போதைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "முதல் டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -146,11 +146,11 @@ "Delta" msgstr "முதல் டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "கடைசி டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -158,21 +158,21 @@ "Delta" msgstr "கடைசி டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "முந்தைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -180,11 +180,11 @@ "Delta" msgstr "முந்தைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "அடுத்த டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -192,11 +192,11 @@ "Delta" msgstr "அடுத்த டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "முந்தைய குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -204,11 +204,11 @@ "Conflict" msgstr "குழப்பங்கள்" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "அடுத்த குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -216,11 +216,11 @@ "Conflict" msgstr "அடுத்த குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "முந்தைய தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -228,11 +228,11 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "அடுத்த தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -240,72 +240,72 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Aவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Bவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Cவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "மூலத்தை தேர்வு செய்த பிறகு தானாகவே அடுத்த தீர்க்கப்படாத குழப்பதற்கு செல் " -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "தானாகவே தேர்ந்தெடுக்கப்பட்ட படிவு" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "இடைவெளியை காட்டி மற்றும் வேறுபாட்டிற்காக பட்டியலிடுவான் எழுத்துக்கள்" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "வெள்ளை இடத்தை காட்டும்" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "வரி எண்களை காட்டு" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -313,187 +313,213 @@ "Numbers" msgstr "வரி எண்களை காட்டு" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "எல்லா இடத்திலும் Aவைத் தேர்ந்தெடு" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "எல்லா இடத்திலும் Bவைத் தேர்ந்தெடு" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "எல்லா இடத்திலும் Cவைத் தேர்ந்தெடு" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr " Delta வை குழப்பத்திற்கு அமை" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "A சாளரத்தைக் காட்டு" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "B சாளரத்தைக் காட்டு" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "C சாளரத்தைக் காட்டு" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "அடுத்த சாளரத்தை நோக்கு" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "முந்தைய சாளரத்தை நோக்கு" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "பிரிப்பு திசையை மாற்று" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "அடைவு மற்றும் உரையின் பிளவின் திரைப்பார்வை" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "அடைவுக்கும் உரை பார்வைக்கும் இடையே மாற்றுக" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "தயார்." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "ஒன்று சேர் முடிவு சேகரிக்கப்படவில்லை." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "சேகரித்து முடி" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "சேகரிக்காமல் மூடு" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "ஒன்றுசேர் முடிவை சேகரித்தல் தோல்வியடைந்தது." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "நீங்கள் தற்போது அடைவுகளை சேர்த்துக் கொண்டிருக்கிறீர்கள். நிறுத்த விரும்புகிறீர்களா?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "கோப்பு சேகரித்தல்..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "புதிய கோப்புப்பெயருடன் கோப்பினை சேகரித்தல்..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "வெளியேறுதல்..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "மேல் வரி %1." + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "மற்றொரு எழுத்துருவை தேர்தெடு" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "வெளியேறுதல்..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "கருவிப்பட்டி மாற்றப்படுகறது" -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "நிலைப்பட்டியை மாற்று" @@ -591,28 +617,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "கோப்புப் படிவின்போது பிழை ஏற்பட்டுள்ளது. கோப்பில் எழுத இயலவில்லை.கோப்பின் பெயர்:%1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "அடைவை படித்தல்:" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "அடைவை பட்டியலிடல்: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "க்ளிப்போர்டின் எழுத்தின் தரத்தில் உள்ள டெம்ப் கோப்பு தவறு." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "கிளிப் போர்டிலிருந்து." -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -627,7 +653,7 @@ "\n" "முன்செயலிகள் கட்டளையை இப்பொழுதே முடக்கு," -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -642,7 +668,7 @@ "\n" "வரிசெல்களின் கட்டளையை இப்பொழுதே முடக்கு," -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -650,7 +676,7 @@ "தகவல் தவறானது.\n" "மீண்டும் உற்பத்தியானால் ஆசிரியரை அணுகவும்.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "கடுமையான உள்சார்ந்த தவறு." @@ -672,8 +698,8 @@ msgid "C (Optional):" msgstr "C (விருப்பங்கள்)" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "ஒன்றாகச் சேர்." @@ -797,7 +823,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -982,7 +1008,7 @@ "எந்த ஒரு தேர்வையும் உடனடியாக கிளிப் போர்டுக்கு எழுதவும்.\n" "நீங்கள் வெளிப்படையாக படிவு செய்" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 #, fuzzy msgid "Line end style:" msgstr "வரிகளின் பாணி தாள்" @@ -1239,8 +1265,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "அடைவுச் சேர்க்கை" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "அடைவு" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1850,7 +1878,7 @@ msgid "file3 to open" msgstr "கோப்பு 3ன்றை திற" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1868,11 +1896,6 @@ msgid "Line not available" msgstr "கிடைக்கவில்லை" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "மேல் வரி %1." - #: difftextwindow.cpp:1731 msgid "End" msgstr "முடிவு" @@ -1946,27 +1969,27 @@ msgid "Linediff: A <-> C" msgstr "வரி வித்தியாசம் : A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "அனைத்து உள்ளிடு கோப்புகளும் இருநிலை சமம்" -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "அனைத்து உள்ளீட்டுக் கோப்புகளும் ஒரே உரையைக் கொண்டன." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1976,55 +1999,55 @@ "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "விடுதல்" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "தொடர்ந்து ஒன்றாக சேர்." -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "திறந்த கோப்புகள்" -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "கோப்பு திறப்பு பிழை" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "வெட்டுதலை தேர்ந்தெடு" -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "தேர்ந்தெடுக்கப்பட்டதை கிளிப்போர்டிற்கு நகலெடுக்க" -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "கிளிப்போர்டு உள்ளடக்கத்தை சொருகு" -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "சேமி தொடரு" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "சேமிக்காமல் தொடரு" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "அடைவை உருவாக்கும் போது பிழை" @@ -2043,71 +2066,71 @@ "உங்கள் பகுதியை காணவில்லை.\n" "நிறுவும் போது இப்படிப்பட்ட பிரச்சனை ஏற்படும் விவரங்களுக்கு README தொகுப்பைப் படிக்கவும்" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "இணைப்புகள் மற்றும் கோப்புகள் கலந்து உள்ளன." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "இணைப்பு." -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "அளவு." -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "தேதி மற்றும் அளவு." -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "வார்ப்புரு படியெடு உருவாக்குவது %1 இயலவில்லை." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "திறப்பதற்கு %1 இயலவில்லை." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 #, fuzzy msgid "Comparing file..." msgstr "கோப்பினை ஒப்பிடுகிறது...." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1னிலிருந்து படிக்கும் பிழை" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "பெயர்." -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "இயக்கம்." -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "நிலை." -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "White" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2115,34 +2138,34 @@ "நீங்கள் தற்பொழுது ஒன்றாக சேர்க்கப்பட்ட அடைவை பயன்படுத்திக் கொண்டிருக்கிறீர்கள். நீங்கள் நிச்சயமாக " "ஒன்று சேர்ப்பதை நிறுத்திவிட்டு அடைவை மறுவருடலை விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "மறுவருடல்" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "அடைவு திறக்க இயலவில்லை:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு எ \"%1\" இல்லை அல்லது அது ஒரு அடைவு இல்லை.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு B \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு C \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "திறந்த தகவல் தளம் தவறு." -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2151,130 +2174,130 @@ "மூன்று அடைவுகள் ஒன்று சேரும் பொழுது, சேரும் அடைவு A (அ) B போன்று இருக்கக் கூடாது.\n" "தொடர்வதற்கு முன் மீண்டும் சரிபார்க்கவும்." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "அளவுருக்கள் எச்சிரிகை." -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 #, fuzzy msgid "Scanning directories..." msgstr "Scanning directories ..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "தகவல் தளம் 'ஏ'வை படிக்கவும்." -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "தகவல் தளம் 'பி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "தகவல் தளம் 'சி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "சில துணை அடைவுகளை படிக்க இயலவில்லை" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "துணை அடைவுகளின் அனுமதிகளை சரிபார்க்கவும்." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "அடைவு ஒப்பிடும் நிலை" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "உப அடைவுகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "சம கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "கைமுறை ஒன்று சேர்க்கையின் எண்ணிக்கை:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "இது அனைத்து ஒன்றுசேர் இயக்கங்களை பாதிக்கிறது." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "அனைத்து ஒன்றுசேர் இயக்கங்களை மாற்றிக்கொண்டிருக்கிறது" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "செயலாக்குதல்" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "அதை செய்." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr " A to B படியெடு" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "படியெடு B to A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr " A ஐ நீக்கு" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B ஐ நீக்கு" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr " A ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr " 'பி' ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "நீக்கு." -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "பிழை: குழப்ப கோப்பு வகைகள்" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "பிழை: தேதிகள் சமம் ஆனால் கோப்புகள் இல்லை." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "இந்த இயக்கம் தற்போது சாத்தியமில்லை." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "இயக்கம் சாதியமில்லை" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2288,48 +2311,48 @@ "\n" "இதை மறு ஆக்கம் செய்ய தெரிந்தால், நிரல் எழுதியவரை அணுகவும்." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "நிரல் பிழை" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "பிழை." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "ஒன்றுசேர் பிழை" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "பிழை." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "முடிந்த." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "கோப்பு" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "தெரியாத ஒன்றுசேர் இயக்கம்.( இது ஒருபோதும் நிகழக்கூடாது)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "தெரியாத ஒன்றுசேர் இயக்கம்." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2350,19 +2373,19 @@ "உத்திரவாதமும் கிடையாது! தங்களது இன்றியமையாத தகவல்களுக்கு பின்னணி " "அமைக்க! " -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "ஒன்று சேர்ப்பைத் துவக்குதல்" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "இதை செய்க" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "இதை போன்று நட" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2370,7 +2393,7 @@ "பலவிதமான அடைவுகளில் பலவகையாக தனிப்படுத்தப்பட்ட விவரம் உள்ளது. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2378,7 +2401,7 @@ "கோப்புகளின் திருத்திய தேதிகள் ஒன்றாக உள்ளது, ஆனால் கோப்புகள் இல்லை. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க. " -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -2386,7 +2409,7 @@ "இந்த செயற்பாடு தற்போது சாத்தியமில்லை ஏனென்றால் அடைவு ஒற்றினை தற்போது " "இயங்கிக்கொண்டிருக்கின்றது" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2396,208 +2419,208 @@ "இந்த பிழையை ஏற்படுத்திய விவரத்துடன் தொடர விரும்புகிறீர்களா அல்லது அதை தவிர்க்க " "விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "பிழைக்குப் பிறகு ஒன்று சேர்த்தலை தொடர்க" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "கடைசி விவரத்துடன் தொடர்க" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "விவரத்தை தவிர்க்க" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "தவிர்த்தது." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "செயல்பாட்டில் உள்ளது..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "ஒன்றுசேர்ப்பு முடிந்தது" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "போலியான ஒன்றுசேர்ப்பு முடிந்தது: முன்மொழிந்த இயக்கங்களுடன் நீங்கள் ஒத்துப்போகிறீர்களா என்பதை " "சரிபார்க்கவும்." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "பிழை ஏற்பட்டுள்ளது. விரிவான விவரங்களுக்கு சரி என்பதை அழுத்துக.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "பிழை: %1 நீக்கும்போது: பின்னணி உருவாக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "அடைவு சூழ்நிலை நீக்கு நீக்கு(%1)" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "நீக்கு( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "பிழை: அடைவை படிக்கும்போது நீக்க இயலவில்லை." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr " rmdir( %1 } பிழை: இயக்க இயலவில்லை" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "பிழை: நீக்கும் இயக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "கைமுறை ஒன்றினை(%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "குறிப்பு: கையேடு ஒன்றினையின் பிறகு உபயோகிப்பவர் F7 வழியாக தொடர வேண்டும்." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "பிழை:நகல்( %1 -> %2 ) தோல்வி அடைந்தது. இருக்கும் சேரிடம் நீக்கம் தோல்வி அடைந்தது" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "நகல் இணை( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "பிழை:தொடர்புப் படியெடு தோல்வியடைந்தது: தூரத் தொடர்பு இன்னும் ஆதரிக்கப்படவில்லை" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "பிழை: நகல் இணை தோல்வியடைந்தது." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "நகல்( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "மறுபெயரிடும் போது பிழை( %1 -> %2 ): தற்போதுள்ள சேருமிடத்தை நீக்க இயலாது." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "மறுபெயர்( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "பிழை: மறுபெயர் தோல்வி அடைந்தது." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1அடைவை உருவாக்கும் போது பிழை: தற்போதைய கோப்பினை நீக்க இயலாது." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "( %1 )அடைவை உருவாக்கு" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "அடைவை உருவாக்கும் போது பிழை" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "சேருமிடம்" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "அடைவு" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "விதம்" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "அளவு" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "தன்மை" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "கடைசி திருத்தம்" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "இணை-சேருமிடம்" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "கிடைக்கவில்லை" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (சேருமிடம்): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (அடித்தளம்):" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (சேருமிடம்): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (சேருமிடம்):" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "சேருமிடம்: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "அடைவுச் சேர்க்கை" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "அடைவை சேர்க்கத் துவங்கு" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "நிகழ் உருப்படிக்காக செயற்பாடு இயங்கு" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "தற்போதைய கோப்பினை ஒன்றுசேர்" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2605,111 +2628,111 @@ "File" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் மடி" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் பிரி" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "எல்லா விவரங்களுக்கும் Aவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "எல்லா விவரங்களுக்கும் Bவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "எல்லா விவரங்களுக்கும் Cவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் தானியக்கத்தேர்வு" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் இயக்கமில்லை" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "ஒன்றும் செய்யாதே" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 #, fuzzy msgid "Delete A && B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 #, fuzzy msgid "Merge to A && B" msgstr "A & B ஐ ஒன்றாகச் சேர்." @@ -2722,13 +2745,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "தொடர்தல்" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2990,11 +3013,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3002,39 +3025,60 @@ "அனைத்து குழப்பங்களும் இன்னும் தீரவில்லை.\n" "கோப்பினை சேமிக்கவில்லை \n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "குழப்பமான இடது" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "கோப்பின சேமிப்பு பிழை" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "எழுதும் பொழுது பிழை" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr " வெளியீடு" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[திருத்தப்பட்டது]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "குழப்பங்கள்" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3072,6 +3116,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "அடைவுச் சேர்க்கை" + #~ msgid "C&ontinue" #~ msgstr "தொடர்தல்" @@ -3088,10 +3135,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "கருவிப்பட்டியை செயல்படுத்து/நீக்கு" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n"
--- a/kdiff3/po/tg/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/tg/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-09-17 13:29+0500\n" "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n" "Language-Team: Tajik\n" @@ -21,100 +21,100 @@ "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Интихоб --худ истифода шуда, аммо ягон файли хуруҷ муайян карда нашуд." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Интихоб --худ аҳамият надиҳи барои муқоисаи директория." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Нигоҳ куни нашуд." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Кушодани ин файлҳо нашуд:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Мекушояд документҳоро барои муқоиса..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "Тайёр аст." -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Нигоҳ медорад натиҷаи якҷошавиро. Ҳамаи ҷанҷолҳо бояд ҳал карда шаванд!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Нигоҳ медорад документи ҷориро мисли..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Маҳкам мекунад аризаро" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Мебурад қисми интихоб карда шударо ва меандозад онро ба клипборд" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Мечаспонад таркиботҳои клибордро ба ҷойгиршавии амалӣ" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Ковтукови ришта" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Бори дигар ковтуков барои ришта" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Пайраҳаи ҳолати фаъол/ғайри фаъолро созед" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Танзимоти KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Равед ба Делтаи Ҷори" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -122,11 +122,11 @@ "Delta" msgstr "Равед ба Делтаи Ҷори" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Равед ба Делтаи Аввала" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -134,11 +134,11 @@ "Delta" msgstr "Равед ба Делтаи Аввала" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Равед ба Делтаи Охирон" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -146,21 +146,21 @@ "Delta" msgstr "Равед ба Делтаи Охирон" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Равед ба Делтаи Пешангӣ" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -168,11 +168,11 @@ "Delta" msgstr "Равед ба Делтаи Пешангӣ" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Равед ба Делтаи Дар пеш интизор" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -180,22 +180,22 @@ "Delta" msgstr "Равед ба Делтаи Дар пеш интизор" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Равед ба Ҷанҷоли Пешангӣ" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy msgid "" "Prev\n" "Conflict" msgstr "Якҷояшавӣ ба анҷом расид" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизор " -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -203,11 +203,11 @@ "Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизор " -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Пешангии Ҳалнашуда" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -215,11 +215,11 @@ "Unsolved" msgstr "Иҷозат дода нашуд" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизори Ҳалнашуда" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -227,71 +227,71 @@ "Unsolved" msgstr "Иҷозат дода нашуд" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Интихоб кунед Рах(ҳо)-ро Аз А" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Интихоб кунед Рах(ҳо)-ро Аз В" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Зуд равед ба ҷанҷоли пешангии ҳалнашуда баъди интихоби сарчашма" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Нишон диҳед фосиларо && Феълҳои табулятори барои гуногуниҳо" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Нишон диҳед фосиларо" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Нишон диҳед рахи рақамҳоро" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -299,187 +299,212 @@ "Numbers" msgstr "Нишон диҳед рахи рақамҳоро" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Интихоб кунед А-ро дар ҳамаҷой" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "Интихоб кунед А-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "Интихоб кунед В-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "Интихоб кунед С-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед А-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед В-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед С-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Танзим кунед делтаҳоро ба ҷанҷолҳо" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "Муқоисаи файли интихобшуда" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Нишон диҳед Тирезаи А-ро" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Нишон диҳед Тирезаи В-ро" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Нишон диҳед Тирезаи С-ро" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Активация кардани дигар тиреза" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Оддӣ аз назар гузарондан" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Аз назар гузарондани A vs. B " -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Аз назар гузарондани A vs. C" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Аз назар гузарондани B vs. C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Калимаи печидаи тирезаҳои гуногун" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Активация кардани тирезаи гузашта" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Дигаркунӣ ва тақсимкунии ҷои исти худ" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "аппп" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Дигаркунӣ байни феҳристҳо && намоиши матн" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Тайёр аст." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Натиҷаи иттиҳодия нигоҳ надоштагӣ." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Нигоҳ доштан && баромадан" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Натиҷаи якҷоя кардан,нигоҳ дошта нашуд." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Якҷояшавии каталогро нигоҳ дорем.Оё,шумо дилпур мехоҳед, баровардан?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Нигоҳ доштани файл..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Бо номи нав нигоҳ доштани файл..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "Баромад..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "Сатри яккум%1" + +#: kdiff3.cpp:951 +#, fuzzy +msgid "Selection" +msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "Якҷояшавӣ ба анҷом расид." + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "Якҷояшавӣ ба анҷом расид." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Баромад..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Тасвир кардан/панели асбобҳои пинҳонӣ..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Тасвир кардан/вазъияти панели пинҳонӣ..." @@ -578,28 +603,28 @@ msgstr "" "Хато дар вақти амалиёти нусхабардории файл: Навиштан нашуд.Номи Файл: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Хондани директория: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Нигоҳ кардани директория: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Дар силули мухобиротӣ навиштани таърих ва суръати файл." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Аз буфери иваз" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -614,7 +639,7 @@ "\n" "Фармони пеш-коркардкуни ҳоло аз кор мемонад." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -630,7 +655,7 @@ "\n" "Хати-ҷамъ кунии- пешкоркардкунии фармон ҳоло аз кор мемонад." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -638,7 +663,7 @@ "Маълумотҳои гумкарда:\n" "Агар ин зиёд карда шавад илтимос бо муаллиф алоқа кунед.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Хатогии даруни" @@ -662,8 +687,8 @@ msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Пайваст кардан" @@ -788,7 +813,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -964,7 +989,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "" @@ -1209,8 +1234,8 @@ #: optiondialog.cpp:1065 optiondialog.cpp:1066 #, fuzzy -msgid "Directory Merge" -msgstr "Хатогӣ дар вақти хониши каталог" +msgid "Directory" +msgstr "Хониши каталоги А" #: optiondialog.cpp:1079 #, fuzzy @@ -1785,7 +1810,7 @@ msgid "file3 to open" msgstr "" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "" @@ -1801,11 +1826,6 @@ msgid "Line not available" msgstr "дастрас нест" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "Сатри яккум%1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Охир" @@ -1873,88 +1893,88 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Давом додан" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 #, fuzzy msgid "Opening files..." msgstr "Кушодан %1 нашуд." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 #, fuzzy msgid "File open error" msgstr "Хатогӣ дар кушодани файл" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 #, fuzzy msgid "Copying selection to clipboard..." msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 #, fuzzy msgid "Save && Continue" msgstr "Нигоҳ доштан && баромадан" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 #, fuzzy msgid "Continue Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 #, fuzzy msgid "Search complete." msgstr "Ҷустуҷу дар ҷамъбаст" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 #, fuzzy msgid "Search Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "Хатогӣ дар вақти эҷод кардани каталог." @@ -1974,71 +1994,71 @@ "Ин масъала одатан дар вақти аниқ рӯй медиҳад.Файли README-ро хонед, ҷой ва " "калидро ба тафсил баён кунед." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Мувофиқкунии ишораҳо бо файлҳои оддӣ." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Алоқа: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Андоза. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Таърихи рӯз ва андоза: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Наметавонам нусхаи яквақтаро эҷод кунам %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Кушодан %1 нашуд." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 #, fuzzy msgid "Comparing file..." msgstr "Нигоҳ доштани файл ..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Хатогӣ дар вақти хониш аз %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Ном" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Амал" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Вазъият" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Иҷозат дода нашуд" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Иҷозат дода шуда" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Сиёҳ" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Сафед" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2047,34 +2067,34 @@ "ҳақиқат мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан " "нав кунед?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Дигар кардан" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Наметавонам каталогҳоро кушоям:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги А \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги В \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги C \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2084,130 +2104,130 @@ "шуданд.\n" "Санҷед бори дигар пеш аз давомкуни." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Параметри нодуруст" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 #, fuzzy msgid "Scanning directories..." msgstr "Мушоҳидакунии каталогҳо..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Хониши каталоги А" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Хониши каталоги В" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Хониши каталоги С" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Наметавонам баъзе зеркаталогҳоро хонам дар" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Ҳолати муқоисакунии каталогҳо" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Миқдори зеркаталогҳо:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Миқдори файлҳои якхела:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Миқдори якҷошавии дастӣ:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Ин ба ҳамаи якҷошавӣ таъсир мерасонад." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Коркард " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Кардан." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Нусха кардан А ба В" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Нусха кардан В ба А" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Нест кардани А" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Нест кардани В" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Пайваст кардан ба A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Пайваст кардан ба В" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Пайваст кардан ба A & В" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Нест кардан (агар вуҷуд дорад)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Пайваст кардан (дастӣ)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Хатогӣ: Якҷоянашавандаи шакли файлҳо" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Хатогӣ: Вақт мувофиқ аст, лекин файлҳо нет." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Ҳоло номумкин аст." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2218,48 +2238,48 @@ "mergeResultSaved: m_pMFI=0\n" "Агар шумо сабабро донед, ба муаллиф муроҷиат кунед." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Хатогии барнома" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Хатогии нусхакунӣ.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "Хатогӣ." -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Хатогии якҷояшавӣ" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Хатогӣ." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Тайёр аст." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Захира нашуд." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Пайвастшавии номаълум" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Пайвастшавии номаълум." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2277,19 +2297,19 @@ "\n" "Мо малиҳат медиҳем, ки доимо пеш аз якҷояшавӣ нусхаҳои захиравиро кунед!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Оғози якҷояшавӣ" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Ҳал кардан" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Моделсозӣ" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2297,7 +2317,7 @@ "Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро " "интихоб кунед." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2305,13 +2325,13 @@ "Маълумотҳои охирини тағйироти файлҳо якхела ҳастанд, вале таркиб нест. Чӣ " "кор карданро интихоб кунед." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Ҳоло якҷояшавии каталогҳо ҳал карда мешавад." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2320,212 +2340,212 @@ "Дар этапи ҷорӣ хатогие ба амал омад.\n" "Давом додан ё сар додан?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Давом додан баъди хатогӣ" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Давом додан" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Сар додан" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Са дода шуд." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Кор рафта истодааст..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Якҷояшавӣ ба анҷом расид." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Якҷояшавӣ ба анҷом расид. Оё шумо бо тағйиротҳои додашуда розӣ ҳастед?" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Хатогӣ ба амал омад. Барои ахбороти илова OK-ро пахш кунед.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Хатогӣ: Наметавонам нусхаи захираро эҷод кунам %1." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "нест кардани каталог рекурсивӣ( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "нест кардан( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Хатогӣ: наметавонам каталогро нест кунам." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Хатогӣ: хатогии rmdir( %1 )." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Хатогӣ: наметавонам нест кунам." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "якҷояшавии дастӣ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Қайд: Баъди анҷоми якҷояшавии дастӣ F7-ро пахш кунед." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Хатогӣ: наметавонам( %1 -> %2 ) нусха кунам. Нест кардани муайяни вуҷулшуда " "муяссар карда нашуд." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "бадарғаи нишонавӣ( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Хатогӣ: Бадарғаҳои нестшуда пуштибонӣ карда намешаванд." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Хатогӣ: наметавонам бадарғаро эҷод кунам." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "нусха кардани ( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Хатогӣ дар вақти тағйири ном( %1 -> %2 ): Наметавонам муайяни вуҷудшударо " "нест кунам." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "тағйири ном( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Хатогӣ: Наметавонам тағйири номро кунам." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Хатогӣ дар вақти эҷод кардани каталоги %1. Файли вуҷудшуда нест карда " "намешавад." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "эҷоди каталог( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Муайяншуда" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Шакл" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Андоза" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Хусусиятҳо" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Тағйироти охирон" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Бадарғаи-объект" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "дастрас нест" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (муайяншуда): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (баромад): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (муайяншуда): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (муайяншуда): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Муаяйншуда: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Сар кардан/давом додани якҷояшаии каталогҳо" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Ба кор даровардан барои нуқтаи ҷорӣ" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Якҷоя кардани файли ҷорӣ" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2533,111 +2553,111 @@ "File" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Дохили ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Дохилнашудаи ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Интихоби A барои ҳама" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Интихоби B барои ҳама" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Интихоби C барои ҳама" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Худ-интихобкунии шакли амал барои ҳама" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Гирифтани амалҳо барои ҳама" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Ягон чиз" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 #, fuzzy msgid "Delete A && B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 #, fuzzy msgid "Merge to A && B" msgstr "Пайваст кардан ба A & В" @@ -2650,13 +2670,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "&Давом додан" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2900,52 +2920,72 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 #, fuzzy msgid "<Merge Conflict>" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 #, fuzzy msgid "File Save Error" msgstr "Хатогӣ дар кушодани файл" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 #, fuzzy msgid "Error while writing." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +msgid "Conflict" +msgstr "Якҷояшавӣ ба анҷом расид" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -2986,6 +3026,10 @@ msgid "Your emails" msgstr "" +#, fuzzy +#~ msgid "Directory Merge" +#~ msgstr "Хатогӣ дар вақти хониши каталог" + #~ msgid "C&ontinue" #~ msgstr "&Давом додан" @@ -3005,10 +3049,6 @@ #~ msgstr "Пайраҳаи асбоби фаъол/ғайри фаъолро созед" #, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Якҷояшавӣ ба анҷом расид." - -#, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Воситаи муқоиса ва якҷоя кардан"
--- a/kdiff3/po/tr/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/tr/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -8,13 +8,13 @@ # Adem Alp YILDIZ <ademalp@kde.org.tr>, 2005. # Alper Şen <aalpersen@gmail.com>, 2005. # Alper Sen <aalpersen@gmail.com>, 2005. -# Serdar Soytetir <tulliana@gmail.com>, 2008. +# Serdar Soytetir <tulliana@gmail.com>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-11-25 03:57+0200\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-30 00:48+0200\n" "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n" "Language-Team: Turkish <yerellestirme@kde.org.tr>\n" "MIME-Version: 1.0\n" @@ -23,127 +23,127 @@ "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Geçerli Yapılandırma:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Yapılandırma Seçeneği Hatası:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "--auto seçeneği kullanıldı, fakat çıktı dosyası belirtilmedi." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "--auto seçeneği dizin karşılaştırmasını reddetti." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Kaydetme başarısız oldu." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Şu dosyaların açılması başarısız oldu:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Dosya Açma Hatası" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Karşılaştırmak için belge açar..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Yeniden Yükle" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Birleştirme sonuçlarını kaydeder. Tüm çakışmalar çözülmelidir!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Mevcut belgeyi farklı kaydeder..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Farkları yazdır" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Uygulamadan çıkar" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Seçili bölümü keser ve panoya koyar" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Seçili bölümü panoya kopyalar" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Pano içeriklerini mevcut alana yapıştırır" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Geçerli penceredeki herşeyi seç" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Bir satırı ara" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Satırı tekrar ara" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Durum çubuğunu açar/kapatır" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "KDiff3 Uygulamasını Yapılandır..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Mevcut Delta'ya Git" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "İlk Delta'ya Git" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Son Delta'ya Git" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz " "ardı eder.)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -151,31 +151,31 @@ "(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz " "ardı etmez.)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Önceki Delta'ya Git" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Sonraki Delta'ya Git" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Bir Önceki Çakışmaya Git" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -183,11 +183,11 @@ "Önceki\n" "Çakışma" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Bir Sonraki Çakışmaya Git" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -195,11 +195,11 @@ "Sonraki\n" "Çakışma" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Bir Önceki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -207,11 +207,11 @@ "Önceki\n" "Çözümlenmemiş" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Bir Sonraki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -219,11 +219,11 @@ "Sonraki\n" "Çözümlenmemiş" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "A'dan Satır(lar) Seç" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -231,11 +231,11 @@ "Seç\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "B'den Satır(lar) Seç" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -243,11 +243,11 @@ "Seç\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "C'den Satır(lar) Seç" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -255,12 +255,12 @@ "Seç\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Kaynak Seçiminden Sonra Otomatik Olarak Bir Sonraki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -268,11 +268,11 @@ "Otomatik\n" "Sonraki" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Farklar için Boşluk && Sekme Karakterlerini Göster" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -280,21 +280,21 @@ "Beyaz\n" "Karakter" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Boşluğu Göster" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Satır Numaralarını Göster" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -302,181 +302,201 @@ "Satır\n" "Numaraları" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "A'yı Heryerde Seç" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "B'yi Heryerde Seç" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "C'yi Heryerde Seç" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için A'yı Seç" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için B'yi Seç" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için C'yi Seç" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için A'yı Seç" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için B'yi Seç" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için C'yi Seç" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Basit Çakışmaları Otomatik Olarak Çöz" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Geçmiş Çakışmalarını Otomatik Olarak Çözümle" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "A Penceresini Göster" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "B Penceresini Göster" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "C Penceresini Göster" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Bir Sonraki Pencereye Odaklan" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Normal Öngörünüm" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A - B Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Bir Önceki Pencereye Odaklan" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Hazır." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Birleştirme sonucu kaydedilmedi." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Uyarı" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Kaydet ve Çık" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Kaydetmeden Çık" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Birleştirme sonucunun kaydedilmesi başarısız oldu." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Şu anda bir dizin birleştirmesi gerçekleştiriyorsunuz. Çıkmak istediğinizden " "emin misiniz?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Dosya kaydediliyor..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Dosya yeni bir isimle kaydediliyor..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Farklı Kaydet..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Yazdırma..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "En üst satır" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Seçim" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Yazdırma işlemi tamamlandı." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Yazdırma işlemi sonlandırıldı." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Çıkılıyor..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Araç çubuğu açılıyor/kapatılıyor..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Durum çubğunu göster/sakla..." @@ -571,28 +591,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Dosya kopyalanırken hata oluştu: Yazılamadı. Dosya adı: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Okuma dizini: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Listeleme dizini: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&İptal" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Geçici dosyaya pano verisi yazma başarısız." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "Panodan" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -607,7 +627,7 @@ "\n" "Önişleme komutu artık devre dışı bırakılacak." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -622,7 +642,7 @@ "\n" "Satır-eşleme-önişleme komutu devre dışı bırakılacak." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -630,7 +650,7 @@ "Veri kaybı hatası:\n" "Bu durum tekrarlanabilir bir durumsa lütfen yazarla iletişim kurun.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Ciddi Dahili Hata" @@ -652,8 +672,8 @@ msgid "C (Optional):" msgstr "C (İsteğe Bağlı):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Birleştir" @@ -776,7 +796,7 @@ msgid "OK" msgstr "Tamam" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "İptal" @@ -949,7 +969,7 @@ "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Satır ve biçim:" @@ -1187,8 +1207,8 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Dizin Birleştirmesi" +msgid "Directory" +msgstr "Dizin" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1658,7 +1678,7 @@ #: main.cpp:208 msgid "GNU-Diffutils" -msgstr "" +msgstr "GNU-Diffutils" #: main.cpp:209 msgid "Tino Boellsterling, Timothy Mee" @@ -1758,7 +1778,7 @@ msgid "file3 to open" msgstr "açılacak üçüncü dosya" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Dosya" @@ -1770,10 +1790,6 @@ msgid "Line not available" msgstr "Satır kullanılabilir değil" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "En üst satır" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Son" @@ -1841,83 +1857,83 @@ msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "" -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "%1 ve %2 dosyaları ikili olarak denk.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "%1 ve %2 dosyaları denk metinlere sahip ama ikili (binary) olarak denk " "değil.\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Çık" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Birleştirmeye Devam Et" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Dosyalar açılıyor..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Dosya açma hatası" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Seçim kesiliyor..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Seçim panoya kopyalanıyor..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Pano içeriği yerleştiriliyor..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Kaydet ve Devam Et" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Kaydetmeden Devam Et" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Arama tamamlandı." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Arama Tamamlandı" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "" @@ -1928,70 +1944,70 @@ "file in the source package for details." msgstr "" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Bağların ve normal dosyaların karışımı." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Bağ: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Boyut. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Tarih & Boyut: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 dosyasının geçici kopyasının oluşturulmasında hata oluştu." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "%1 açılamadı." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Dosya karşılaştırılıyor..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "%1 konumundan okunamıyor" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "İsim" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "İşlem" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Durum" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Çözülmemiş" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Çözülmüş" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Beyaz değil" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Beyaz" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -1999,34 +2015,34 @@ "Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve " "dizini yeniden taramak istediğinizden emin misiniz?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Yeniden Tara" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Dizinler açılamadı:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "B Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "C Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Dizin Açma Hatası" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2035,129 +2051,129 @@ "3 dizin birleştirilirken hedef dizin A ya da B ile aynı olmamalıdır.\n" "Devam etmeden önce kontrol ediniz." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Parametre Uyarısı" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Dizinler taranıyor..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "A Dizini Okunuyor" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "B Dizini Okunuyor" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "C Dizini Okunuyor" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Bazı altdizinler okunabilir değildi" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Altdizinlerin izinlerini kontrol ediniz." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Dizin Karşılaştırma Durumu" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Altdizinlerin sayısı:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Eşit dosyaların sayısı:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Farklı dosyaların sayısı:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "El ile birleştirmelerin sayısı:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Bu, tüm birleştirme işlemlerini etkiler." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Tüm Birleştirme İşlemleri Değiştiriliyor" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "İşleniyor" -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Yapılacak." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "A'yı B'ye kopyala" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "B'yi A'ya kopyala" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "A'yı Sil" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "B'yi Sil" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "A ve B'yi Sil" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "A ile Birleştir" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "B ile Birleştir" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "A ve B ile Birleştir" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "(varsa) Sil" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Birleştir (el ile)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Hata: Çakışan Dosya Türleri" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Hata: Tarihler aynı fakat dosyalar aynı değil." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Bu işlem şu anda yapılabilir değil." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "İşlem Yapılabilir Değil" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2172,46 +2188,46 @@ "Bu durumun nasıl tekrarlanacağını biliyorsanız, lütfen uygulamanın yazarıyla " "iletişime geçin." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Uygulama Hatası" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Koplayanırken hata oluştu.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Hata" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Birleştirme Hatası" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Hata." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Tamamlandı." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Kaydedilmedi." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Bilinmeyen birleştirme işlemi. (Bu, hiçbir zaman oluşmamalı!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Bilinmeyen birleştirme işlemi." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2230,19 +2246,19 @@ "Bu uygulama hala beta durumundadır ve ne olursa olsun hiçbir GARANTİSİ " "YOKTUR! Önemli verilerinizin yedeğini alın!!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Birleştirme Başlıyor" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Yap" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Dene" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2250,7 +2266,7 @@ "Renklendirilmiş nesne, değişik dizinlerde değişik dosya türüne sahip. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -2258,14 +2274,14 @@ "Dosyaların değiştirilme tarihleri aynı fakat dosyalar aynı değil. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "Bu işlem şu anda yapılamaz çünkü dizin birleştirmesi hala devam ediyor." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2275,209 +2291,209 @@ "Hata oluşturan nesne ile devam etmek mi yoksa bu nesneyi atlamak mı " "istiyorsunuz?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Bir hatadan sonra birleştirmeye devam et" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Son Nesne ile Devam Et" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Nesneyi Atla" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Atlandı" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Uygulanıyor..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Birleştirme işlemi tamamlandı." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Birleştirme Tamamlandı" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Bir hata oluştu. Detaylı bilgi görmek için Tamam düğmesine basın.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Hata: %1 silinirken oluştu: Yedek alınamadı." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "dizini özyinelemeli olarak sil( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "sil( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Hata: dizin okunmaya çalışırken dizini silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Hata: rmdir( %1 ) işlemi başarısız oldu." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Hata: silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "el ile birleştir( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Not: El ile birleştirmeden sonra kullanıcı F7 ile devam etmelidir." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hata: kopyala( %1 -> %2) başarısız oldu. Mevcut hedefin silinmesi başarısız " "oldu." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "BağıKopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Hata: BağıKopyala başarısız oldu: Uzak bağlar henüz desteklenmiyor." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Hata: BağıKopyala başarısız oldu." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Yeniden isimlendirilirken ( %1 -> %2 ) hata oluştu: Mevcut hedef silinemiyor." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "yeniden isimlendir( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Hata: Yeniden isimlendirme başarısız oldu." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 klasörü oluşturulurken hata: Mevcut dosya silinemiyor." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "dizin oluştur( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Dizin oluşturulması sırasında hata oluştu." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Hedef" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Dizin" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Tür" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Boyut" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Özellikler" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Son Değiştirme" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Bağ-Hedefi" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "mümkün değil" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Hedef):" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Temel): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Hedef): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Hedef): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Hedef: " -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Dizin Birleştirme Durumunu Farklı Kaydet..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Dizin Birleştirmesini Başlat/Devam Et" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Mevcut Nesne için İşlem Başlat" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Mevcut Dosyayı Birleştir" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2485,39 +2501,39 @@ "Birleştir\n" "Dosya" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Tüm Alt Dizinleri Kapat" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Tüm Alt Dizinleri Aç" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Tüm Nesneler için A'yı Seç" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Tüm Nesneler için B'yi Seç" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Tüm Nesneler için C'yi Seç" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Tüm Nesneler için Atomatik-Seçim İşlemi" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Tüm Nesneler için Hiçbir Seçim" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Özdeş Dosyaları Göster" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2525,69 +2541,69 @@ "Özdeş\n" "Dosyalar" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Farklı Dosyaları Göster" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Seçilen Dosyaları Karşılaştır" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Seçilen Dosyaları Birleştir" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Bir Şey Yapma" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "A && B'yi Sil" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "A && B ile Birleştir" @@ -2599,11 +2615,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Devam Et" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Çık" @@ -2835,11 +2851,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Birleştirme Çakışması>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2847,39 +2863,58 @@ "Daha tüm çakışmalar çözülmedi.\n" "Dosya kaydedilmedi.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Çakışmalar Var" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Dosya Kaydetme Hatası" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Yazılırken hata oluştu." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Çıktı" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Değişiklik Yapıldı]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Kaydetme kodlaması" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Çakışma" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -2917,6 +2952,9 @@ msgid "Your emails" msgstr "tulliana@gmail.com" +#~ msgid "Directory Merge" +#~ msgstr "Dizin Birleştirmesi" + #~ msgid "C&ontinue" #~ msgstr "D&evam Et" @@ -2933,10 +2971,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "Araç çubuğunu açar/kapatır" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "Birleştirme işlemi tamamlandı." - #~ msgid "Files A and C have equal text. \n" #~ msgstr "A ve C dosyaları aynı metne sahip. \n"
--- a/kdiff3/po/tr/kdiff3plugin.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/tr/kdiff3plugin.po Tue Mar 03 23:50:12 2009 +0000 @@ -1,19 +1,19 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Serdar Soytetir <tulliana@gmail.com>, 2008. +# Serdar Soytetir <tulliana@gmail.com>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-08-05 08:32+0200\n" -"PO-Revision-Date: 2008-08-02 15:52+0300\n" +"PO-Revision-Date: 2009-01-30 00:48+0200\n" "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n" "Language-Team: Turkish <yerellestirme@kde.org.tr>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=1; plural=0;\n" #: kdiff3plugin.cpp:107 @@ -70,17 +70,6 @@ "\n" #: kdiff3plugin.cpp:271 -#, fuzzy -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected 2 files choose \"Compare\".\n" -#| "If the other file is somewhere else \"Save\" the first file for later. It " -#| "will appear in the \"Compare With ...\" submenu. Then use \"Compare With" -#| "\" on second file.\n" -#| "For a 3-way merge first \"Save\" the base file, then the branch to merge " -#| "and choose \"3-way merge with base\" on the other branch which will be " -#| "used as destination.\n" -#| "Same also applies to directory comparison and merge." msgid "" "Using the contextmenu extension:\n" "For simple comparison of two selected files choose \"Compare\".\n" @@ -92,13 +81,3 @@ "destination.\n" "Same also applies to directory comparison and merge." msgstr "" -"İçerik menüsü eklentisinin kullanımı:\n" -"Seçilen iki dosyanın basit karşılaştırması için \"Karşılaştır\" ögesini " -"seçin.\n" -"Eğer diğer dosya başka bir yerdeyse ilk dosyayı sonrası için \"Kaydedin\". " -"\"Karşılaştır ...\" alt menüsünde bulabilirsiniz. Daha sonra ikinci dosya " -"üzerinde \"Karşılaştır...\" ögesini kullanın.\n" -"3-yollu bir birleştirme için önce temel dosyayı, sonra birleştirilecek kısmı " -"\"Kaydedin\" ve hedef olarak kullanılacak diğer bölüm üzerinde \"temelle 3-" -"yollu birleştirme\"yi seçin\n" -"Aynı yöntem dizin karşılaştırma ve birleştirme için de geçerlidir."
--- a/kdiff3/po/uk/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/uk/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -3,111 +3,111 @@ # # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2006. # Ivan Petrouchtchak <fr.ivan@ukrainian-orthodox.org>, 2008. -# Yuri Chornoivan <yurchor@ukr.net>, 2008. +# Yuri Chornoivan <yurchor@ukr.net>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" -"PO-Revision-Date: 2008-10-27 19:17+0200\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" +"PO-Revision-Date: 2009-01-18 15:44+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\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" +"X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 msgid "Current Configuration:" msgstr "Поточне налаштування:" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 msgid "Config Option Error:" msgstr "Помилка конфігураційного параметра:" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "Використано параметр --auto, але не вказано файла виводу." -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "Під час порівняння каталогів параметр --auto проігноровано." -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "Помилка збереження." -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "Виникла помилка при відриванні цих файлів:" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "Помилка відкриття файла" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "Відкриває документи для порівняння..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 msgid "Reload" msgstr "Перезавантажити" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Зберігає результат об’єднання. Всі конфлікти слід розв’язати!" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "Зберігає поточний документ як..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "Показати розбіжності" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "Закриває програму" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вирізує вибране та кладе його у кишеню" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "Копіює вибране до кишені" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "Вставляє вміст кишені в поточну позицію" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "Вибрати все у поточному вікні" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "Шукати рядок" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "Шукати знову рядок" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "Вмикає/вимикає рядок стану" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "Налаштувати KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "Перейти до поточної дельти" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "" "Current\n" "Delta" @@ -115,11 +115,11 @@ "Поточна\n" "дельта" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "Перейти до першої дельти" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "" "First\n" "Delta" @@ -127,11 +127,11 @@ "Перша\n" "дельта" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "Перейти до останньої дельти" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "" "Last\n" "Delta" @@ -139,11 +139,11 @@ "Остання\n" "дельта" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Пропускає різниці у пробілах, якщо вимкнено \"Показувати пробіли\".)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -151,11 +151,11 @@ "(Не пропускати різниці у пробілах, навіть якщо вимкнено параметр " "\"Показувати пробіли\".)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "Перейти до попередньої дельти" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "" "Prev\n" "Delta" @@ -163,11 +163,11 @@ "Попередня\n" "дельта" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "Перейти до наступної дельти" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "" "Next\n" "Delta" @@ -175,11 +175,11 @@ "Наступна\n" "дельта" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "Перейти до попереднього конфлікту" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "" "Prev\n" "Conflict" @@ -187,11 +187,11 @@ "Попередній\n" "конфлікт" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "Перейти до наступного конфлікту" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "" "Next\n" "Conflict" @@ -199,11 +199,11 @@ "Наступний\n" "конфлікт" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "Перейти до попереднього нерозв’язаного конфлікту" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "" "Prev\n" "Unsolved" @@ -211,11 +211,11 @@ "Попередній\n" "нерозв’язаний" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "Перейти до наступного нерозв’язаного конфлікту" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "" "Next\n" "Unsolved" @@ -223,11 +223,11 @@ "Неступний\n" "нерозв’язаний" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "Виберіть рядки з A" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" @@ -235,11 +235,11 @@ "Вибрати\n" "A" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "Вибрати рядки з B" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" @@ -247,11 +247,11 @@ "Вибрати\n" "B" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "Вибрати рядки з C" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" @@ -259,11 +259,11 @@ "Вибрати\n" "C" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Автоматично перейти до наступного конфлікту за визначення джерела" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "" "Auto\n" "Next" @@ -271,11 +271,11 @@ "Автоматично\n" "наступний" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "Показувати символи пробілів і табуляцій для різниць" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" @@ -283,11 +283,11 @@ "Символи-\n" "пробіли" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "Проказувати пробіли" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" @@ -295,11 +295,11 @@ "Пробіли-\n" "дельти" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "Показувати номери рядків" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "" "Line\n" "Numbers" @@ -307,181 +307,201 @@ "Номери\n" "рядків" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "Обрати A всюди" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "Обрати B всюди" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "Обрати C всюди" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "Обрати A для всіх нерозв’язаних конфліктів" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "Обрати B для всіх нерозв’язаних конфліктів" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "Обрати C для всіх нерозв’язаних конфліктів" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Обрати A для всіх нерозв’язаних конфліктів пробілів" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Обрати B для всіх нерозв’язаних конфліктів пробілів" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Обрати C для всіх нерозв’язаних конфліктів пробілів" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "Автоматично розв’язувати прості конфлікти" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "Застосувати різницю до конфліктів" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "Запустити автооб’єднання за формальними виразами" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 msgid "Automatically Solve History Conflicts" msgstr "Автоматично розв’язувати конфлікти у історії" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "Розділити різницю на вибраному" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 msgid "Join Selected Diffs" msgstr "Об’єднати вибрані різниці" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "Показати вікно A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "Показати вікно B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "Показати вікно C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "Фокус до наступного вікна" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "Звичайний огляд" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "Перегляд A з B" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "Перегляд A з C Overview" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "Перегляд B з C" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "Перенесення рядків у вікнах різниці" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "Додати вирівнювання різниці вручну" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "Очистити всі вирівнювання різниці вручну" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "Фокус на попереднє вікно" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "Перемкнути орієнтацію відокремлення" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "Розділений перегляд тексту і тек" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "Перемкнутися між переглядом тексту і тек" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "Готове." -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "Результат об’єднання не збережено." -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "Попередження" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "Зберегти і вийти" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "Вийти без збереження" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "Помилка під час збереження результатів об’єднання." -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Зараз ви виконуєте об’єднання каталогів. Ви впевнені, що бажаєте перервати " "його?" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "Збереження файла..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "Файл зберігається з новою назвою..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "Зберегти як..." -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +msgid "Printing..." +msgstr "Друк..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +msgid "Top line" +msgstr "Верхній рядок" + +#: kdiff3.cpp:951 +msgid "Selection" +msgstr "Вибір" + +#: kdiff3.cpp:977 +msgid "Printing completed." +msgstr "Друк завершено." + +#: kdiff3.cpp:981 +msgid "Printing aborted." +msgstr "Друк перервано." + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "Вихід..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "Перемикання пенала..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "Перемикання рядка стану..." @@ -580,28 +600,28 @@ msgstr "" "Помилка під час операції копіювання: Невдала спроба запису. Назва файла: %1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "Читання каталогу: " -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "Побудова списку каталогу: %1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "&Скасувати" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "Помилка запису даних кишені у тимчасовий файл." -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "З кишені" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -616,7 +636,7 @@ "\n" "Зараз команду попередньої обробки буде вимкнено." -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -632,7 +652,7 @@ "\n" "Команда попередньої обробки відповідних рядків зараз буде вимкнено." -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -640,7 +660,7 @@ "Помилка, пов’язана з втратою даних:\n" "Якщо цю помилку можна відтворити, зверніться до автора програми.\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "Критична внутрішня помилка" @@ -662,8 +682,8 @@ msgid "C (Optional):" msgstr "C (додатковий):" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "Об'єднати" @@ -794,7 +814,7 @@ msgid "OK" msgstr "Гаразд" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "Скасувати" @@ -978,7 +998,7 @@ "Увімкнено: Будь-яка вибрана область копіюється до кишені.\n" "Вимкнено: Явне проведення копіювання, наприклад, за допомогою Ctrl-C." -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "Стиль кінців рядка:" @@ -1268,8 +1288,8 @@ "(Відповідає параметру командного рядка \"--auto\".)" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "Об’єднання каталогів" +msgid "Directory" +msgstr "Каталог" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1908,7 +1928,7 @@ msgid "file3 to open" msgstr "файл3 для відкриття" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 msgid "File" msgstr "Файл" @@ -1920,10 +1940,6 @@ msgid "Line not available" msgstr "Рядок недоступний" -#: difftextwindow.cpp:1721 -msgid "Top line" -msgstr "Верхній рядок" - #: difftextwindow.cpp:1731 msgid "End" msgstr "Кінець" @@ -1994,28 +2010,28 @@ msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "Всі вхідні файли однакові." -#: pdiff.cpp:530 +#: pdiff.cpp:534 msgid "All input files contain the same text, but are not binary equal." msgstr "" "Всі вхідні файли містять однаковий текст, але не є двійково однаковими." -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файли %1 і %2 двійково однакові.\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Файли %1 і %2 містять однаковий текст, але не є двійково однаковими. \n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -2026,55 +2042,55 @@ "файлів.\n" "Продовжуйте, але можливі помилки." -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "Перервати" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "Продовжити об'єднання" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "Відкриття файлів..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "Помилка відкриття файла" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "Вирізання вибраного..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "Копіювання вибраного до кишені..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "Вставлення вмісту кишені..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "Зберегти й продовжити" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "Продовжити без збереження" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "Пошук завершено." -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "Пошук завершено" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "Нічого не обрано у жодному з вхідних вікон різниці." -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Error while adding manual diff range" msgstr "Помилка під час додавання вручну діапазону diff" @@ -2088,70 +2104,70 @@ "Зазвичай, це є наслідком проблем зі встановленням. Будь ласка, прочитайте " "файл README у пакунку джерела, щоб дізнатися більше." -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "Суміш посилань і звичайних файлів." -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "Посилання: " -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "Розмір. " -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "Дата і розмір: " -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Помилка створення тимчасової копії %1." -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "Помилка відкриття %1." -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "Порівняння файла..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "Помилка читання з %1" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "Назва" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "Дія" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "Стан" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "Не розв'язано" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "Розв'язано" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "Не-білий" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "Білий" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -2159,34 +2175,34 @@ "Зараз ви виконуєте об’єднання каталогів. Ви впевнені, що бажаєте перервати " "об’єднання і пересканувати каталог?" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "Пересканувати" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "Помилка відкриття каталогів:" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталог А \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталог В \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталог С \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "Помилка відкриття каталогу" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2196,129 +2212,129 @@ "ієрархічні каталоги.\n" "Перевірте ще раз перш ніж продовжувати." -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "Попередження про параметри" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "Сканування каталогів..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "Читання каталогу A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "Читання каталогу B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "Читання каталогу C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "Деякі підтеки не придатні для читання у" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "Перевірте права доступу до підкаталогів." -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "Стан порівняння каталогів" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "Кількість підкаталогів:" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "Кількість однакових файлів:" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "Кількість різних файлів:" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "Кількість об’єднань вручну:" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "Це торкнеться всіх операцій об’єднання." -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "Зміна всіх операцій об’єднання" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "Обробка " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "Реалізувати." -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "Копіювати A до B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "Копіювати B до A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "Вилучити A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "Вилучити B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "Вилучити A і B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "Об’єднати у A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "Об’єднати у B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "Об’єднати у A і B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "Вилучити (якщо існує)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "Об’єднати (вручну)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "Помилка: Конфлікт типів файлів" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "Помилка: Дати однакові, а файли відрізняються." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "Зараз ця операція неможлива." -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "Операція неможлива" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2333,46 +2349,46 @@ "Якщо вам відомо яким чином відтворити помилку, будь ласка, повідомте про неї " "авторів програми." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "Помилка програми" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "Під час копіювання сталася помилка.\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 msgid "Error" msgstr "Помилка" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "Помилка об’єднання" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "Помилка." -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "Завершено." -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "Не збережено." -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "Невідома операція об’єднання. (Цього не мало статися!)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "Невідома операція об’єднання." -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2392,19 +2408,19 @@ "Зауважте, що ця програма знаходиться у стані тестування і розробники НЕ " "МОЖУТЬ ГАРАНТУВАТИ нічого! Зробіть резервну копію важливих даних!" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "Запуск об’єднання" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "Зробити" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "Симулювати" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -2412,19 +2428,19 @@ "Підсвічений елемент має відмінний тип у різних каталогах. Виберіть потрібну " "дію." -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Дати змін файлів однакові, але файли — різні. Виберіть дію." -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Ця дія зараз неможлива, оскільки виконується об’єднання каталогів." -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2434,218 +2450,218 @@ "Бажаєте продовжити з елемента, що викликав помилку чи бажаєте пропустити цей " "елемент?" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "Продовжити об’єднання після помилки" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "Продовжити з останнього елемента" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "Пропустити елемент" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "Виконання..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "Операцію об’єднання завершено." -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "Об’єднання завершено" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Імітацію об’єднання завершено: перевірте, чи згодні ви з запропонованими " "операціями." -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Сталася помилка. Натисніть кнопку \"Гаразд\", щоб побачити докладнішу " "інформацію.\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Помилка: під час вилучення %1: невдала спроба створення резерву." -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурсивно вилучити каталог( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Помилка: невдача під час спроби виконання дії delete для теки на етапі " "читання теки." -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Помилка: невдала спроба виконати rmdir( %1 )." -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "Помилка: дія вилучення зазнала невдачі." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Зауваження: Після завершення об’єднання вручу користувач може " "продовжити роботу натисканням F7." -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Помилка: невдала спроба copy( %1 -> %2 ). Неможливо вилучити існуючий файл " "призначення." -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Помилка: невдала спроба copyLink: віддалені посилання ще не підтримуються." -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "Помилка: copyLink зазнала невдачі." -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Помилка під час rename( %1 -> %2 ): Не вдалося вилучити існуюче призначення." -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "Помилка: Перейменування зазнало невдачі." -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Помилка під час виконання makeDir %1. Не вдалося вилучити існуючий файл." -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "Помилка створення каталогу." -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "Призн." -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "Розмір" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "Атриб." -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "Час останньої зміни" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "Призначення посилання" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "не доступне" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (Призн.): " -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A (Основа): " -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (Призн.): " -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (Призн.): " -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "Призн.:" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 msgid "Save Directory Merge State As..." msgstr "Зберегти режим об’єднання каталогів як..." -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "Почати/Продовжити об’єднання каталогів" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "Виконати операцію для поточного елемента" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "Порівняти вибраний файл" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "Об’єднати поточний файл" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "" "Merge\n" "File" @@ -2653,39 +2669,39 @@ "Об’єднати\n" "файл" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "Згорнути всі підтеки" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "Розгорнути всі підтеки" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "Вибрати A для списку всіх елементів" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "Вибрати B для списку всіх елементів" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "Вибрати C для списку всіх елементів" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "Операція автовибору для всіх елементів" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "Нічого не робити з усіма елементами" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "Показати однакові файли" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" @@ -2693,15 +2709,15 @@ "Однакові\n" "файли" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 msgid "Show Different Files" msgstr "Показати різні файли" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "Показувати файли лише у A" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" @@ -2709,11 +2725,11 @@ "Файли\n" "лише у A" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "Показувати файли лише у B" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" @@ -2721,11 +2737,11 @@ "Файли\n" "лише у B" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "Показувати файли лише у C" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" @@ -2733,35 +2749,35 @@ "Файли\n" "лише у C" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 msgid "Compare Explicitly Selected Files" msgstr "Порівняти явно вибрані файли" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 msgid "Merge Explicitly Selected Files" msgstr "Об’єднати явно вибрані файли" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "Нічого не робити" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "Вилучити A і B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "Об’єднати у A і B" @@ -2773,11 +2789,11 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 msgid "Continue" msgstr "Продовжити" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "Вийти" @@ -2813,7 +2829,7 @@ #. i18n: ectx: Menu (movement) #: kreplacements/kreplacements.cpp:307 rc.cpp:24 msgid "&Movement" -msgstr "&Рух" +msgstr "П&ересування" #. i18n: file: kdiff3_shell.rc:61 #. i18n: ectx: Menu (diff) @@ -2825,7 +2841,7 @@ #. i18n: ectx: Menu (merge) #: kreplacements/kreplacements.cpp:309 rc.cpp:30 msgid "&Merge" -msgstr "&Об'єднати" +msgstr "&Об'єднання" #. i18n: file: kdiff3_shell.rc:95 #. i18n: ectx: Menu (window) @@ -3010,11 +3026,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<Конфлікт об’єднання (Лише пробіл)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<Конфлікт об’єднання>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -3022,12 +3038,22 @@ "Розв’язано не всі конфлікти.\n" "Файл не збережено.\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "Залишилось конфліктів" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" +"Виник конфлікт, пов’язаний з різними стилями завершення рядків. Будь ласка, " +"оберіть потрібний стиль вручну.\n" +"Файл не було збережено.\n" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -3036,28 +3062,40 @@ "\n" "Помилка створення резервної копії. Файл не збережено." -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "Помилка збереження файла" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "Помилка при записуванні." -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "Вивід" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[Змінено]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 msgid "Encoding for saving" msgstr "Кодування для збереження" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "Unix" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "DOS" + +#: mergeresultwindow.cpp:3215 +msgid "Conflict" +msgstr "Конфлікт" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "Кодек з" @@ -3094,3 +3132,6 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "fr.ivan@ukrainian-orthodox.org,yurchor@ukr.net" + +#~ msgid "Directory Merge" +#~ msgstr "Об’єднання каталогів"
--- a/kdiff3/po/zh_CN/kdiff3.po Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/po/zh_CN/kdiff3.po Tue Mar 03 23:50:12 2009 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdiff3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2008-12-08 10:27+0100\n" +"POT-Creation-Date: 2009-01-18 10:49+0100\n" "PO-Revision-Date: 2005-02-07 10:03+0800\n" "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -16,99 +16,99 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kdiff3.cpp:167 +#: kdiff3.cpp:169 #, fuzzy msgid "Current Configuration:" msgstr "当前项目同步操作" -#: kdiff3.cpp:172 +#: kdiff3.cpp:174 #, fuzzy msgid "Config Option Error:" msgstr "文件打开出错" -#: kdiff3.cpp:217 +#: kdiff3.cpp:219 msgid "Option --auto used, but no output file specified." msgstr "选项 -- 自动使用，但没有指定输出文件。" -#: kdiff3.cpp:366 +#: kdiff3.cpp:369 msgid "Option --auto ignored for directory comparison." msgstr "选项 -- 自动忽略目录比较。" -#: kdiff3.cpp:402 +#: kdiff3.cpp:405 msgid "Saving failed." msgstr "保存失败。" -#: kdiff3.cpp:437 pdiff.cpp:1080 pdiff.cpp:1151 +#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194 msgid "Opening of these files failed:" msgstr "打开以下文件失败：" -#: kdiff3.cpp:446 +#: kdiff3.cpp:449 msgid "File Open Error" msgstr "文件打开出错" -#: kdiff3.cpp:474 +#: kdiff3.cpp:477 msgid "Opens documents for comparison..." msgstr "打开文档比较..." -#: kdiff3.cpp:476 +#: kdiff3.cpp:479 #, fuzzy #| msgid "Ready." msgid "Reload" msgstr "就绪。" -#: kdiff3.cpp:479 +#: kdiff3.cpp:482 msgid "Saves the merge result. All conflicts must be solved!" msgstr "保存合并结果。必须解决全部冲突！" -#: kdiff3.cpp:481 +#: kdiff3.cpp:484 msgid "Saves the current document as..." msgstr "保存当前文档为..." -#: kdiff3.cpp:483 +#: kdiff3.cpp:486 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:488 msgid "Quits the application" msgstr "退出程序" -#: kdiff3.cpp:487 +#: kdiff3.cpp:490 msgid "Cuts the selected section and puts it to the clipboard" msgstr "剪切所选节，将其放入剪贴板" -#: kdiff3.cpp:489 +#: kdiff3.cpp:492 msgid "Copies the selected section to the clipboard" msgstr "复制所选节至剪贴板" -#: kdiff3.cpp:491 +#: kdiff3.cpp:494 msgid "Pastes the clipboard contents to actual position" msgstr "粘贴剪贴板内容到实际位置" -#: kdiff3.cpp:493 +#: kdiff3.cpp:496 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:498 msgid "Search for a string" msgstr "搜索字符串" -#: kdiff3.cpp:497 +#: kdiff3.cpp:500 msgid "Search again for the string" msgstr "再次搜索该字符串" -#: kdiff3.cpp:502 +#: kdiff3.cpp:505 msgid "Enables/disables the statusbar" msgstr "启用/禁止状态栏" -#: kdiff3.cpp:506 +#: kdiff3.cpp:509 msgid "Configure KDiff3..." msgstr "配置 KDiff3..." -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 msgid "Go to Current Delta" msgstr "到当前 Delta" -#: kdiff3.cpp:527 +#: kdiff3.cpp:530 #, fuzzy #| msgid "Go to Current Delta" msgid "" @@ -116,11 +116,11 @@ "Delta" msgstr "到当前 Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 msgid "Go to First Delta" msgstr "到第一个 Delta" -#: kdiff3.cpp:529 +#: kdiff3.cpp:532 #, fuzzy #| msgid "Go to First Delta" msgid "" @@ -128,11 +128,11 @@ "Delta" msgstr "到第一个 Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 msgid "Go to Last Delta" msgstr "到最后一个 Delta" -#: kdiff3.cpp:531 +#: kdiff3.cpp:534 #, fuzzy #| msgid "Go to Last Delta" msgid "" @@ -140,21 +140,21 @@ "Delta" msgstr "到最后一个 Delta" -#: kdiff3.cpp:533 +#: kdiff3.cpp:536 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(禁用“显示空白字符”时跳过空白差异。)" -#: kdiff3.cpp:534 +#: kdiff3.cpp:537 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "(禁用“显示空白字符”时也不跳过空白差异。)" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 msgid "Go to Previous Delta" msgstr "到上一个 Delta" -#: kdiff3.cpp:535 +#: kdiff3.cpp:538 #, fuzzy #| msgid "Go to Previous Delta" msgid "" @@ -162,11 +162,11 @@ "Delta" msgstr "到上一个 Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 msgid "Go to Next Delta" msgstr "到下一个 Delta" -#: kdiff3.cpp:537 +#: kdiff3.cpp:540 #, fuzzy #| msgid "Go to Next Delta" msgid "" @@ -174,11 +174,11 @@ "Delta" msgstr "到下一个 Delta" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 msgid "Go to Previous Conflict" msgstr "到上一个冲突" -#: kdiff3.cpp:539 +#: kdiff3.cpp:542 #, fuzzy #| msgid "Conflicts" msgid "" @@ -186,11 +186,11 @@ "Conflict" msgstr "冲突" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 msgid "Go to Next Conflict" msgstr "到下一个冲突" -#: kdiff3.cpp:541 +#: kdiff3.cpp:544 #, fuzzy #| msgid "Go to Next Conflict" msgid "" @@ -198,11 +198,11 @@ "Conflict" msgstr "到下一个冲突" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 msgid "Go to Previous Unsolved Conflict" msgstr "到上一个未解决冲突" -#: kdiff3.cpp:543 +#: kdiff3.cpp:546 #, fuzzy #| msgid "Unsolved" msgid "" @@ -210,11 +210,11 @@ "Unsolved" msgstr "未解决的" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 msgid "Go to Next Unsolved Conflict" msgstr "到下一个未解决冲突" -#: kdiff3.cpp:545 +#: kdiff3.cpp:548 #, fuzzy #| msgid "Unsolved" msgid "" @@ -222,72 +222,72 @@ "Unsolved" msgstr "未解决的" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "Select Line(s) From A" msgstr "从 A 选择 行" -#: kdiff3.cpp:547 +#: kdiff3.cpp:550 msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "Select Line(s) From B" msgstr "从 B 选择行" -#: kdiff3.cpp:548 +#: kdiff3.cpp:551 msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "Select Line(s) From C" msgstr "从 C 选择行" -#: kdiff3.cpp:549 +#: kdiff3.cpp:552 msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "源码选择后自动到下一个未解决冲突" -#: kdiff3.cpp:550 +#: kdiff3.cpp:553 #, fuzzy msgid "" "Auto\n" "Next" msgstr "自动复制选择" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "Show Space && Tabulator Characters for Differences" msgstr "显示间距和制表符的不同" -#: kdiff3.cpp:552 +#: kdiff3.cpp:555 msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "Show White Space" msgstr "显示空白字符" -#: kdiff3.cpp:553 +#: kdiff3.cpp:556 msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 msgid "Show Line Numbers" msgstr "显示行数" -#: kdiff3.cpp:555 +#: kdiff3.cpp:558 #, fuzzy #| msgid "Show Line Numbers" msgid "" @@ -295,181 +295,207 @@ "Numbers" msgstr "显示行数" -#: kdiff3.cpp:556 +#: kdiff3.cpp:559 msgid "Choose A Everywhere" msgstr "选择 A 全部" -#: kdiff3.cpp:557 +#: kdiff3.cpp:560 msgid "Choose B Everywhere" msgstr "选择 B 全部" -#: kdiff3.cpp:558 +#: kdiff3.cpp:561 msgid "Choose C Everywhere" msgstr "选择 C 全部" -#: kdiff3.cpp:559 +#: kdiff3.cpp:562 msgid "Choose A for All Unsolved Conflicts" msgstr "选择 A 全部未解决冲突" -#: kdiff3.cpp:560 +#: kdiff3.cpp:563 msgid "Choose B for All Unsolved Conflicts" msgstr "选择 B 全部未解决冲突" -#: kdiff3.cpp:561 +#: kdiff3.cpp:564 msgid "Choose C for All Unsolved Conflicts" msgstr "选择 C 全部未解决冲突" -#: kdiff3.cpp:562 +#: kdiff3.cpp:565 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "选择 A 全部未解决空白字符冲突" -#: kdiff3.cpp:563 +#: kdiff3.cpp:566 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "选择 B 全部未解决空白字符冲突" -#: kdiff3.cpp:564 +#: kdiff3.cpp:567 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "选择 C 全部未解决空白字符冲突" -#: kdiff3.cpp:565 +#: kdiff3.cpp:568 msgid "Automatically Solve Simple Conflicts" msgstr "自动解决简单冲突" -#: kdiff3.cpp:566 +#: kdiff3.cpp:569 msgid "Set Deltas to Conflicts" msgstr "设置 Delta 为冲突" -#: kdiff3.cpp:567 +#: kdiff3.cpp:570 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:568 +#: kdiff3.cpp:571 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "自动解决简单冲突" -#: kdiff3.cpp:569 +#: kdiff3.cpp:572 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:570 +#: kdiff3.cpp:573 #, fuzzy msgid "Join Selected Diffs" msgstr "比较所选文件" -#: kdiff3.cpp:572 +#: kdiff3.cpp:575 msgid "Show Window A" msgstr "显示窗口 A" -#: kdiff3.cpp:573 +#: kdiff3.cpp:576 msgid "Show Window B" msgstr "显示窗口 B" -#: kdiff3.cpp:574 +#: kdiff3.cpp:577 msgid "Show Window C" msgstr "显示窗口 C" -#: kdiff3.cpp:575 kdiff3.cpp:586 +#: kdiff3.cpp:578 kdiff3.cpp:589 msgid "Focus Next Window" msgstr "聚焦于下一个窗口" -#: kdiff3.cpp:577 +#: kdiff3.cpp:580 msgid "Normal Overview" msgstr "普通概览" -#: kdiff3.cpp:578 +#: kdiff3.cpp:581 msgid "A vs. B Overview" msgstr "A 和 B 概览" -#: kdiff3.cpp:579 +#: kdiff3.cpp:582 msgid "A vs. C Overview" msgstr "A 和 C 概览" -#: kdiff3.cpp:580 +#: kdiff3.cpp:583 msgid "B vs. C Overview" msgstr "B 和 C 概览" -#: kdiff3.cpp:581 +#: kdiff3.cpp:584 msgid "Word Wrap Diff Windows" msgstr "在 Diff 窗口自动换行" -#: kdiff3.cpp:582 +#: kdiff3.cpp:585 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:586 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:588 +#: kdiff3.cpp:591 msgid "Focus Prev Window" msgstr "聚焦于上一个窗口" -#: kdiff3.cpp:589 +#: kdiff3.cpp:592 msgid "Toggle Split Orientation" msgstr "切换分隔方向" -#: kdiff3.cpp:591 +#: kdiff3.cpp:594 msgid "Dir && Text Split Screen View" msgstr "目录和文本分屏视图" -#: kdiff3.cpp:593 +#: kdiff3.cpp:596 msgid "Toggle Between Dir && Text View" msgstr "切换目录和文本视图" -#: kdiff3.cpp:615 kdiff3.cpp:707 kdiff3.cpp:732 kdiff3.cpp:1003 -#: kdiff3.cpp:1024 pdiff.cpp:1098 pdiff.cpp:1170 pdiff.cpp:1208 pdiff.cpp:1224 -#: pdiff.cpp:1254 pdiff.cpp:1265 directorymergewindow.cpp:739 +#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016 +#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267 +#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721 msgid "Ready." msgstr "就绪。" -#: kdiff3.cpp:649 pdiff.cpp:1753 +#: kdiff3.cpp:652 pdiff.cpp:1792 msgid "The merge result hasn't been saved." msgstr "合并结果未保存。" -#: kdiff3.cpp:650 kdiff3.cpp:660 kdiff3.cpp:672 pdiff.cpp:1016 pdiff.cpp:1754 -#: pdiff.cpp:1764 directorymergewindow.cpp:407 mergeresultwindow.cpp:303 +#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 +#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303 msgid "Warning" msgstr "" -#: kdiff3.cpp:651 +#: kdiff3.cpp:654 msgid "Save && Quit" msgstr "保存并退出" -#: kdiff3.cpp:652 +#: kdiff3.cpp:655 msgid "Quit Without Saving" msgstr "退出不保存" -#: kdiff3.cpp:660 pdiff.cpp:1764 +#: kdiff3.cpp:663 pdiff.cpp:1803 msgid "Saving the merge result failed." msgstr "保存合并结果失败。" -#: kdiff3.cpp:671 pdiff.cpp:1015 +#: kdiff3.cpp:674 pdiff.cpp:1058 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "您当前正在合并目录。您确认要放弃吗？" -#: kdiff3.cpp:696 +#: kdiff3.cpp:699 msgid "Saving file..." msgstr "正在保存文件..." -#: kdiff3.cpp:713 +#: kdiff3.cpp:716 msgid "Saving file with a new filename..." msgstr "正在用新文件名保存文件..." -#: kdiff3.cpp:715 kreplacements/kreplacements.cpp:620 +#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620 msgid "Save As..." msgstr "" -#: kdiff3.cpp:974 +#: kdiff3.cpp:810 +#, fuzzy +msgid "Printing..." +msgstr "正在退出..." + +#: kdiff3.cpp:826 difftextwindow.cpp:1721 +#, fuzzy +msgid "Top line" +msgstr "顶端行数 %1" + +#: kdiff3.cpp:951 +#, fuzzy +#| msgid "Select Another Font" +msgid "Selection" +msgstr "选择另一种字体" + +#: kdiff3.cpp:977 +#, fuzzy +msgid "Printing completed." +msgstr "合并操作完成。" + +#: kdiff3.cpp:981 +#, fuzzy +msgid "Printing aborted." +msgstr "合并操作完成。" + +#: kdiff3.cpp:987 msgid "Exiting..." msgstr "正在退出..." -#: kdiff3.cpp:987 +#: kdiff3.cpp:1000 msgid "Toggling toolbar..." msgstr "切换工具栏..." -#: kdiff3.cpp:1008 +#: kdiff3.cpp:1021 msgid "Toggle the statusbar..." msgstr "切换状态栏..." @@ -562,28 +588,28 @@ msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "文件复制操作出错：写入失败。文件名：%1" -#: fileaccess.cpp:1237 +#: fileaccess.cpp:1231 msgid "Reading directory: " msgstr "读取目录：" -#: fileaccess.cpp:1361 +#: fileaccess.cpp:1355 #, kde-format msgid "Listing directory: %1" msgstr "目录列表：%1" -#: fileaccess.cpp:1495 smalldialogs.cpp:179 smalldialogs.cpp:396 +#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396 msgid "&Cancel" msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "Writing clipboard data to temp file failed." msgstr "将剪贴板数据写入临时文件失败。" -#: diff.cpp:254 +#: diff.cpp:255 msgid "From Clipboard" msgstr "从剪贴板" -#: diff.cpp:502 +#: diff.cpp:504 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -598,7 +624,7 @@ "\n" "现在预处理命令会被禁用。" -#: diff.cpp:542 +#: diff.cpp:544 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -613,7 +639,7 @@ "\n" "现在行匹配处理命令会被禁用。" -#: diff.cpp:1658 diff.cpp:1672 +#: diff.cpp:1662 diff.cpp:1676 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -621,7 +647,7 @@ "数据丢失错误：\n" "如果它是可复制的，请联系作者。\n" -#: diff.cpp:1660 diff.cpp:1674 +#: diff.cpp:1664 diff.cpp:1678 msgid "Severe Internal Error" msgstr "严重内部错误" @@ -643,8 +669,8 @@ msgid "C (Optional):" msgstr "C (可选)：" -#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1893 -#: directorymergewindow.cpp:1894 directorymergewindow.cpp:3011 +#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972 msgid "Merge" msgstr "合并" @@ -767,7 +793,7 @@ msgid "OK" msgstr "" -#: smalldialogs.cpp:514 kreplacements/kreplacements.h:103 +#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104 #: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195 msgid "Cancel" msgstr "" @@ -951,7 +977,7 @@ "打开：任何选择将被自动写入剪贴板。\n" "关闭：您必须明确复制内容，如通过 Ctrl-C。" -#: optiondialog.cpp:762 +#: optiondialog.cpp:762 mergeresultwindow.cpp:3135 msgid "Line end style:" msgstr "行尾风格：" @@ -1206,8 +1232,10 @@ msgstr "" #: optiondialog.cpp:1065 optiondialog.cpp:1066 -msgid "Directory Merge" -msgstr "目录合并" +#, fuzzy +#| msgid "&Directory" +msgid "Directory" +msgstr "目录(&D)" #: optiondialog.cpp:1079 msgid "Recursive directories" @@ -1825,7 +1853,7 @@ msgid "file3 to open" msgstr "要打开的文件 3" -#: difftextwindow.cpp:388 directorymergewindow.cpp:2764 +#: difftextwindow.cpp:388 directorymergewindow.cpp:2689 #, fuzzy #| msgid "File..." msgid "File" @@ -1843,11 +1871,6 @@ msgid "Line not available" msgstr "不可用" -#: difftextwindow.cpp:1721 -#, fuzzy -msgid "Top line" -msgstr "顶端行数 %1" - #: difftextwindow.cpp:1731 msgid "End" msgstr "末尾" @@ -1918,27 +1941,27 @@ msgid "Linediff: A <-> C" msgstr "Linediff：A <-> C" -#: pdiff.cpp:528 mergeresultwindow.cpp:828 +#: pdiff.cpp:532 mergeresultwindow.cpp:828 msgid "All input files are binary equal." msgstr "全部输入文件二进制数据相同。" -#: pdiff.cpp:530 +#: pdiff.cpp:534 #, fuzzy msgid "All input files contain the same text, but are not binary equal." msgstr "全部输入文件包含相同文本。" -#: pdiff.cpp:532 pdiff.cpp:534 pdiff.cpp:536 mergeresultwindow.cpp:832 +#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832 #: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "文件 B 和 C 二进制数据相同。\n" -#: pdiff.cpp:533 pdiff.cpp:535 pdiff.cpp:537 +#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "文件 A 和 B 二进制数据相同。\n" -#: pdiff.cpp:547 +#: pdiff.cpp:551 msgid "" "Some inputfiles don't seem to be pure textfiles.\n" "Note that the KDiff3-merge was not meant for binary data.\n" @@ -1948,55 +1971,55 @@ "注意 KDiff3-merge 用于二进制数据。\n" "继续则您自己承担风险。" -#: pdiff.cpp:1017 +#: pdiff.cpp:1060 msgid "Abort" msgstr "放弃" -#: pdiff.cpp:1018 directorymergewindow.cpp:409 +#: pdiff.cpp:1061 directorymergewindow.cpp:391 msgid "Continue Merging" msgstr "继续合并" -#: pdiff.cpp:1024 pdiff.cpp:1112 +#: pdiff.cpp:1067 pdiff.cpp:1155 msgid "Opening files..." msgstr "正在打开文件..." -#: pdiff.cpp:1089 pdiff.cpp:1160 +#: pdiff.cpp:1132 pdiff.cpp:1203 msgid "File open error" msgstr "打开文件错误" -#: pdiff.cpp:1192 +#: pdiff.cpp:1235 msgid "Cutting selection..." msgstr "剪切所选内容..." -#: pdiff.cpp:1213 +#: pdiff.cpp:1256 msgid "Copying selection to clipboard..." msgstr "复制所选内容到剪贴板..." -#: pdiff.cpp:1229 +#: pdiff.cpp:1272 msgid "Inserting clipboard contents..." msgstr "插入剪贴板内容..." -#: pdiff.cpp:1755 +#: pdiff.cpp:1794 msgid "Save && Continue" msgstr "保存并继续" -#: pdiff.cpp:1756 +#: pdiff.cpp:1795 msgid "Continue Without Saving" msgstr "不保存继续" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search complete." msgstr "搜索完成。" -#: pdiff.cpp:1958 +#: pdiff.cpp:1997 msgid "Search Complete" msgstr "搜索完成" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2192 +#: pdiff.cpp:2231 #, fuzzy msgid "Error while adding manual diff range" msgstr "创建目录时出错。" @@ -2015,103 +2038,103 @@ "无法找到我们的组件！\n" "发生此错误通常因为安装错误。详细内容请阅读源码包内的 README 文件。" -#: directorymergewindow.cpp:154 +#: directorymergewindow.cpp:136 msgid "Mix of links and normal files." msgstr "链接和普通文件混合" -#: directorymergewindow.cpp:161 +#: directorymergewindow.cpp:143 msgid "Link: " msgstr "链接：" -#: directorymergewindow.cpp:169 +#: directorymergewindow.cpp:151 msgid "Size. " msgstr "大小。" -#: directorymergewindow.cpp:182 directorymergewindow.cpp:192 +#: directorymergewindow.cpp:164 directorymergewindow.cpp:174 msgid "Date & Size: " msgstr "日期和大小：" -#: directorymergewindow.cpp:202 directorymergewindow.cpp:208 +#: directorymergewindow.cpp:184 directorymergewindow.cpp:190 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "创建临时 %1 副本失败。" -#: directorymergewindow.cpp:219 directorymergewindow.cpp:227 +#: directorymergewindow.cpp:201 directorymergewindow.cpp:209 #, kde-format msgid "Opening %1 failed." msgstr "打开 %1 失败。" -#: directorymergewindow.cpp:231 +#: directorymergewindow.cpp:213 msgid "Comparing file..." msgstr "正在比较文件..." -#: directorymergewindow.cpp:241 directorymergewindow.cpp:247 +#: directorymergewindow.cpp:223 directorymergewindow.cpp:229 #, kde-format msgid "Error reading from %1" msgstr "读取 %1 时错误" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Name" msgstr "名称" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:376 +#: directorymergewindow.cpp:358 msgid "Status" msgstr "状态" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Unsolved" msgstr "未解决的" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Solved" msgstr "已解决的" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "Nonwhite" msgstr "非空白" -#: directorymergewindow.cpp:377 +#: directorymergewindow.cpp:359 msgid "White" msgstr "空白" -#: directorymergewindow.cpp:406 +#: directorymergewindow.cpp:388 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "您当前正在合并目录。您确定要放弃合并，重新扫描目录吗？" -#: directorymergewindow.cpp:408 directorymergewindow.cpp:2984 +#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945 msgid "Rescan" msgstr "重新扫描" -#: directorymergewindow.cpp:566 +#: directorymergewindow.cpp:548 msgid "Opening of directories failed:" msgstr "打开目录失败" -#: directorymergewindow.cpp:569 +#: directorymergewindow.cpp:551 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "目录 A “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:572 +#: directorymergewindow.cpp:554 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "目录 B “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:575 +#: directorymergewindow.cpp:557 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "目录 C “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:577 +#: directorymergewindow.cpp:559 msgid "Directory Open Error" msgstr "打开目录错误" -#: directorymergewindow.cpp:585 +#: directorymergewindow.cpp:567 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -2120,129 +2143,129 @@ "当三个目录合并时，目标目录不能是 A 或者 B。\n" "在继续进行前，请再核对一遍。" -#: directorymergewindow.cpp:587 +#: directorymergewindow.cpp:569 msgid "Parameter Warning" msgstr "参数警告" -#: directorymergewindow.cpp:592 +#: directorymergewindow.cpp:574 msgid "Scanning directories..." msgstr "正在扫描目录..." -#: directorymergewindow.cpp:625 +#: directorymergewindow.cpp:607 msgid "Reading Directory A" msgstr "读取目录 A" -#: directorymergewindow.cpp:647 +#: directorymergewindow.cpp:629 msgid "Reading Directory B" msgstr "读取目录 B" -#: directorymergewindow.cpp:669 +#: directorymergewindow.cpp:651 msgid "Reading Directory C" msgstr "读取目录 C" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:677 msgid "Some subdirectories were not readable in" msgstr "不能进入读取一些子目录" -#: directorymergewindow.cpp:700 +#: directorymergewindow.cpp:682 msgid "Check the permissions of the subdirectories." msgstr "检查子目录权限。" -#: directorymergewindow.cpp:753 +#: directorymergewindow.cpp:735 msgid "Directory Comparison Status" msgstr "目录比较状态" -#: directorymergewindow.cpp:754 +#: directorymergewindow.cpp:736 msgid "Number of subdirectories:" msgstr "子目录数：" -#: directorymergewindow.cpp:755 +#: directorymergewindow.cpp:737 msgid "Number of equal files:" msgstr "相同文件数：" -#: directorymergewindow.cpp:756 +#: directorymergewindow.cpp:738 msgid "Number of different files:" msgstr "不同文件数：" -#: directorymergewindow.cpp:759 +#: directorymergewindow.cpp:741 msgid "Number of manual merges:" msgstr "手动合并数：" -#: directorymergewindow.cpp:928 +#: directorymergewindow.cpp:909 msgid "This affects all merge operations." msgstr "这将影响全部合并操作。" -#: directorymergewindow.cpp:929 +#: directorymergewindow.cpp:910 msgid "Changing All Merge Operations" msgstr "更改全部合并操作" -#: directorymergewindow.cpp:1328 +#: directorymergewindow.cpp:1309 msgid "Processing " msgstr "处理 " -#: directorymergewindow.cpp:1807 directorymergewindow.cpp:1813 +#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738 msgid "To do." msgstr "执行。" -#: directorymergewindow.cpp:1881 directorymergewindow.cpp:3015 +#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976 msgid "Copy A to B" msgstr "复制 A 到 B" -#: directorymergewindow.cpp:1882 directorymergewindow.cpp:3016 +#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977 msgid "Copy B to A" msgstr "复制 B 到 A" -#: directorymergewindow.cpp:1883 directorymergewindow.cpp:3017 +#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978 msgid "Delete A" msgstr "删除 A" -#: directorymergewindow.cpp:1884 directorymergewindow.cpp:3018 +#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2979 msgid "Delete B" msgstr "删除 B" -#: directorymergewindow.cpp:1885 +#: directorymergewindow.cpp:1810 msgid "Delete A & B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:1886 directorymergewindow.cpp:3020 +#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2981 msgid "Merge to A" msgstr "合并到 A" -#: directorymergewindow.cpp:1887 directorymergewindow.cpp:3021 +#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2982 msgid "Merge to B" msgstr "合并到 B" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1813 msgid "Merge to A & B" msgstr "合并到 A 和 B" -#: directorymergewindow.cpp:1892 directorymergewindow.cpp:3012 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2973 msgid "Delete (if exists)" msgstr "删除(如果存在)" -#: directorymergewindow.cpp:1893 directorymergewindow.cpp:1894 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:1819 msgid "Merge (manual)" msgstr "合并(手动)" -#: directorymergewindow.cpp:1895 +#: directorymergewindow.cpp:1820 msgid "Error: Conflicting File Types" msgstr "错误：文件类型冲突" -#: directorymergewindow.cpp:1896 +#: directorymergewindow.cpp:1821 msgid "Error: Dates are equal but files are not." msgstr "错误：日期相同但是文件不同。" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 msgid "This operation is currently not possible." msgstr "现在不能执行此操作。" -#: directorymergewindow.cpp:1922 directorymergewindow.cpp:1951 -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:1847 directorymergewindow.cpp:1876 +#: directorymergewindow.cpp:1901 directorymergewindow.cpp:2160 msgid "Operation Not Possible" msgstr "操作不可行" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "" "This should never happen: \n" "\n" @@ -2256,48 +2279,48 @@ "\n" "如果您知道如何重现错误，请联系程序作者。" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:1940 msgid "Program Error" msgstr "程序错误" -#: directorymergewindow.cpp:2026 +#: directorymergewindow.cpp:1951 msgid "An error occurred while copying.\n" msgstr "复制时发生错误。\n" -#: directorymergewindow.cpp:2026 directorymergewindow.cpp:2095 -#: directorymergewindow.cpp:2127 directorymergewindow.cpp:2175 -#: directorymergewindow.cpp:2184 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:1951 directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2052 directorymergewindow.cpp:2100 +#: directorymergewindow.cpp:2109 directorymergewindow.cpp:2360 #, fuzzy #| msgid "Error." msgid "Error" msgstr "错误。" -#: directorymergewindow.cpp:2027 directorymergewindow.cpp:2436 +#: directorymergewindow.cpp:1952 directorymergewindow.cpp:2361 msgid "Merge Error" msgstr "合并错误" -#: directorymergewindow.cpp:2032 directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2366 msgid "Error." msgstr "错误。" -#: directorymergewindow.cpp:2037 directorymergewindow.cpp:2333 -#: directorymergewindow.cpp:2373 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2258 +#: directorymergewindow.cpp:2298 msgid "Done." msgstr "完成。" -#: directorymergewindow.cpp:2060 +#: directorymergewindow.cpp:1985 msgid "Not saved." msgstr "未保存。" -#: directorymergewindow.cpp:2095 +#: directorymergewindow.cpp:2020 msgid "Unknown merge operation. (This must never happen!)" msgstr "未知合并操作。(绝不可以发生！)" -#: directorymergewindow.cpp:2127 +#: directorymergewindow.cpp:2052 msgid "Unknown merge operation." msgstr "未知合并操作。" -#: directorymergewindow.cpp:2142 +#: directorymergewindow.cpp:2067 msgid "" "The merge is about to begin.\n" "\n" @@ -2315,37 +2338,37 @@ "\n" "注意此程序依然处于 beta 状态，没有任何保证！备份您的重要数据！" -#: directorymergewindow.cpp:2147 +#: directorymergewindow.cpp:2072 msgid "Starting Merge" msgstr "开始合并" -#: directorymergewindow.cpp:2148 +#: directorymergewindow.cpp:2073 msgid "Do It" msgstr "执行" -#: directorymergewindow.cpp:2149 +#: directorymergewindow.cpp:2074 msgid "Simulate It" msgstr "模拟" -#: directorymergewindow.cpp:2175 +#: directorymergewindow.cpp:2100 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "高亮的项目在不同的目录有不同类型。选择做什么。" -#: directorymergewindow.cpp:2184 +#: directorymergewindow.cpp:2109 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "文件的修改日期相同但是文件不同。选择做什么。" -#: directorymergewindow.cpp:2235 +#: directorymergewindow.cpp:2160 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "此操作当前不可行，因为目录合并正在运行。" -#: directorymergewindow.cpp:2295 +#: directorymergewindow.cpp:2220 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -2354,206 +2377,206 @@ "最后一步有错误。\n" "您要继续进行导致错误的项目还是跳过该项？" -#: directorymergewindow.cpp:2297 +#: directorymergewindow.cpp:2222 msgid "Continue merge after an error" msgstr "出错后继续合并" -#: directorymergewindow.cpp:2298 +#: directorymergewindow.cpp:2223 msgid "Continue With Last Item" msgstr "继续进行上一项" -#: directorymergewindow.cpp:2299 +#: directorymergewindow.cpp:2224 msgid "Skip Item" msgstr "跳过项目" -#: directorymergewindow.cpp:2333 +#: directorymergewindow.cpp:2258 msgid "Skipped." msgstr "已跳过。" -#: directorymergewindow.cpp:2340 directorymergewindow.cpp:2554 +#: directorymergewindow.cpp:2265 directorymergewindow.cpp:2479 msgid "In progress..." msgstr "进行中..." -#: directorymergewindow.cpp:2388 +#: directorymergewindow.cpp:2313 msgid "Merge operation complete." msgstr "合并操作完成。" -#: directorymergewindow.cpp:2388 directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2313 directorymergewindow.cpp:2316 msgid "Merge Complete" msgstr "合并完成" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2326 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "模拟合并完成：核对您是否赞同被提议的操作。" -#: directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2360 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "错误发生。按 OK 看详细信息。\n" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2392 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "错误：在删除 %1 时：创建备份失败。" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2399 #, kde-format msgid "delete directory recursively( %1 )" msgstr "递归删除目录( %1 )" -#: directorymergewindow.cpp:2476 +#: directorymergewindow.cpp:2401 #, kde-format msgid "delete( %1 )" msgstr "删除( %1 )" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2416 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "错误：在试图读取目录时删除目录操作失败。" -#: directorymergewindow.cpp:2510 +#: directorymergewindow.cpp:2435 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "错误：rmdir( %1 )操作失败。" -#: directorymergewindow.cpp:2520 +#: directorymergewindow.cpp:2445 msgid "Error: delete operation failed." msgstr "错误：删除操作失败。" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2471 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手动合并( %1，%2，%3 -> %4)" -#: directorymergewindow.cpp:2549 +#: directorymergewindow.cpp:2474 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 注意：在手动合并之后用户应该按 F7 继续。" -#: directorymergewindow.cpp:2572 +#: directorymergewindow.cpp:2497 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "错误：复制( %1 -> %2 )失败。删除现存目标失败。" -#: directorymergewindow.cpp:2582 +#: directorymergewindow.cpp:2507 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "复制链接( %1 -> %2 )" -#: directorymergewindow.cpp:2593 +#: directorymergewindow.cpp:2518 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "错误：复制链接失败：远程链接尚未支持。" -#: directorymergewindow.cpp:2599 +#: directorymergewindow.cpp:2524 msgid "Error: copyLink failed." msgstr "错误：复制链接失败。" -#: directorymergewindow.cpp:2619 +#: directorymergewindow.cpp:2544 #, kde-format msgid "copy( %1 -> %2 )" msgstr "复制( %1 -> %2 )" -#: directorymergewindow.cpp:2645 +#: directorymergewindow.cpp:2570 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "重命名( %1 -> %2 )错误：无法删除现存目标。" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2576 #, kde-format msgid "rename( %1 -> %2 )" msgstr "重命名( %1 -> %2 )" -#: directorymergewindow.cpp:2660 +#: directorymergewindow.cpp:2585 msgid "Error: Rename failed." msgstr "错误：重命名失败。" -#: directorymergewindow.cpp:2678 +#: directorymergewindow.cpp:2603 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "建立目录 %1 出错。无法删除现存文件。" -#: directorymergewindow.cpp:2694 +#: directorymergewindow.cpp:2619 #, kde-format msgid "makeDir( %1 )" msgstr "建立目录( %1 )" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2629 msgid "Error while creating directory." msgstr "创建目录时出错。" -#: directorymergewindow.cpp:2729 directorymergewindow.cpp:2839 +#: directorymergewindow.cpp:2654 directorymergewindow.cpp:2764 msgid "Dest" msgstr "目标" -#: directorymergewindow.cpp:2733 directorymergewindow.cpp:2764 +#: directorymergewindow.cpp:2658 directorymergewindow.cpp:2689 msgid "Dir" msgstr "目录" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Type" msgstr "类型" -#: directorymergewindow.cpp:2733 +#: directorymergewindow.cpp:2658 msgid "Size" msgstr "大小" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Last Modification" msgstr "上次修改" -#: directorymergewindow.cpp:2734 +#: directorymergewindow.cpp:2659 msgid "Link-Destination" msgstr "链接目标" -#: directorymergewindow.cpp:2781 +#: directorymergewindow.cpp:2706 msgid "not available" msgstr "不可用" -#: directorymergewindow.cpp:2801 +#: directorymergewindow.cpp:2726 msgid "A (Dest): " msgstr "A (目标)：" -#: directorymergewindow.cpp:2804 +#: directorymergewindow.cpp:2729 msgid "A (Base): " msgstr "A 基准" -#: directorymergewindow.cpp:2810 +#: directorymergewindow.cpp:2735 msgid "B (Dest): " msgstr "B (目标)：" -#: directorymergewindow.cpp:2818 +#: directorymergewindow.cpp:2743 msgid "C (Dest): " msgstr "C (目标)：" -#: directorymergewindow.cpp:2824 +#: directorymergewindow.cpp:2749 msgid "Dest: " msgstr "目标：" -#: directorymergewindow.cpp:2891 +#: directorymergewindow.cpp:2816 #, fuzzy msgid "Save Directory Merge State As..." msgstr "目录合并" -#: directorymergewindow.cpp:2978 +#: directorymergewindow.cpp:2939 msgid "Start/Continue Directory Merge" msgstr "开始/继续目录合并" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2940 msgid "Run Operation for Current Item" msgstr "开始当前项目操作" -#: directorymergewindow.cpp:2980 +#: directorymergewindow.cpp:2941 msgid "Compare Selected File" msgstr "比较所选文件" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 msgid "Merge Current File" msgstr "合并当前文件" -#: directorymergewindow.cpp:2981 +#: directorymergewindow.cpp:2942 #, fuzzy #| msgid "Merge" msgid "" @@ -2561,110 +2584,110 @@ "File" msgstr "合并" -#: directorymergewindow.cpp:2982 +#: directorymergewindow.cpp:2943 msgid "Fold All Subdirs" msgstr "折叠全部子文件夹" -#: directorymergewindow.cpp:2983 +#: directorymergewindow.cpp:2944 msgid "Unfold All Subdirs" msgstr "打开全部子文件夹" -#: directorymergewindow.cpp:2987 +#: directorymergewindow.cpp:2948 msgid "Choose A for All Items" msgstr "选择 A 的全部项目" -#: directorymergewindow.cpp:2988 +#: directorymergewindow.cpp:2949 msgid "Choose B for All Items" msgstr "选择 B 的全部项目" -#: directorymergewindow.cpp:2989 +#: directorymergewindow.cpp:2950 msgid "Choose C for All Items" msgstr "选择 C 的全部项目" -#: directorymergewindow.cpp:2990 +#: directorymergewindow.cpp:2951 msgid "Auto-Choose Operation for All Items" msgstr "为全部项目自动选择操作" -#: directorymergewindow.cpp:2991 +#: directorymergewindow.cpp:2952 msgid "No Operation for All Items" msgstr "全部项目无操作" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2996 +#: directorymergewindow.cpp:2957 msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:2997 +#: directorymergewindow.cpp:2958 #, fuzzy msgid "Show Different Files" msgstr "不同文件数：" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2998 +#: directorymergewindow.cpp:2959 msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2999 +#: directorymergewindow.cpp:2960 msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3000 +#: directorymergewindow.cpp:2961 msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3004 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:3005 +#: directorymergewindow.cpp:2966 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:3007 directorymergewindow.cpp:3014 +#: directorymergewindow.cpp:2968 directorymergewindow.cpp:2975 msgid "Do Nothing" msgstr "什么也不做" -#: directorymergewindow.cpp:3008 +#: directorymergewindow.cpp:2969 msgid "A" msgstr "A" -#: directorymergewindow.cpp:3009 +#: directorymergewindow.cpp:2970 msgid "B" msgstr "B" -#: directorymergewindow.cpp:3010 +#: directorymergewindow.cpp:2971 msgid "C" msgstr "C" -#: directorymergewindow.cpp:3019 +#: directorymergewindow.cpp:2980 msgid "Delete A && B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:3022 +#: directorymergewindow.cpp:2983 msgid "Merge to A && B" msgstr "合并到 A 和 B" @@ -2676,13 +2699,13 @@ msgid "KDiff3Part" msgstr "KDiff3Part" -#: kreplacements/kreplacements.h:102 +#: kreplacements/kreplacements.h:103 #, fuzzy #| msgid "C&ontinue" msgid "Continue" msgstr "继续(&o)" -#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:637 +#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637 msgid "Quit" msgstr "" @@ -2945,11 +2968,11 @@ msgid "<Merge Conflict (Whitespace only)>" msgstr "<合并冲突(只有空白字符)>" -#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2498 +#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503 msgid "<Merge Conflict>" msgstr "<合并冲突>" -#: mergeresultwindow.cpp:2706 +#: mergeresultwindow.cpp:2711 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -2957,12 +2980,19 @@ "尚未解决全部冲突。\n" "文件未保存。\n" -#: mergeresultwindow.cpp:2708 +#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722 msgid "Conflicts Left" msgstr "遗留的冲突" #: mergeresultwindow.cpp:2720 msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved.\n" +msgstr "" + +#: mergeresultwindow.cpp:2734 +msgid "" "\n" "\n" "Creating backup failed. File not saved." @@ -2971,29 +3001,43 @@ "\n" "创建备份失败。文件未保存。" -#: mergeresultwindow.cpp:2720 mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778 msgid "File Save Error" msgstr "保存文件错误" -#: mergeresultwindow.cpp:2761 +#: mergeresultwindow.cpp:2778 msgid "Error while writing." msgstr "写入时出错。" -#: mergeresultwindow.cpp:3091 +#: mergeresultwindow.cpp:3108 msgid "Output" msgstr "输出" -#: mergeresultwindow.cpp:3103 mergeresultwindow.cpp:3256 +#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300 msgid "[Modified]" msgstr "[已修改]" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3127 #, fuzzy msgid "Encoding for saving" msgstr "C 的文件编码：" -#: mergeresultwindow.cpp:3203 mergeresultwindow.cpp:3205 -#: mergeresultwindow.cpp:3207 +#: mergeresultwindow.cpp:3180 +msgid "Unix" +msgstr "" + +#: mergeresultwindow.cpp:3181 +msgid "DOS" +msgstr "" + +#: mergeresultwindow.cpp:3215 +#, fuzzy +#| msgid "Conflicts" +msgid "Conflict" +msgstr "冲突" + +#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249 +#: mergeresultwindow.cpp:3251 msgid "Codec from" msgstr "" @@ -3031,6 +3075,9 @@ msgid "Your emails" msgstr "" +#~ msgid "Directory Merge" +#~ msgstr "目录合并" + #~ msgid "" #~ "_: NAME OF TRANSLATORS\n" #~ "Your names" @@ -3044,10 +3091,6 @@ #~ msgid "Enables/disables the toolbar" #~ msgstr "启用/禁止工具栏" -#, fuzzy -#~ msgid "Printing completed." -#~ msgstr "合并操作完成。" - #~ msgid "Files A and B are binary equal.\n" #~ msgstr "文件 A 和 B 二进制数据相同。\n"
--- a/kdiff3/src-QT4/diff.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/diff.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -244,7 +244,8 @@ } FileAccess f( m_tempInputFileName ); - bool bSuccess = f.writeFile( QTextCodec::codecForName("UTF-8")->fromUnicode(data), data.length() ); + QByteArray ba = QTextCodec::codecForName("UTF-8")->fromUnicode(data); + bool bSuccess = f.writeFile( ba.constData(), ba.length() ); if ( !bSuccess ) { KMessageBox::error( m_pOptionDialog, i18n("Writing clipboard data to temp file failed.") );
--- a/kdiff3/src-QT4/difftextwindow.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/difftextwindow.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -68,9 +68,17 @@ m_scrollDeltaY = 0; m_bMyUpdate = false; m_bSelectionInProgress = false; + m_pTextCodec = 0; + #ifdef _WIN32 + m_eLineEndStyle = eLineEndStyleDos; + #else + m_eLineEndStyle = eLineEndStyleUnix; + #endif } DiffTextWindow* m_pDiffTextWindow; DiffTextWindowFrame* m_pDiffTextWindowFrame; + QTextCodec* m_pTextCodec; + e_LineEndStyle m_eLineEndStyle; bool m_bPaintingAllowed; const LineData* m_pLineData; @@ -153,7 +161,7 @@ setAcceptDrops( true ); d->m_pOptionDialog = pOptionDialog; - init( 0, 0, 0, 0, 0, false ); + init( 0, 0, d->m_eLineEndStyle, 0, 0, 0, 0, false ); setMinimumSize(QSize(20,20)); @@ -172,6 +180,8 @@ void DiffTextWindow::init( const QString& filename, + QTextCodec* pTextCodec, + e_LineEndStyle eLineEndStyle, const LineData* pLineData, int size, const Diff3LineVector* pDiff3LineVector, @@ -202,6 +212,9 @@ d->m_selection.oldLastLine = -1; d->m_selection.lastLine = -1; + d->m_pTextCodec = pTextCodec; + d->m_eLineEndStyle = eLineEndStyle; + update(); d->m_pDiffTextWindowFrame->init(); } @@ -1638,6 +1651,8 @@ OptionDialog* m_pOptionDialog; QLabel* m_pLabel; QLabel* m_pTopLine; + QLabel* m_pEncoding; + QLabel* m_pLineEndStyle; QWidget* m_pTopLineWidget; int m_winIdx; }; @@ -1660,8 +1675,17 @@ d->m_pTopLine = new QLabel(d->m_pTopLineWidget); d->m_pDiffTextWindow = 0; d->m_pDiffTextWindow = new DiffTextWindow( this, pStatusBar, pOptionDialog, winIdx ); - QHBoxLayout* pHL = new QHBoxLayout(d->m_pTopLineWidget); - pHL->setMargin(2); + + QVBoxLayout* pVTopLayout = new QVBoxLayout(d->m_pTopLineWidget); + pVTopLayout->setMargin(2); + pVTopLayout->setSpacing(0); + QHBoxLayout* pHL = new QHBoxLayout(); + QHBoxLayout* pHL2 = new QHBoxLayout(); + pVTopLayout->addLayout(pHL); + pVTopLayout->addLayout(pHL2); + + // Upper line: + pHL->setMargin(0); pHL->setSpacing(2); pHL->addWidget( d->m_pLabel, 0 ); @@ -1669,6 +1693,15 @@ pHL->addWidget( d->m_pBrowseButton, 0 ); pHL->addWidget( d->m_pTopLine, 0 ); + // Lower line + pHL2->setMargin(0); + pHL2->setSpacing(2); + pHL2->addWidget( d->m_pTopLine, 0 ); + d->m_pEncoding = new QLabel(i18n("Encoding:")); + d->m_pLineEndStyle = new QLabel(i18n("Line end style:")); + pHL2->addWidget(d->m_pEncoding); + pHL2->addWidget(d->m_pLineEndStyle); + QVBoxLayout* pVL = new QVBoxLayout( this ); pVL->setMargin(0); pVL->setSpacing(0); @@ -1697,6 +1730,8 @@ ( pDTW->d->m_bTriple?"A (Base)":"A") : ( pDTW->d->m_winIdx==2 ? "B" : "C" ); d->m_pLabel->setText( winId + ":" ); + d->m_pEncoding->setText( i18n("Encoding:") + " " + (pDTW->d->m_pTextCodec!=0 ? pDTW->d->m_pTextCodec->name() : QString()) ); + d->m_pLineEndStyle->setText( i18n("Line end style:") + " " + (pDTW->d->m_eLineEndStyle==eLineEndStyleDos ? i18n("DOS") : i18n("Unix")) ); } } @@ -1763,11 +1798,13 @@ p.setColor(QPalette::WindowText, c1); d->m_pLabel->setPalette( p ); d->m_pTopLine->setPalette( p ); + d->m_pEncoding->setPalette( p ); + d->m_pLineEndStyle->setPalette( p ); } if (o == d->m_pFileSelection && e->type()==QEvent::Drop) { QDropEvent* d = static_cast<QDropEvent*>(e); - + if ( d->mimeData()->hasUrls() ) { QList<QUrl> lst = d->mimeData()->urls(); @@ -1804,5 +1841,3 @@ emit fileNameChanged( newURL.url(), pDTW->d->m_winIdx ); } } - -//#include "difftextwindow.moc"
--- a/kdiff3/src-QT4/difftextwindow.h Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/difftextwindow.h Tue Mar 03 23:50:12 2009 +0000 @@ -40,6 +40,8 @@ ~DiffTextWindow(); void init( const QString& fileName, + QTextCodec* pCodec, + e_LineEndStyle eLineEndStyle, const LineData* pLineData, int size, const Diff3LineVector* pDiff3LineVector,
--- a/kdiff3/src-QT4/directorymergewindow.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/directorymergewindow.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -687,22 +687,20 @@ { prepareListView(pp); - for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx )//Q3ListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) + updateFileVisibilities(); + + for( int childIdx = 0; childIdx<topLevelItemCount(); ++childIdx ) { DirMergeItem* pDMI = static_cast<DirMergeItem*>( topLevelItem(childIdx) ); calcSuggestedOperation( *pDMI->m_pMFI, eDefaultMergeOp ); } } - //else - //{ - // setSelected( 0, true ); - //} + + sortItems(0,Qt::AscendingOrder); for (int i=0;i<columnCount();++i) resizeColumnToContents(i); - QDir::setCurrent(origCurrentDirectory); - // Try to improve the view a little bit. QWidget* pParent = parentWidget(); QSplitter* pSplitter = static_cast<QSplitter*>(pParent); @@ -710,12 +708,14 @@ { QList<int> sizes = pSplitter->sizes(); int total = sizes[0] + sizes[1]; + if ( total < 10 ) + total = 100; sizes[0]=total*6/10; sizes[1]=total - sizes[0]; pSplitter->setSizes( sizes ); } - sortItems(0,Qt::AscendingOrder); + QDir::setCurrent(origCurrentDirectory); m_bScanning = false; statusBarMessage(i18n("Ready.")); @@ -744,10 +744,9 @@ topLevelItem(0)->setSelected(true); } - updateFileVisibilities(); if ( bReload ) { - // Remember expandes items + // Remember expanded items QTreeWidgetItemIterator it( this ); while ( *it ) { @@ -757,7 +756,7 @@ { t_ItemInfo& ii = i->second; pDMI->setExpanded( ii.bExpanded ); - pDMI->m_pMFI->setMergeOperation( ii.eMergeOperation, false ); + //pDMI->m_pMFI->setMergeOperation( ii.eMergeOperation, false ); unsafe, might have changed pDMI->m_pMFI->m_bOperationComplete = ii.bOperationComplete; pDMI->setText( s_OpStatusCol, ii.status ); } @@ -1312,16 +1311,9 @@ if ( pp.wasCancelled() ) break; ++currentIdx; - // The comparisons and calculations for each file take place here. compareFilesAndCalcAges( mfi ); - bool bEqual = bCheckC ? mfi.m_bEqualAB && mfi.m_bEqualAC : mfi.m_bEqualAB; - //bool bDir = mfi.m_bDirA || mfi.m_bDirB || mfi.m_bDirC; - - //if ( m_pOptions->m_bDmShowOnlyDeltas && !bDir && bEqual ) - // continue; - // Get dirname from fileName: Search for "/" from end: int pos = fileName.lastIndexOf('/'); QString dirPart; @@ -1348,60 +1340,11 @@ new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); mfi.m_pParent = &dirMfi; - if ( !bEqual ) // Set all parents to "not equal" - { - MergeFileInfos* p = mfi.m_pParent; - while(p!=0) - { - bool bChange = false; - if ( !mfi.m_bEqualAB && p->m_bEqualAB ){ p->m_bEqualAB = false; bChange=true; } - if ( !mfi.m_bEqualAC && p->m_bEqualAC ){ p->m_bEqualAC = false; bChange=true; } - if ( !mfi.m_bEqualBC && p->m_bEqualBC ){ p->m_bEqualBC = false; bChange=true; } - - if ( bChange ) - setPixmaps( *p, bCheckC ); - else - break; - - p = p->m_pParent; - } - } + // Equality for parent dirs is set in updateFileVisibilities() } setPixmaps( mfi, bCheckC ); } - - /*if ( m_pOptions->m_bDmShowOnlyDeltas ) - { - // Remove all equals. (Search tree depth first) - QListViewItem* p = firstChild(); - while( p!=0 && firstChild() != 0 ) - { - QListViewItem* pParent = p->parent(); - QListViewItem* pNextSibling = p->nextSibling(); - - DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); - bool bDirEqual = bCheckC ? pDMI->m_pMFI->m_bEqualAB && pDMI->m_pMFI->m_bEqualAC - : pDMI->m_pMFI->m_bEqualAB; - if ( pDMI!=0 && pDMI->m_pMFI->m_bDirA && bDirEqual ) - { - delete p; - p=0; - } - - if ( p!=0 && p->firstChild() != 0 ) p = p->firstChild(); - else if ( pNextSibling!=0 ) p = pNextSibling; - else - { - p=pParent; - while ( p!=0 ) - { - if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } - else { p = p->parent(); } - } - } - } - }*/ } static bool conflictingFileTypes(MergeFileInfos& mfi) @@ -1505,14 +1448,14 @@ if ( mfi.m_bEqualAB ) mfi.setMergeOperation( eDeleteFromDest ); else - mfi.setMergeOperation( eCopyBToDest ); + mfi.setMergeOperation( eChangedAndDeleted ); } else if ( mfi.m_bExistsInA && !mfi.m_bExistsInB && mfi.m_bExistsInC ) { if ( mfi.m_bEqualAC ) mfi.setMergeOperation( eDeleteFromDest ); else - mfi.setMergeOperation( eCopyCToDest ); + mfi.setMergeOperation( eChangedAndDeleted ); } else if ( !mfi.m_bExistsInA && mfi.m_bExistsInB && mfi.m_bExistsInC ) { @@ -1551,6 +1494,7 @@ switch ( eDefaultMergeOp ) { case eConflictingFileTypes: + case eChangedAndDeleted: case eConflictingAges: case eDeleteA: case eDeleteB: @@ -1875,6 +1819,7 @@ case eMergeABCToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; case eMergeABToDest: s= bDir ? i18n("Merge") : i18n("Merge (manual)"); break; case eConflictingFileTypes: s=i18n("Error: Conflicting File Types"); break; + case eChangedAndDeleted: s=i18n("Error: Changed and Deleted"); break; case eConflictingAges: s=i18n("Error: Dates are equal but files are not."); break; default: assert(false); break; } @@ -2168,6 +2113,15 @@ m_bRealMergeStarted=false; return; } + if (pDMI!=0 && pDMI->m_pMFI->m_eMergeOperation == eChangedAndDeleted ) + { + scrollToItem( pDMI, QAbstractItemView::EnsureVisible ); + pDMI->setSelected( true ); + KMessageBox::error(this, i18n("The highlighted item was changed in one directory and deleted in the other. Select what to do."), i18n("Error")); + m_mergeItemList.clear(); + m_bRealMergeStarted=false; + return; + } } } @@ -2912,29 +2866,65 @@ m_pSelection2Item = 0; m_pSelection3Item = 0; - QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; - while(p) + // in first run set all dirs to equal and determine if they are not equal. + // on second run don't change the equal-status anymore; it is needed to + // set the visibility (when bShowIdentical is false). + for( int loop=0; loop<2; ++loop ) { - DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); - MergeFileInfos* pMFI = pDMI->m_pMFI; - bool bDir = pMFI->m_bDirA || pMFI->m_bDirB || pMFI->m_bDirC; - bool bExistsEverywhere = pMFI->m_bExistsInA && pMFI->m_bExistsInB && (pMFI->m_bExistsInC || !bThreeDirs); - int existCount = int(pMFI->m_bExistsInA) + int(pMFI->m_bExistsInB) + int(pMFI->m_bExistsInC); - bool bVisible = - ( bShowIdentical && bExistsEverywhere && pMFI->m_bEqualAB && (pMFI->m_bEqualAC || !bThreeDirs) ) - || ( (bShowDifferent||bDir) && existCount>=2 && (!pMFI->m_bEqualAB || !(pMFI->m_bEqualAC || !bThreeDirs))) - || ( bShowOnlyInA && pMFI->m_bExistsInA && !pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) - || ( bShowOnlyInB && !pMFI->m_bExistsInA && pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) - || ( bShowOnlyInC && !pMFI->m_bExistsInA && !pMFI->m_bExistsInB && pMFI->m_bExistsInC ); - - QString fileName = pMFI->m_subPath.section( '/', -1 ); - bVisible = bVisible && ( - (bDir && ! wildcardMultiMatch( m_pOptions->m_DmDirAntiPattern, fileName, m_bCaseSensitive )) - || (wildcardMultiMatch( m_pOptions->m_DmFilePattern, fileName, m_bCaseSensitive ) - && !wildcardMultiMatch( m_pOptions->m_DmFileAntiPattern, fileName, m_bCaseSensitive )) ); - - p->setHidden(!bVisible); - p = treeIterator( p, true, true ); + QTreeWidgetItem* p = topLevelItemCount()>0 ? topLevelItem(0) : 0; + while(p) + { + DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); + MergeFileInfos* pMFI = pDMI->m_pMFI; + bool bDir = pMFI->m_bDirA || pMFI->m_bDirB || pMFI->m_bDirC; + if ( loop==0 && bDir ) + { + bool bChange = false; + if ( !pMFI->m_bEqualAB ){ pMFI->m_bEqualAB = true; bChange=true; } + if ( !pMFI->m_bEqualBC ){ pMFI->m_bEqualBC = true; bChange=true; } + if ( !pMFI->m_bEqualAC ){ pMFI->m_bEqualAC = true; bChange=true; } + + if ( bChange ) + setPixmaps( *pMFI, bThreeDirs ); + } + bool bExistsEverywhere = pMFI->m_bExistsInA && pMFI->m_bExistsInB && (pMFI->m_bExistsInC || !bThreeDirs); + int existCount = int(pMFI->m_bExistsInA) + int(pMFI->m_bExistsInB) + int(pMFI->m_bExistsInC); + bool bVisible = + ( bShowIdentical && bExistsEverywhere && pMFI->m_bEqualAB && (pMFI->m_bEqualAC || !bThreeDirs) ) + || ( (bShowDifferent||bDir) && existCount>=2 && (!pMFI->m_bEqualAB || !(pMFI->m_bEqualAC || !bThreeDirs))) + || ( bShowOnlyInA && pMFI->m_bExistsInA && !pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) + || ( bShowOnlyInB && !pMFI->m_bExistsInA && pMFI->m_bExistsInB && !pMFI->m_bExistsInC ) + || ( bShowOnlyInC && !pMFI->m_bExistsInA && !pMFI->m_bExistsInB && pMFI->m_bExistsInC ); + + QString fileName = pMFI->m_subPath.section( '/', -1 ); + bVisible = bVisible && ( + (bDir && ! wildcardMultiMatch( m_pOptions->m_DmDirAntiPattern, fileName, m_bCaseSensitive )) + || (wildcardMultiMatch( m_pOptions->m_DmFilePattern, fileName, m_bCaseSensitive ) + && !wildcardMultiMatch( m_pOptions->m_DmFileAntiPattern, fileName, m_bCaseSensitive )) ); + + p->setHidden(!bVisible); + + bool bEqual = bThreeDirs ? pMFI->m_bEqualAB && pMFI->m_bEqualAC : pMFI->m_bEqualAB; + if ( !bEqual && bVisible && loop==0 ) // Set all parents to "not equal" + { + MergeFileInfos* p2 = pMFI->m_pParent; + while(p2!=0) + { + bool bChange = false; + if ( !pMFI->m_bEqualAB && p2->m_bEqualAB ){ p2->m_bEqualAB = false; bChange=true; } + if ( !pMFI->m_bEqualAC && p2->m_bEqualAC ){ p2->m_bEqualAC = false; bChange=true; } + if ( !pMFI->m_bEqualBC && p2->m_bEqualBC ){ p2->m_bEqualBC = false; bChange=true; } + + if ( bChange ) + setPixmaps( *p2, bThreeDirs ); + else + break; + + p2 = p2->m_pParent; + } + } + p = treeIterator( p, true, true ); + } } }
--- a/kdiff3/src-QT4/directorymergewindow.h Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/directorymergewindow.h Tue Mar 03 23:50:12 2009 +0000 @@ -48,6 +48,7 @@ eCopyAToDest, eCopyBToDest, eCopyCToDest, eDeleteFromDest, eMergeABCToDest, eMergeABToDest, eConflictingFileTypes, // Error + eChangedAndDeleted, // Error eConflictingAges // Equal age but files are not! };
--- a/kdiff3/src-QT4/fileaccess.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/fileaccess.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -414,7 +414,7 @@ if ( isExecutable() ) // value is true if the old file was executable { // Preserve attributes - f.setPermissions(QFile::ExeUser); + f.setPermissions(f.permissions() | QFile::ExeUser); //struct stat srcFileStatus; //int statResult = ::stat( filePath().toLocal8Bit().constData(), &srcFileStatus ); //if (statResult==0) @@ -709,7 +709,7 @@ if ( maxLength>0 ) { KIO::TransferJob* pJob = KIO::put( m_pFileAccess->m_url, permissions, - (bOverwrite ? KIO::Overwrite : KIO::DefaultFlags) | (bResume ? KIO::Resume : KIO::DefaultFlags) ); + KIO::HideProgressInfo | (bOverwrite ? KIO::Overwrite : KIO::DefaultFlags) | (bResume ? KIO::Resume : KIO::DefaultFlags) ); m_transferredBytes = 0; m_pTransferBuffer = (char*)pSrcBuffer; m_maxLength = maxLength; @@ -856,7 +856,7 @@ { int permissions=-1; m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->m_url, kurl, permissions, KIO::DefaultFlags ); + KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->m_url, kurl, permissions, KIO::HideProgressInfo ); connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); @@ -890,7 +890,7 @@ { int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, KIO::DefaultFlags ); + KIO::FileCopyJob* pJob = KIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, KIO::HideProgressInfo ); connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, @@ -1335,7 +1335,7 @@ else { KIO::ListJob* pListJob=0; - pListJob = KIO::listDir( m_pFileAccess->m_url, KIO::DefaultFlags, true /*bFindHidden*/ ); + pListJob = KIO::listDir( m_pFileAccess->m_url, KIO::HideProgressInfo, true /*bFindHidden*/ ); m_bSuccess = false; if ( pListJob!=0 )
--- a/kdiff3/src-QT4/kdiff3.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kdiff3.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -108,10 +108,10 @@ return m_bDirCompare; } -KDiff3App::KDiff3App(QWidget* pParent, const char* name, KDiff3Part* pKDiff3Part ) +KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3Part ) : QSplitter(pParent) //previously KMainWindow { - setObjectName( name ); + setObjectName( "KDiff3App" ); m_pKDiff3Part = pKDiff3Part; m_pKDiff3Shell = dynamic_cast<KParts::MainWindow*>(pParent); @@ -307,6 +307,7 @@ m_pMainSplitter->setOrientation( Qt::Vertical ); // setCentralWidget( m_pMainSplitter ); m_pDirectoryMergeSplitter = new QSplitter( m_pMainSplitter ); + m_pDirectoryMergeSplitter->setObjectName("DirectoryMergeSplitter"); m_pMainSplitter->addWidget( m_pDirectoryMergeSplitter ); m_pDirectoryMergeSplitter->setOrientation( Qt::Horizontal ); m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog,
--- a/kdiff3/src-QT4/kdiff3.desktop Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kdiff3.desktop Tue Mar 03 23:50:12 2009 +0000 @@ -1,11 +1,12 @@ [Desktop Entry] -Encoding=UTF-8 Name=KDiff3 Name[hi]=के-डिफ3 Name[sv]=Kdiff3 Name[x-test]=xxKDiff3xx GenericName=Diff/Patch Frontend GenericName[bg]=Интерфейс на Diff/Patch +GenericName[cs]=Rozhraní pro Diff/Patch +GenericName[de]=Graphische Oberfläche zu Diff/Patch GenericName[el]=Σύστημα υποστήριξης χρήστη για τα Diff/Patch GenericName[es]=Interfaz para diff/patch GenericName[et]=Võrdlemise ja liitmise rakendus @@ -34,8 +35,10 @@ DocPath=kdiff3/index.html Comment=A File And Directory Comparison And Merge Tool Comment[bg]=Инструмент за сравняване и сливане на файлове и директории +Comment[cs]=Nástroj pro porovnávání a slučování souborů a adresářů +Comment[de]=Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern Comment[el]=Ένα εργαλείο σύγκρισης και συγχώνευσης αρχείων και καταλόγων -Comment[es]=Una herramienta para comparar y mezclar archivos y carpetas +Comment[es]=Una herramienta para comparar y fusionar archivos y directorios Comment[et]=Failide ja kataloogide võrdlemise ja liitmise tööriist Comment[fr]=Un outil de comparaison et de fusion de fichiers et de dossiers Comment[ga]=Uirlis a chuireann comhaid agus comhadlanna i gcomparáid agus a chumascann iad más gá
--- a/kdiff3/src-QT4/kdiff3.h Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kdiff3.h Tue Mar 03 23:50:12 2009 +0000 @@ -294,7 +294,6 @@ ManualDiffHelpList m_manualDiffHelpList; int m_neededLines; - int m_maxWidth; int m_DTWHeight; bool m_bOutputModified; bool m_bFileSaved; @@ -325,6 +324,7 @@ bool m_bAutoFlag; bool m_bAutoMode; void recalcWordWrap(int nofVisibleColumns=-1); + void setHScrollBarRange(); public slots: void resizeDiffTextWindow(int newWidth, int newHeight);
--- a/kdiff3/src-QT4/kdiff3part.desktop Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kdiff3part.desktop Tue Mar 03 23:50:12 2009 +0000 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=KDiff3Part Name[et]=KDiff3 komponent Name[hi]=के-डिफ3पार्ट
--- a/kdiff3/src-QT4/kreplacements/kreplacements.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kreplacements/kreplacements.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -113,7 +113,7 @@ #endif } -QString getTranslationDir() +QString getTranslationDir(const QString& locale) { #ifdef _WIN32 wchar_t buf[200]; @@ -125,7 +125,7 @@ else { exePath = "."; } return exePath+"/translations"; #else - return "."; + return (QString)"/usr/share/locale/" + locale + "/LC_MESSAGES"; #endif }
--- a/kdiff3/src-QT4/kreplacements/kreplacements.h Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/kreplacements/kreplacements.h Tue Mar 03 23:50:12 2009 +0000 @@ -21,6 +21,7 @@ #include "common.h" +#include <QSharedData> #include <QMainWindow> #include <QAction> #include <QDialog> @@ -41,7 +42,7 @@ #include <map> #include <list> -QString getTranslationDir(); +QString getTranslationDir(const QString&); class KMainWindow; class KAction;
--- a/kdiff3/src-QT4/main.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/main.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -34,80 +34,50 @@ #endif #include "common.h" +void initialiseCmdLineArgs( KCmdLineOptions& options ) +{ + QString configFileName = KStandardDirs().findResource("config","kdiff3rc"); + QFile configFile( configFileName ); + QString ignorableOptionsLine = "-u;-query;-html;-abort"; + if ( configFile.open( QIODevice::ReadOnly ) ) + { + QTextStream ts( &configFile ); + while(!ts.atEnd()) + { + QString line = ts.readLine(); + if ( line.startsWith("IgnorableCmdLineOptions=") ) + { + int pos = line.indexOf('='); + if (pos>=0) + { + ignorableOptionsLine = line.mid(pos+1); + } + break; + } + } + } -// static KCmdLineOptions options[] = -// { -// { "m", 0, 0 }, -// { "merge", I18N_NOOP("Merge the input."), 0 }, -// { "b", 0, 0 }, -// { "base file", I18N_NOOP("Explicit base file. For compatibility with certain tools."), 0 }, -// { "o", 0, 0 }, -// { "output file", I18N_NOOP("Output file. Implies -m. E.g.: -o newfile.txt"), 0 }, -// { "out file", I18N_NOOP("Output file, again. (For compatibility with certain tools.)"), 0 }, -// { "auto", I18N_NOOP("No GUI if all conflicts are auto-solvable. (Needs -o file)"), 0 }, -// { "qall", I18N_NOOP("Don't solve conflicts automatically. (For compatibility...)"), 0 }, -// { "L1 alias1", I18N_NOOP("Visible name replacement for input file 1 (base)."), 0 }, -// { "L2 alias2", I18N_NOOP("Visible name replacement for input file 2."), 0 }, -// { "L3 alias3", I18N_NOOP("Visible name replacement for input file 3."), 0 }, -// { "L", 0, 0 }, -// { "fname alias", I18N_NOOP("Alternative visible name replacement. Supply this once for every input."), 0 }, -// { "cs string", I18N_NOOP("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""), 0 }, -// { "confighelp", I18N_NOOP("Show list of config settings and current values."), 0 }, -// { "config file", I18N_NOOP("Use a different config file."), 0 } -// }; -// static KCmdLineOptions options2[] = -// { -// { "+[File1]", I18N_NOOP("file1 to open (base, if not specified via --base)"), 0 }, -// { "+[File2]", I18N_NOOP("file2 to open"), 0 }, -// { "+[File3]", I18N_NOOP("file3 to open"), 0 } -// }; -// - -// void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, QStringList& ignorableOptions) -// { -// vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options))); -// QString configFileName = KStandardDirs().findResource("config","kdiff3rc"); -// QFile configFile( configFileName ); -// if ( configFile.open( QIODevice::ReadOnly ) ) -// { -// QTextStream ts( &configFile ); -// while(!ts.atEnd()) -// { -// QString line = ts.readLine(); -// if ( line.startsWith("IgnorableCmdLineOptions=") ) -// { -// int pos = line.indexOf('='); -// if (pos>=0) -// { -// QString s = line.mid(pos+1); -// QStringList sl = s.split( '|' ); -// if (!sl.isEmpty()) -// { -// ignorableOptions = sl.front().split( ';' ); -// for (QStringList::iterator i=ignorableOptions.begin(); i!=ignorableOptions.end(); ++i) -// { -// KCmdLineOptions ignoreOption; -// (*i).remove('-'); -// if (!(*i).isEmpty()) -// { -// ignoreOption.name = (new QByteArray( (*i).toLatin1() ))->constData(); -// ignoreOption.description = I18N_NOOP("Ignored. (User defined.)"); -// ignoreOption.def = 0; -// vOptions.push_back(ignoreOption); -// } -// } -// } -// } -// break; -// } -// } -// } -// vOptions.insert(vOptions.end(),options2,(KCmdLineOptions*)((char*)options2+sizeof(options2))); -// -// KCmdLineOptions last = KCmdLineLastOption; -// vOptions.push_back(last); -// KCmdLineArgs::addCmdLineOptions( &vOptions[0] ); // Add our own options. -// } +#ifdef KREPLACEMENTS_H + QStringList sl = ignorableOptionsLine.split( '|' ); +#else + QStringList sl = ignorableOptionsLine.split( ',' ); +#endif + if (!sl.isEmpty()) + { + QStringList ignorableOptions = sl.front().split( ';' ); + for (QStringList::iterator i=ignorableOptions.begin(); i!=ignorableOptions.end(); ++i) + { + (*i).remove('-'); + if (!(*i).isEmpty()) + { + if ( i->length()==1 ) + options.add( i->toLatin1() ).add("ignore", ki18n("Ignored. (User defined.)") ); + else + options.add( i->toLatin1(), ki18n("Ignored. (User defined.)") ); + } + } + } +} #ifdef _WIN32 #include <process.h> @@ -187,7 +157,7 @@ const KLocalizedString i18nName = ki18n("kdiff3"); const QByteArray& appVersion = QByteArray( VERSION ); const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories"); - const KLocalizedString copyright = ki18n("(c) 2002-2008 Joachim Eibl"); + const KLocalizedString copyright = ki18n("(c) 2002-2009 Joachim Eibl"); const QByteArray& homePage = "http://kdiff3.sourceforge.net/"; const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de"; KAboutData aboutData( appName, appCatalog, i18nName, @@ -236,12 +206,10 @@ options.add( "+[File2]", ki18n("file2 to open") ); options.add( "+[File3]", ki18n("file3 to open") ); + initialiseCmdLineArgs( options ); + KCmdLineArgs::addCmdLineOptions( options ); -// std::vector<KCmdLineOptions> vOptions; -// QStringList ignorableOptions; -// initialiseCmdLineArgs(vOptions, ignorableOptions); - KApplication app; #ifdef KREPLACEMENTS_H @@ -257,7 +225,7 @@ if ( locale == "Auto" || locale.isEmpty() ) locale = locale = QLocale::system().name().left(2); - QString translationDir = getTranslationDir(); + QString translationDir = getTranslationDir(locale); kdiff3Translator.load( QString("kdiff3_")+locale, translationDir ); app.installTranslator( &kdiff3Translator );
--- a/kdiff3/src-QT4/mergeresultwindow.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/mergeresultwindow.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -2412,6 +2412,11 @@ m_cursorYPos = y; m_cursorXPos = xOnScreen; + if ( m_cursorXPos>m_nofColumns ) + { + m_nofColumns = m_cursorXPos; + emit resizeSignal(); + } if ( ! bYMoveKey ) m_cursorOldXPos = m_cursorXPos;
--- a/kdiff3/src-QT4/optiondialog.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/optiondialog.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -1,6 +1,6 @@ /* * kdiff3 - Text Diff And Merge Tool - * Copyright (C) 2002-2007 Joachim Eibl, joachim.eibl at gmx.de + * Copyright (C) 2002-2009 Joachim Eibl, joachim.eibl at gmx.de * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -761,11 +761,7 @@ label = new QLabel( i18n("Line end style:"), page ); gbox->addWidget( label, line, 0 ); - #ifdef _WIN32 - int defaultLineEndStyle = eLineEndStyleDos; - #else - int defaultLineEndStyle = eLineEndStyleUnix; - #endif + OptionComboBox* pLineEndStyle = new OptionComboBox( eLineEndStyleAutoDetect, "LineEndStyle", &m_lineEndStyle, page, this ); gbox->addWidget( pLineEndStyle, line, 1 ); pLineEndStyle->insertItem( eLineEndStyleUnix, "Unix" ); @@ -1062,8 +1058,8 @@ void OptionDialog::setupDirectoryMergePage( void ) { QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Directory Merge") ); - pageItem->setHeader( i18n("Directory Merge") ); + KPageWidgetItem* pageItem = new KPageWidgetItem( page, i18n("Directory") ); + pageItem->setHeader( i18n("Directory") ); pageItem->setIcon( KIcon( "folder" ) ); addPage( pageItem ); @@ -1433,17 +1429,28 @@ pLanguage->addItem( "Auto" ); // Must not translate, won't work otherwise! pLanguage->addItem( "en_orig" ); - // Read directory: Find all kdiff3_*.qm-files and insert the found files here selection - FileAccess fa( getTranslationDir() ); - t_DirectoryList dirList; - fa.listDir( &dirList, false, false, "kdiff3_*.qm", "", "*", false, false ); - t_DirectoryList::iterator i; - for( i=dirList.begin(); i!=dirList.end(); ++i) +#ifndef _WIN32 + // Read directory: Find all kdiff3_*.qm-files and insert the found files here + QDir localeDir( "/usr/share/locale" ); // See also kreplacements.cpp: getTranslationDir() + QStringList dirList = localeDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); + + for( int i = 0; i<dirList.size(); ++i ) + { + QString languageId = dirList[i]; + if ( ! QFile::exists( "/usr/share/locale/" + languageId + "/LC_MESSAGES/kdiff3.qm" ) ) + continue; +#else + // Read directory: Find all kdiff3_*.qm-files and insert the found files here + + QDir localeDir( getTranslationDir(QString()) ); + QStringList fileList = localeDir.entryList( QStringList("kdiff3_*.qm") , QDir::Files, QDir::Name ); + for( int i=0; i<fileList.size(); ++i ) { - QString fileName = i->fileName(); + QString fileName = fileList[i]; // Skip the "kdiff3_" and omit the .qm QString languageId = fileName.mid(7, fileName.length()-10 ); - +#endif + unsigned int countryIdx=0; for(countryIdx=0; countryIdx< sizeof(countryMap)/sizeof(countryMap[0]); ++countryIdx ) { @@ -1457,6 +1464,7 @@ pLanguage->addItem( languageId ); } + label->setToolTip( i18n( "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3.")
--- a/kdiff3/src-QT4/optiondialog.h Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/optiondialog.h Tue Mar 03 23:50:12 2009 +0000 @@ -39,7 +39,7 @@ eLineEndStyleDos, eLineEndStyleAutoDetect, eLineEndStyleUndefined, // only one line exists - eLineEndStyleConflict, // User must resolve manually + eLineEndStyleConflict // User must resolve manually }; class OptionDialog : public KPageDialog
--- a/kdiff3/src-QT4/pdiff.cpp Tue Jan 06 22:31:57 2009 +0000 +++ b/kdiff3/src-QT4/pdiff.cpp Tue Mar 03 23:50:12 2009 +0000 @@ -406,6 +406,11 @@ oldHeights[1] = oldHeights[0]/2; oldHeights[0] -= oldHeights[1]; } + if ( oldHeights[0]==0 && oldHeights[1]==0 ) + { + oldHeights[1] = 100; + oldHeights[0] = 100; + } m_pMainSplitter->setSizes( oldHeights ); } @@ -422,11 +427,11 @@ if ( bGUI ) { const ManualDiffHelpList* pMDHL = &m_manualDiffHelpList; - m_pDiffTextWindow1->init( m_sd1.getAliasName(), + m_pDiffTextWindow1->init( m_sd1.getAliasName(), m_sd1.getEncoding(), m_sd1.getLineEndStyle(), m_sd1.getLineDataForDisplay(), m_sd1.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); - m_pDiffTextWindow2->init( m_sd2.getAliasName(), + m_pDiffTextWindow2->init( m_sd2.getAliasName(), m_sd2.getEncoding(), m_sd2.getLineEndStyle(), m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); - m_pDiffTextWindow3->init( m_sd3.getAliasName(), + m_pDiffTextWindow3->init( m_sd3.getAliasName(), m_sd3.getEncoding(), m_sd3.getLineEndStyle(), m_sd3.getLineDataForDisplay(), m_sd3.getSizeLines(), &m_diff3LineVector, pMDHL, m_bTripleDiff ); m_pDiffTextWindowFrame3->setVisible(m_bTripleDiff); @@ -469,10 +474,7 @@ else m_pMergeWindowFrame->show(); - // Calc max width for display - m_maxWidth = max2( m_pDiffTextWindow1->getNofColumns(), m_pDiffTextWindow2->getNofColumns() ); - m_maxWidth = max2( m_maxWidth, m_pDiffTextWindow3->getNofColumns() ); - m_maxWidth += 5; + setHScrollBarRange(); // Try to create a meaningful but not too long caption if ( !isPart() ) @@ -565,7 +567,45 @@ } -void KDiff3App::resizeDiffTextWindow(int newWidth, int newHeight) +void KDiff3App::setHScrollBarRange() +{ + int w1 = m_pDiffTextWindow1!=0 && m_pDiffTextWindow1->isVisible() ? m_pDiffTextWindow1->getNofColumns() : 0; + int w2 = m_pDiffTextWindow2!=0 && m_pDiffTextWindow2->isVisible() ? m_pDiffTextWindow2->getNofColumns() : 0; + int w3 = m_pDiffTextWindow3!=0 && m_pDiffTextWindow3->isVisible() ? m_pDiffTextWindow3->getNofColumns() : 0; + + int wm = m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ? m_pMergeResultWindow->getNofColumns() : 0; + + int v1 = m_pDiffTextWindow1!=0 && m_pDiffTextWindow1->isVisible() ? m_pDiffTextWindow1->getNofVisibleColumns() : 0; + int v2 = m_pDiffTextWindow2!=0 && m_pDiffTextWindow2->isVisible() ? m_pDiffTextWindow2->getNofVisibleColumns() : 0; + int v3 = m_pDiffTextWindow3!=0 && m_pDiffTextWindow3->isVisible() ? m_pDiffTextWindow3->getNofVisibleColumns() : 0; + int vm = m_pMergeResultWindow!=0 && m_pMergeResultWindow->isVisible() ? m_pMergeResultWindow->getNofVisibleColumns() : 0; + + // Find the minimum, but don't consider 0. + int pageStep = 0; + if ( (pageStep==0 || pageStep>v1) && v1>0 ) + pageStep = v1; + if ( (pageStep==0 || pageStep>v2) && v2>0 ) + pageStep = v2; + if ( (pageStep==0 || pageStep>v3) && v3>0 ) + pageStep = v3; + if ( (pageStep==0 || pageStep>vm) && vm>0 ) + pageStep = vm; + + int rangeMax = 0; + if ( w1>v1 && w1-v1>rangeMax && v1>0 ) + rangeMax = w1-v1; + if ( w2>v2 && w2-v2>rangeMax && v2>0 ) + rangeMax = w2-v2; + if ( w3>v3 && w3-v3>rangeMax && v3>0 ) + rangeMax = w3-v3; + if ( wm>vm && wm-vm>rangeMax && vm>0 ) + rangeMax = wm-vm; + + m_pHScrollBar->setRange(0, rangeMax ); + m_pHScrollBar->setPageStep( pageStep ); +} + +void KDiff3App::resizeDiffTextWindow(int /*newWidth*/, int newHeight) { m_DTWHeight = newHeight; @@ -575,10 +615,7 @@ m_pDiffVScrollBar->setPageStep( newHeight ); m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); - // The second window has a somewhat inverse width - - m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); - m_pHScrollBar->setPageStep( newWidth ); + setHScrollBarRange(); } void KDiff3App::resizeMergeResultWindow() @@ -587,9 +624,7 @@ m_pMergeVScrollBar->setRange(0, max2(0, p->getNofLines() - p->getNofVisibleLines()) ); m_pMergeVScrollBar->setPageStep( p->getNofVisibleLines() ); - // The second window has a somewhat inverse width -// m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); -// m_pHScrollBar->setPageStep( newWidth ); + setHScrollBarRange(); } void KDiff3App::scrollDiffTextWindow( int deltaX, int deltaY ) @@ -652,24 +687,30 @@ return; //delete m_pMainWidget; } - m_pMainWidget = new QWidget(m_pMainSplitter); // Contains vertical splitter and horiz scrollbar + m_pMainWidget = new QWidget(); // Contains vertical splitter and horiz scrollbar + m_pMainSplitter->addWidget( m_pMainWidget ); + m_pMainWidget->setObjectName("MainWidget"); QVBoxLayout* pVLayout = new QVBoxLayout(m_pMainWidget); pVLayout->setMargin(0); pVLayout->setSpacing(0); QSplitter* pVSplitter = new QSplitter(); + pVSplitter->setObjectName("VSplitter"); pVSplitter->setOpaqueResize(false); pVSplitter->setOrientation( Qt::Vertical ); pVLayout->addWidget( pVSplitter ); pVSplitter->show(); - QWidget* pDiffWindowFrame = new QWidget( pVSplitter ); // Contains diff windows, overview and vert scrollbar + QWidget* pDiffWindowFrame = new QWidget(); // Contains diff windows, overview and vert scrollbar + pDiffWindowFrame->setObjectName("DiffWindowFrame"); QHBoxLayout* pDiffHLayout = new QHBoxLayout( pDiffWindowFrame ); pDiffHLayout->setMargin(0); pDiffHLayout->setSpacing(0); + //pDiffWindowFrame->show(); pVSplitter->addWidget(pDiffWindowFrame); - //pDiffWindowFrame->show(); + m_pDiffWindowSplitter = new QSplitter(); + m_pDiffWindowSplitter->setObjectName("DiffWindowSplitter"); m_pDiffWindowSplitter->setOpaqueResize(false); m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); @@ -677,6 +718,7 @@ //m_pDiffWindowSplitter->show(); m_pOverview = new Overview( m_pOptionDialog ); + m_pOverview->setObjectName("Overview"); pDiffHLayout->addWidget(m_pOverview); connect( m_pOverview, SIGNAL(setLine(int)), this, SLOT(setDiff3Line(int)) ); //connect( m_pOverview, SIGNAL(afterFirstPaint()), this, SLOT(slotAfterFirstPaint())); @@ -701,6 +743,7 @@ // Merge window m_pMergeWindowFrame = new QWidget( pVSplitter ); + m_pMergeWindowFrame->setObjectName("MergeWindowFrame"); pVSplitter->addWidget(m_pMergeWindowFrame); QHBoxLayout* pMergeHLayout = new QHBoxLayout( m_pMergeWindowFrame ); pMergeHLayout->setMargin(0); @@ -723,6 +766,8 @@ QList<int> sizes = pVSplitter->sizes(); int total = sizes[0] + sizes[1]; + if ( total<10 ) + total = 100; sizes[0]=total/2; sizes[1]=total/2; pVSplitter->setSizes( sizes ); @@ -818,7 +863,7 @@ void KDiff3App::slotAfterFirstPaint() { int newHeight = m_pDiffTextWindow1->getNofVisibleLines(); - int newWidth = m_pDiffTextWindow1->getNofVisibleColumns(); + /*int newWidth = m_pDiffTextWindow1->getNofVisibleColumns();*/ m_DTWHeight = newHeight; recalcWordWrap(); @@ -827,10 +872,6 @@ m_pDiffVScrollBar->setPageStep( newHeight ); m_pOverview->setRange( m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep() ); - // The second window has a somewhat inverse width - m_pHScrollBar->setRange(0, max2(0, m_maxWidth - newWidth) ); - m_pHScrollBar->setPageStep( newWidth ); - int d3l=-1; if ( ! m_manualDiffHelpList.empty() ) d3l = calcManualDiffFirstDiff3LineIdx( m_diff3LineVector, m_manualDiffHelpList.front() ); @@ -1634,12 +1675,7 @@ { m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) ); - m_maxWidth = max3( m_pDiffTextWindow1->getNofColumns(), - m_pDiffTextWindow2->getNofColumns(), - m_pDiffTextWindow3->getNofColumns() ) + (m_pOptionDialog->m_bWordWrap ? 0 : 5); - - m_pHScrollBar->setRange(0, max2( 0, m_maxWidth - m_pDiffTextWindow1->getNofVisibleColumns() ) ); - m_pHScrollBar->setPageStep( m_pDiffTextWindow1->getNofVisibleColumns() ); + setHScrollBarRange(); m_pHScrollBar->setValue(0); } } @@ -1727,11 +1763,11 @@ if (bSuccess) { m_sd1.reset(); - if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,0,0,0,false); + if (m_pDiffTextWindow1!=0) m_pDiffTextWindow1->init(0,0,eLineEndStyleDos,0,0,0,0,false); m_sd2.reset(); - if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,0,0,0,false); + if (m_pDiffTextWindow2!=0) m_pDiffTextWindow2->init(0,0,eLineEndStyleDos,0,0,0,0,false); m_sd3.reset(); - if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,0,0,0,false); + if (m_pDiffTextWindow3!=0) m_pDiffTextWindow3->init(0,0,eLineEndStyleDos,0,0,0,0,false); } slotUpdateAvailabilities(); return bSuccess;